mkostoevr/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

kolibri.c improvements. + changes in shell, e80, console15, donkey, mcities, piton

Browse Source 
git-svn-id: svn://kolibrios.org@2829 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Albom 2012-06-27 15:43:51 +00:00
parent 98b858c040
commit f657cc8f9b
16 changed files with 572 additions and 543 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/emulator/e80/trunk/e80.c
View File

@ -379,8 +379,7 @@ kol_file_70(&file);
void wnd_draw() void wnd_draw()
{ {
kol_paint_start(); kol_paint_start();
kol_wnd_define( (screen_w-540)/2, (screen_h-440)/2, 540, 440, 0x34b0b0b0); kol_wnd_define( (screen_w-540)/2, (screen_h-440)/2, 540, 440, 0x34b0b0b0, 0x34b0b0b0, WND_CAPTION);
kol_wnd_caption(WND_CAPTION);
screen_print(&spectrumZ80); screen_print(&spectrumZ80);
kol_paint_image((540 - screen_a_w)/2-5, kol_paint_image((540 - screen_a_w)/2-5,
(440 - screen_a_h-kol_skin_height())/2, (440 - screen_a_h-kol_skin_height())/2,
@ -439,7 +438,7 @@ for (;;)
{ {
// event = kol_event_check(); // event = kol_event_check();
event = kol_event_wait_time(1); event = kol_event_wait_time(5);
switch (event) switch (event)
{ {

181
programs/emulator/e80/trunk/system/kolibri.c
View File

@ -10,193 +10,183 @@ extern char KOL_DIR[256];
void kol_exit() void kol_exit()
{ {
asm ("int $0x40"::"a"(-1)); asm volatile ("int $0x40"::"a"(-1));
} }
void kol_sleep(unsigned d) void kol_sleep(unsigned d)
{ {
asm ("int $0x40"::"a"(5), "b"(d)); asm volatile ("int $0x40"::"a"(5), "b"(d));
} }
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) // define a window
// x, y - position; w, h - size; cs - color and style; c - caption; b - boder
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t)
{ {
asm ("nop"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(cs), "D"(t), "S"(b) );
asm ("movl $0xffffff, %esi \n int $0x40");
} }
void kol_wnd_move(unsigned x, unsigned y) void kol_wnd_move(unsigned x, unsigned y)
{ {
asm ("nop"::"a"(67), "b"(x), "c"(y)); asm volatile ("int $0x40"::"a"(67), "b"(x), "c"(y), "d"(-1), "S"(-1));
asm ("movl $-1, %edx \n movl $-1, %esi \n int $0x40");
} }
void kol_event_mask(unsigned e) void kol_event_mask(unsigned e)
{ {
asm ("int $0x40"::"a"(40), "b"(e)); asm volatile ("int $0x40"::"a"(40), "b"(e));
} }
unsigned kol_event_wait() unsigned kol_event_wait()
{ {
asm ("int $0x40"::"a"(10)); asm volatile ("int $0x40"::"a"(10));
} }
unsigned kol_event_wait_time(unsigned time) unsigned kol_event_wait_time(unsigned time)
{ {
asm ("int $0x40"::"a"(23), "b"(time)); asm volatile ("int $0x40"::"a"(23), "b"(time));
} }
unsigned kol_event_check() unsigned kol_event_check()
{ {
asm ("int $0x40"::"a"(11)); asm volatile ("int $0x40"::"a"(11));
} }
void kol_paint_start() void __attribute__((__always_inline__)) kol_paint_start()
{ {
asm ("int $0x40"::"a"(12), "b"(1)); asm volatile ("int $0x40"::"a"(12), "b"(1));
} }
void kol_paint_end() void __attribute__((__always_inline__)) kol_paint_end()
{ {
asm ("int $0x40"::"a"(12), "b"(2)); asm volatile ("int $0x40"::"a"(12), "b"(2));
} }
void kol_paint_pixel(unsigned x, unsigned y, unsigned c) void kol_paint_pixel(unsigned x, unsigned y, unsigned c)
{ {
asm ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c)); asm volatile ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c));
} }
void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c)
{ {
asm ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c));
} }
void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c) void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c)
{ {
asm ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c)); asm volatile ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c));
} }
void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c) void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c)
{ {
asm ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s)); asm volatile ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s));
} }
void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d) void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d)
{ {
asm ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d));
} }
void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette) void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette)
{ {
asm ("nop"::"c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(65), "b"(d), "c"(w*65536+h), "d"(x*65536+y), "D"(palette), "S"(8));
asm ("nop"::"a"(palette));
asm ("movl %eax, %edi");
asm ("xor %eax, %eax");
asm ("movl %eax, %ebp");
asm ("pushl $8");
asm ("popl %esi");
asm ("int $0x40"::"a"(65));
} }
unsigned kol_key_get() unsigned kol_key_get()
{ {
asm ("int $0x40"::"a"(2)); asm volatile ("int $0x40"::"a"(2));
} }
unsigned kol_key_control() unsigned kol_key_control()
{ {
asm ("int $0x40"::"a"(66), "b"(3)); asm volatile ("int $0x40"::"a"(66), "b"(3));
} }
void kol_key_lang_set(unsigned lang) void kol_key_lang_set(unsigned lang)
{ {
asm ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang)); asm volatile ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang));
} }
unsigned kol_key_lang_get() unsigned kol_key_lang_get()
{ {
asm ("int $0x40"::"a"(26), "b"(2), "c"(9)); asm volatile ("int $0x40"::"a"(26), "b"(2), "c"(9));
} }
void kol_key_mode_set(unsigned mode) void kol_key_mode_set(unsigned mode)
{ {
asm ("int $0x40"::"a"(66), "b"(1), "c"(mode)); asm volatile ("int $0x40"::"a"(66), "b"(1), "c"(mode));
} }
unsigned kol_key_mode_get() unsigned kol_key_mode_get()
{ {
asm ("int $0x40"::"a"(66), "b"(2)); asm volatile ("int $0x40"::"a"(66), "b"(2));
} }
unsigned kol_btn_get() unsigned kol_btn_get()
{ {
asm ("int $0x40"::"a"(17)); asm volatile ("int $0x40"::"a"(17));
} }
void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c) void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c)
{ {
asm ("nop"::"b"(x*65536+w), "c"(y*65536+h), "d"(d)); asm volatile ("int $0x40"::"a"(8), "b"(x*65536+w), "c"(y*65536+h), "d"(d), "S"(c));
asm ("nop"::"a"(c));
asm ("movl %eax, %esi");
asm ("int $0x40"::"a"(8));
} }
void kol_btn_type(unsigned t) void kol_btn_type(unsigned t)
{ {
asm ("int $0x40"::"a"(48), "b"(1), "c"(t)); asm volatile ("int $0x40"::"a"(48), "b"(1), "c"(t));
} }
void kol_wnd_caption(char *s) void kol_wnd_caption(char *s)
{ {
asm ("int $0x40"::"a"(71), "b"(1), "c"(s)); asm volatile ("int $0x40"::"a"(71), "b"(1), "c"(s));
} }
unsigned kol_mouse_pos() unsigned kol_mouse_pos()
{ {
asm ("int $0x40"::"a"(37), "b"(0)); asm volatile ("int $0x40"::"a"(37), "b"(0));
} }
unsigned kol_mouse_posw() unsigned kol_mouse_posw()
{ {
asm ("int $0x40"::"a"(37), "b"(1)); asm volatile ("int $0x40"::"a"(37), "b"(1));
} }
unsigned kol_mouse_btn() unsigned kol_mouse_btn()
{ {
asm ("int $0x40"::"a"(37), "b"(2)); asm volatile ("int $0x40"::"a"(37), "b"(2));
} }
void kol_board_putc(char c) void kol_board_putc(char c)
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
} }
@ -206,7 +196,7 @@ unsigned i;
i = 0; i = 0;
while (*(s+i)) while (*(s+i))
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i))); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i)));
i++; i++;
} }
} }
@ -215,26 +205,25 @@ while (*(s+i))
void kol_board_puti(int n) void kol_board_puti(int n)
{ {
char c; char c;
int i = 0;
do if ( n > 1 )
{ kol_board_puti(n / 10);
c = n % 10 + '0';
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); c = n % 10 + '0';
i++; asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
}
while ((n /= 10) > 0);
} }
int kol_file_70(kol_struct70 *k) int kol_file_70(kol_struct70 *k)
{ {
asm ("int $0x40"::"a"(70), "b"(k)); asm volatile ("int $0x40"::"a"(70), "b"(k));
} }
kol_struct_import* kol_cofflib_load(char *name) kol_struct_import* kol_cofflib_load(char *name)
{ {
asm ("int $0x40"::"a"(68), "b"(19), "c"(name)); asm volatile ("int $0x40"::"a"(68), "b"(19), "c"(name));
} }
@ -285,37 +274,37 @@ for (i=0;;i++)
unsigned kol_system_cpufreq() unsigned kol_system_cpufreq()
{ {
asm ("int $0x40"::"a"(18), "b"(5)); asm volatile ("int $0x40"::"a"(18), "b"(5));
} }
unsigned kol_system_mem() unsigned kol_system_mem()
{ {
asm ("int $0x40"::"a"(18), "b"(17)); asm volatile ("int $0x40"::"a"(18), "b"(17));
} }
unsigned kol_system_memfree() unsigned kol_system_memfree()
{ {
asm ("int $0x40"::"a"(18), "b"(16)); asm volatile ("int $0x40"::"a"(18), "b"(16));
} }
unsigned kol_system_time_get() unsigned kol_system_time_get()
{ {
asm ("int $0x40"::"a"(3)); asm volatile ("int $0x40"::"a"(3));
} }
unsigned kol_system_date_get() unsigned kol_system_date_get()
{ {
asm ("int $0x40"::"a"(29)); asm volatile ("int $0x40"::"a"(29));
} }
unsigned kol_system_end(unsigned param) unsigned kol_system_end(unsigned param)
{ {
asm ("int $0x40"::"a"(18), "b"(9), "c"(param)); asm volatile ("int $0x40"::"a"(18), "b"(9), "c"(param));
} }
@ -337,30 +326,30 @@ void kol_path_full(char *full, char *fname)
char temp[256]; char temp[256];
switch (*fname) switch (*fname)
{ {
case '/': case '/':
strncpy(temp, fname+1, 2); strncpy(temp, fname+1, 2);
temp[2]=0; temp[2]=0;
if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) ) if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) )
strcpy (full, fname); strcpy (full, fname);
break; break;
case '.': case '.':
break; break;
default: default:
break; break;
}; };
} }
void kol_screen_wait_rr() void __attribute__((__always_inline__)) kol_screen_wait_rr()
{ {
asm ("int $0x40"::"a"(18), "b"(14)); asm volatile ("int $0x40"::"a"(18), "b"(14));
} }
@ -368,7 +357,7 @@ asm ("int $0x40"::"a"(18), "b"(14));
void kol_screen_get_size(unsigned *w, unsigned *h) void kol_screen_get_size(unsigned *w, unsigned *h)
{ {
unsigned size; unsigned size;
asm ("int $0x40":"=a"(size):"a"(14)); asm volatile ("int $0x40":"=a"(size):"a"(14));
*w = size / 65536; *w = size / 65536;
*h = size % 65536; *h = size % 65536;
} }
@ -377,36 +366,58 @@ asm ("int $0x40":"=a"(size):"a"(14));
unsigned kol_skin_height() unsigned kol_skin_height()
{ {
asm ("int $0x40"::"a"(48), "b"(4)); asm volatile ("int $0x40"::"a"(48), "b"(4));
} }
unsigned kol_thread_start(unsigned start, unsigned stack) unsigned kol_thread_start(unsigned start, unsigned stack)
{ {
asm ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack)); asm volatile ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack));
} }
unsigned kol_time_tick() unsigned kol_time_tick()
{ {
asm ("int $0x40"::"a"(26), "b"(9)); asm volatile ("int $0x40"::"a"(26), "b"(9));
} }
unsigned kol_sound_speaker(char data[]) unsigned kol_sound_speaker(char data[])
{ {
asm ("movl %0, %%esi"::"a"(data)); asm volatile ("movl %0, %%esi"::"a"(data));
asm ("int $0x40"::"a"(55), "b"(55)); asm volatile ("int $0x40"::"a"(55), "b"(55));
} }
unsigned kol_process_info(unsigned slot, char buf1k[]) unsigned kol_process_info(unsigned slot, char buf1k[])
{ {
asm ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot)); asm volatile ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot));
} }
int kol_process_kill_pid(unsigned process) int kol_process_kill_pid(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(18), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(18), "c"(process));
}
int kol_kill_process(unsigned process)
{
asm volatile ("int $0x40"::"a"(18), "b"(2), "c"(process));
}
void kol_get_kernel_ver(char buff16b[])
{
asm volatile ("int $0x40"::"a"(18), "b"(13), "c"(buff16b));
}
int kol_buffer_open(char name[], int mode, int size, char **buf)
{
int error;
asm volatile ("int $0x40":"=a"(*buf), "=d"(error):"a"(68), "b"(22), "c"(name), "d"(size), "S"(mode));
return error;
}
void kol_buffer_close(char name[])
{
asm volatile ("int $0x40"::"a"(68), "b"(23), "c"(name));
} }

18
programs/emulator/e80/trunk/system/kolibri.h
View File

@ -1,6 +1,18 @@
#define NULL ((void*)0) #define NULL ((void*)0)
#define SHM_OPEN 0
#define SHM_OPEN_ALWAYS 0x04
#define SHM_CREATE 0x08
#define SHM_READ 0x00
#define SHM_WRITE 0x01
#define E_NOTFOUND 5
#define E_ACCESS 10
#define E_NOMEM 30
#define E_PARAM 33
typedef struct typedef struct
{ {
unsigned p00 __attribute__((packed)); unsigned p00 __attribute__((packed));
@ -37,7 +49,7 @@ void *data __attribute__((packed));
void kol_exit(); void kol_exit();
void kol_sleep(unsigned d); void kol_sleep(unsigned d);
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c); void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t);
void kol_wnd_move(unsigned x, unsigned y); void kol_wnd_move(unsigned x, unsigned y);
void kol_wnd_caption(char *s); void kol_wnd_caption(char *s);
void kol_event_mask(unsigned e); void kol_event_mask(unsigned e);
@ -88,3 +100,7 @@ unsigned kol_time_tick();
unsigned kol_sound_speaker(char data[]); unsigned kol_sound_speaker(char data[]);
unsigned kol_process_info(unsigned slot, char buf1k[]); unsigned kol_process_info(unsigned slot, char buf1k[]);
int kol_process_kill_pid(unsigned process); int kol_process_kill_pid(unsigned process);
void kol_get_kernel_ver(char buff16b[]);
int kol_kill_process(unsigned process);
int kol_buffer_open(char name[], int mode, int size, char **buf);
void kol_buffer_close(char name[]);

175
programs/games/console15/system/kolibri.c
View File

@ -10,193 +10,183 @@ extern char KOL_DIR[256];
void kol_exit() void kol_exit()
{ {
asm ("int $0x40"::"a"(-1)); asm volatile ("int $0x40"::"a"(-1));
} }
void kol_sleep(unsigned d) void kol_sleep(unsigned d)
{ {
asm ("int $0x40"::"a"(5), "b"(d)); asm volatile ("int $0x40"::"a"(5), "b"(d));
} }
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) // define a window
// x, y - position; w, h - size; cs - color and style; c - caption; b - boder
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t)
{ {
asm ("nop"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(cs), "D"(t), "S"(b) );
asm ("movl $0xffffff, %esi \n int $0x40");
} }
void kol_wnd_move(unsigned x, unsigned y) void kol_wnd_move(unsigned x, unsigned y)
{ {
asm ("nop"::"a"(67), "b"(x), "c"(y)); asm volatile ("int $0x40"::"a"(67), "b"(x), "c"(y), "d"(-1), "S"(-1));
asm ("movl $-1, %edx \n movl $-1, %esi \n int $0x40");
} }
void kol_event_mask(unsigned e) void kol_event_mask(unsigned e)
{ {
asm ("int $0x40"::"a"(40), "b"(e)); asm volatile ("int $0x40"::"a"(40), "b"(e));
} }
unsigned kol_event_wait() unsigned kol_event_wait()
{ {
asm ("int $0x40"::"a"(10)); asm volatile ("int $0x40"::"a"(10));
} }
unsigned kol_event_wait_time(unsigned time) unsigned kol_event_wait_time(unsigned time)
{ {
asm ("int $0x40"::"a"(23), "b"(time)); asm volatile ("int $0x40"::"a"(23), "b"(time));
} }
unsigned kol_event_check() unsigned kol_event_check()
{ {
asm ("int $0x40"::"a"(11)); asm volatile ("int $0x40"::"a"(11));
} }
void kol_paint_start() void __attribute__((__always_inline__)) kol_paint_start()
{ {
asm ("int $0x40"::"a"(12), "b"(1)); asm volatile ("int $0x40"::"a"(12), "b"(1));
} }
void kol_paint_end() void __attribute__((__always_inline__)) kol_paint_end()
{ {
asm ("int $0x40"::"a"(12), "b"(2)); asm volatile ("int $0x40"::"a"(12), "b"(2));
} }
void kol_paint_pixel(unsigned x, unsigned y, unsigned c) void kol_paint_pixel(unsigned x, unsigned y, unsigned c)
{ {
asm ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c)); asm volatile ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c));
} }
void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c)
{ {
asm ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c));
} }
void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c) void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c)
{ {
asm ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c)); asm volatile ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c));
} }
void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c) void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c)
{ {
asm ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s)); asm volatile ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s));
} }
void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d) void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d)
{ {
asm ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d));
} }
void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette) void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette)
{ {
asm ("nop"::"c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(65), "b"(d), "c"(w*65536+h), "d"(x*65536+y), "D"(palette), "S"(8));
asm ("nop"::"a"(palette));
asm ("movl %eax, %edi");
asm ("xor %eax, %eax");
asm ("movl %eax, %ebp");
asm ("pushl $8");
asm ("popl %esi");
asm ("int $0x40"::"a"(65));
} }
unsigned kol_key_get() unsigned kol_key_get()
{ {
asm ("int $0x40"::"a"(2)); asm volatile ("int $0x40"::"a"(2));
} }
unsigned kol_key_control() unsigned kol_key_control()
{ {
asm ("int $0x40"::"a"(66), "b"(3)); asm volatile ("int $0x40"::"a"(66), "b"(3));
} }
void kol_key_lang_set(unsigned lang) void kol_key_lang_set(unsigned lang)
{ {
asm ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang)); asm volatile ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang));
} }
unsigned kol_key_lang_get() unsigned kol_key_lang_get()
{ {
asm ("int $0x40"::"a"(26), "b"(2), "c"(9)); asm volatile ("int $0x40"::"a"(26), "b"(2), "c"(9));
} }
void kol_key_mode_set(unsigned mode) void kol_key_mode_set(unsigned mode)
{ {
asm ("int $0x40"::"a"(66), "b"(1), "c"(mode)); asm volatile ("int $0x40"::"a"(66), "b"(1), "c"(mode));
} }
unsigned kol_key_mode_get() unsigned kol_key_mode_get()
{ {
asm ("int $0x40"::"a"(66), "b"(2)); asm volatile ("int $0x40"::"a"(66), "b"(2));
} }
unsigned kol_btn_get() unsigned kol_btn_get()
{ {
asm ("int $0x40"::"a"(17)); asm volatile ("int $0x40"::"a"(17));
} }
void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c) void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c)
{ {
asm ("nop"::"b"(x*65536+w), "c"(y*65536+h), "d"(d)); asm volatile ("int $0x40"::"a"(8), "b"(x*65536+w), "c"(y*65536+h), "d"(d), "S"(c));
asm ("nop"::"a"(c));
asm ("movl %eax, %esi");
asm ("int $0x40"::"a"(8));
} }
void kol_btn_type(unsigned t) void kol_btn_type(unsigned t)
{ {
asm ("int $0x40"::"a"(48), "b"(1), "c"(t)); asm volatile ("int $0x40"::"a"(48), "b"(1), "c"(t));
} }
void kol_wnd_caption(char *s) void kol_wnd_caption(char *s)
{ {
asm ("int $0x40"::"a"(71), "b"(1), "c"(s)); asm volatile ("int $0x40"::"a"(71), "b"(1), "c"(s));
} }
unsigned kol_mouse_pos() unsigned kol_mouse_pos()
{ {
asm ("int $0x40"::"a"(37), "b"(0)); asm volatile ("int $0x40"::"a"(37), "b"(0));
} }
unsigned kol_mouse_posw() unsigned kol_mouse_posw()
{ {
asm ("int $0x40"::"a"(37), "b"(1)); asm volatile ("int $0x40"::"a"(37), "b"(1));
} }
unsigned kol_mouse_btn() unsigned kol_mouse_btn()
{ {
asm ("int $0x40"::"a"(37), "b"(2)); asm volatile ("int $0x40"::"a"(37), "b"(2));
} }
void kol_board_putc(char c) void kol_board_putc(char c)
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
} }
@ -206,7 +196,7 @@ unsigned i;
i = 0; i = 0;
while (*(s+i)) while (*(s+i))
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i))); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i)));
i++; i++;
} }
} }
@ -215,26 +205,25 @@ while (*(s+i))
void kol_board_puti(int n) void kol_board_puti(int n)
{ {
char c; char c;
int i = 0;
do if ( n > 1 )
{ kol_board_puti(n / 10);
c = n % 10 + '0';
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); c = n % 10 + '0';
i++; asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
}
while ((n /= 10) > 0);
} }
int kol_file_70(kol_struct70 *k) int kol_file_70(kol_struct70 *k)
{ {
asm ("int $0x40"::"a"(70), "b"(k)); asm volatile ("int $0x40"::"a"(70), "b"(k));
} }
kol_struct_import* kol_cofflib_load(char *name) kol_struct_import* kol_cofflib_load(char *name)
{ {
asm ("int $0x40"::"a"(68), "b"(19), "c"(name)); asm volatile ("int $0x40"::"a"(68), "b"(19), "c"(name));
} }
@ -285,37 +274,37 @@ for (i=0;;i++)
unsigned kol_system_cpufreq() unsigned kol_system_cpufreq()
{ {
asm ("int $0x40"::"a"(18), "b"(5)); asm volatile ("int $0x40"::"a"(18), "b"(5));
} }
unsigned kol_system_mem() unsigned kol_system_mem()
{ {
asm ("int $0x40"::"a"(18), "b"(17)); asm volatile ("int $0x40"::"a"(18), "b"(17));
} }
unsigned kol_system_memfree() unsigned kol_system_memfree()
{ {
asm ("int $0x40"::"a"(18), "b"(16)); asm volatile ("int $0x40"::"a"(18), "b"(16));
} }
unsigned kol_system_time_get() unsigned kol_system_time_get()
{ {
asm ("int $0x40"::"a"(3)); asm volatile ("int $0x40"::"a"(3));
} }
unsigned kol_system_date_get() unsigned kol_system_date_get()
{ {
asm ("int $0x40"::"a"(29)); asm volatile ("int $0x40"::"a"(29));
} }
unsigned kol_system_end(unsigned param) unsigned kol_system_end(unsigned param)
{ {
asm ("int $0x40"::"a"(18), "b"(9), "c"(param)); asm volatile ("int $0x40"::"a"(18), "b"(9), "c"(param));
} }
@ -337,30 +326,30 @@ void kol_path_full(char *full, char *fname)
char temp[256]; char temp[256];
switch (*fname) switch (*fname)
{ {
case '/': case '/':
strncpy(temp, fname+1, 2); strncpy(temp, fname+1, 2);
temp[2]=0; temp[2]=0;
if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) ) if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) )
strcpy (full, fname); strcpy (full, fname);
break; break;
case '.': case '.':
break; break;
default: default:
break; break;
}; };
} }
void kol_screen_wait_rr() void __attribute__((__always_inline__)) kol_screen_wait_rr()
{ {
asm ("int $0x40"::"a"(18), "b"(14)); asm volatile ("int $0x40"::"a"(18), "b"(14));
} }
@ -368,7 +357,7 @@ asm ("int $0x40"::"a"(18), "b"(14));
void kol_screen_get_size(unsigned *w, unsigned *h) void kol_screen_get_size(unsigned *w, unsigned *h)
{ {
unsigned size; unsigned size;
asm ("int $0x40":"=a"(size):"a"(14)); asm volatile ("int $0x40":"=a"(size):"a"(14));
*w = size / 65536; *w = size / 65536;
*h = size % 65536; *h = size % 65536;
} }
@ -377,46 +366,58 @@ asm ("int $0x40":"=a"(size):"a"(14));
unsigned kol_skin_height() unsigned kol_skin_height()
{ {
asm ("int $0x40"::"a"(48), "b"(4)); asm volatile ("int $0x40"::"a"(48), "b"(4));
} }
unsigned kol_thread_start(unsigned start, unsigned stack) unsigned kol_thread_start(unsigned start, unsigned stack)
{ {
asm ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack)); asm volatile ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack));
} }
unsigned kol_time_tick() unsigned kol_time_tick()
{ {
asm ("int $0x40"::"a"(26), "b"(9)); asm volatile ("int $0x40"::"a"(26), "b"(9));
} }
unsigned kol_sound_speaker(char data[]) unsigned kol_sound_speaker(char data[])
{ {
asm ("movl %0, %%esi"::"a"(data)); asm volatile ("movl %0, %%esi"::"a"(data));
asm ("int $0x40"::"a"(55), "b"(55)); asm volatile ("int $0x40"::"a"(55), "b"(55));
} }
unsigned kol_process_info(unsigned slot, char buf1k[]) unsigned kol_process_info(unsigned slot, char buf1k[])
{ {
asm ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot)); asm volatile ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot));
} }
int kol_process_kill_pid(unsigned process) int kol_process_kill_pid(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(18), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(18), "c"(process));
} }
int kol_kill_process(unsigned process) int kol_kill_process(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(2), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(2), "c"(process));
} }
void kol_get_kernel_ver(char buff16b[]) void kol_get_kernel_ver(char buff16b[])
{ {
asm ("int $0x40"::"a"(18), "b"(13), "c"(buff16b)); asm volatile ("int $0x40"::"a"(18), "b"(13), "c"(buff16b));
}
int kol_buffer_open(char name[], int mode, int size, char **buf)
{
int error;
asm volatile ("int $0x40":"=a"(*buf), "=d"(error):"a"(68), "b"(22), "c"(name), "d"(size), "S"(mode));
return error;
}
void kol_buffer_close(char name[])
{
asm volatile ("int $0x40"::"a"(68), "b"(23), "c"(name));
} }

16
programs/games/console15/system/kolibri.h
View File

@ -1,6 +1,18 @@
#define NULL ((void*)0) #define NULL ((void*)0)
#define SHM_OPEN 0
#define SHM_OPEN_ALWAYS 0x04
#define SHM_CREATE 0x08
#define SHM_READ 0x00
#define SHM_WRITE 0x01
#define E_NOTFOUND 5
#define E_ACCESS 10
#define E_NOMEM 30
#define E_PARAM 33
typedef struct typedef struct
{ {
unsigned p00 __attribute__((packed)); unsigned p00 __attribute__((packed));
@ -37,7 +49,7 @@ void *data __attribute__((packed));
void kol_exit(); void kol_exit();
void kol_sleep(unsigned d); void kol_sleep(unsigned d);
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c); void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t);
void kol_wnd_move(unsigned x, unsigned y); void kol_wnd_move(unsigned x, unsigned y);
void kol_wnd_caption(char *s); void kol_wnd_caption(char *s);
void kol_event_mask(unsigned e); void kol_event_mask(unsigned e);
@ -90,3 +102,5 @@ unsigned kol_process_info(unsigned slot, char buf1k[]);
int kol_process_kill_pid(unsigned process); int kol_process_kill_pid(unsigned process);
void kol_get_kernel_ver(char buff16b[]); void kol_get_kernel_ver(char buff16b[]);
int kol_kill_process(unsigned process); int kol_kill_process(unsigned process);
int kol_buffer_open(char name[], int mode, int size, char **buf);
void kol_buffer_close(char name[]);

3
programs/games/donkey/c_code.c
View File

@ -241,8 +241,7 @@ kol_paint_image(0, 0, 320, 200, screen.bmp);
void wnd_draw() void wnd_draw()
{ {
kol_paint_start(); kol_paint_start();
kol_wnd_define(280, 200, 328, 204+kol_skin_height(), 0x34888888); kol_wnd_define(280, 200, 328, 204+kol_skin_height(), 0x34888888, 0x34888888, STR_DONKEY);
kol_wnd_caption(STR_DONKEY);
screen_draw(); screen_draw();
kol_paint_end(); kol_paint_end();
} }

175
programs/games/donkey/system/kolibri.c
View File

@ -10,193 +10,183 @@ extern char KOL_DIR[256];
void kol_exit() void kol_exit()
{ {
asm ("int $0x40"::"a"(-1)); asm volatile ("int $0x40"::"a"(-1));
} }
void kol_sleep(unsigned d) void kol_sleep(unsigned d)
{ {
asm ("int $0x40"::"a"(5), "b"(d)); asm volatile ("int $0x40"::"a"(5), "b"(d));
} }
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) // define a window
// x, y - position; w, h - size; cs - color and style; c - caption; b - boder
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t)
{ {
asm ("nop"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(cs), "D"(t), "S"(b) );
asm ("movl $0xffffff, %esi \n int $0x40");
} }
void kol_wnd_move(unsigned x, unsigned y) void kol_wnd_move(unsigned x, unsigned y)
{ {
asm ("nop"::"a"(67), "b"(x), "c"(y)); asm volatile ("int $0x40"::"a"(67), "b"(x), "c"(y), "d"(-1), "S"(-1));
asm ("movl $-1, %edx \n movl $-1, %esi \n int $0x40");
} }
void kol_event_mask(unsigned e) void kol_event_mask(unsigned e)
{ {
asm ("int $0x40"::"a"(40), "b"(e)); asm volatile ("int $0x40"::"a"(40), "b"(e));
} }
unsigned kol_event_wait() unsigned kol_event_wait()
{ {
asm ("int $0x40"::"a"(10)); asm volatile ("int $0x40"::"a"(10));
} }
unsigned kol_event_wait_time(unsigned time) unsigned kol_event_wait_time(unsigned time)
{ {
asm ("int $0x40"::"a"(23), "b"(time)); asm volatile ("int $0x40"::"a"(23), "b"(time));
} }
unsigned kol_event_check() unsigned kol_event_check()
{ {
asm ("int $0x40"::"a"(11)); asm volatile ("int $0x40"::"a"(11));
} }
void kol_paint_start() void __attribute__((__always_inline__)) kol_paint_start()
{ {
asm ("int $0x40"::"a"(12), "b"(1)); asm volatile ("int $0x40"::"a"(12), "b"(1));
} }
void kol_paint_end() void __attribute__((__always_inline__)) kol_paint_end()
{ {
asm ("int $0x40"::"a"(12), "b"(2)); asm volatile ("int $0x40"::"a"(12), "b"(2));
} }
void kol_paint_pixel(unsigned x, unsigned y, unsigned c) void kol_paint_pixel(unsigned x, unsigned y, unsigned c)
{ {
asm ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c)); asm volatile ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c));
} }
void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c)
{ {
asm ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c));
} }
void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c) void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c)
{ {
asm ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c)); asm volatile ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c));
} }
void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c) void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c)
{ {
asm ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s)); asm volatile ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s));
} }
void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d) void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d)
{ {
asm ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d));
} }
void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette) void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette)
{ {
asm ("nop"::"c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(65), "b"(d), "c"(w*65536+h), "d"(x*65536+y), "D"(palette), "S"(8));
asm ("nop"::"a"(palette));
asm ("movl %eax, %edi");
asm ("xor %eax, %eax");
asm ("movl %eax, %ebp");
asm ("pushl $8");
asm ("popl %esi");
asm ("int $0x40"::"a"(65));
} }
unsigned kol_key_get() unsigned kol_key_get()
{ {
asm ("int $0x40"::"a"(2)); asm volatile ("int $0x40"::"a"(2));
} }
unsigned kol_key_control() unsigned kol_key_control()
{ {
asm ("int $0x40"::"a"(66), "b"(3)); asm volatile ("int $0x40"::"a"(66), "b"(3));
} }
void kol_key_lang_set(unsigned lang) void kol_key_lang_set(unsigned lang)
{ {
asm ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang)); asm volatile ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang));
} }
unsigned kol_key_lang_get() unsigned kol_key_lang_get()
{ {
asm ("int $0x40"::"a"(26), "b"(2), "c"(9)); asm volatile ("int $0x40"::"a"(26), "b"(2), "c"(9));
} }
void kol_key_mode_set(unsigned mode) void kol_key_mode_set(unsigned mode)
{ {
asm ("int $0x40"::"a"(66), "b"(1), "c"(mode)); asm volatile ("int $0x40"::"a"(66), "b"(1), "c"(mode));
} }
unsigned kol_key_mode_get() unsigned kol_key_mode_get()
{ {
asm ("int $0x40"::"a"(66), "b"(2)); asm volatile ("int $0x40"::"a"(66), "b"(2));
} }
unsigned kol_btn_get() unsigned kol_btn_get()
{ {
asm ("int $0x40"::"a"(17)); asm volatile ("int $0x40"::"a"(17));
} }
void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c) void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c)
{ {
asm ("nop"::"b"(x*65536+w), "c"(y*65536+h), "d"(d)); asm volatile ("int $0x40"::"a"(8), "b"(x*65536+w), "c"(y*65536+h), "d"(d), "S"(c));
asm ("nop"::"a"(c));
asm ("movl %eax, %esi");
asm ("int $0x40"::"a"(8));
} }
void kol_btn_type(unsigned t) void kol_btn_type(unsigned t)
{ {
asm ("int $0x40"::"a"(48), "b"(1), "c"(t)); asm volatile ("int $0x40"::"a"(48), "b"(1), "c"(t));
} }
void kol_wnd_caption(char *s) void kol_wnd_caption(char *s)
{ {
asm ("int $0x40"::"a"(71), "b"(1), "c"(s)); asm volatile ("int $0x40"::"a"(71), "b"(1), "c"(s));
} }
unsigned kol_mouse_pos() unsigned kol_mouse_pos()
{ {
asm ("int $0x40"::"a"(37), "b"(0)); asm volatile ("int $0x40"::"a"(37), "b"(0));
} }
unsigned kol_mouse_posw() unsigned kol_mouse_posw()
{ {
asm ("int $0x40"::"a"(37), "b"(1)); asm volatile ("int $0x40"::"a"(37), "b"(1));
} }
unsigned kol_mouse_btn() unsigned kol_mouse_btn()
{ {
asm ("int $0x40"::"a"(37), "b"(2)); asm volatile ("int $0x40"::"a"(37), "b"(2));
} }
void kol_board_putc(char c) void kol_board_putc(char c)
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
} }
@ -206,7 +196,7 @@ unsigned i;
i = 0; i = 0;
while (*(s+i)) while (*(s+i))
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i))); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i)));
i++; i++;
} }
} }
@ -215,26 +205,25 @@ while (*(s+i))
void kol_board_puti(int n) void kol_board_puti(int n)
{ {
char c; char c;
int i = 0;
do if ( n > 1 )
{ kol_board_puti(n / 10);
c = n % 10 + '0';
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); c = n % 10 + '0';
i++; asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
}
while ((n /= 10) > 0);
} }
int kol_file_70(kol_struct70 *k) int kol_file_70(kol_struct70 *k)
{ {
asm ("int $0x40"::"a"(70), "b"(k)); asm volatile ("int $0x40"::"a"(70), "b"(k));
} }
kol_struct_import* kol_cofflib_load(char *name) kol_struct_import* kol_cofflib_load(char *name)
{ {
asm ("int $0x40"::"a"(68), "b"(19), "c"(name)); asm volatile ("int $0x40"::"a"(68), "b"(19), "c"(name));
} }
@ -285,37 +274,37 @@ for (i=0;;i++)
unsigned kol_system_cpufreq() unsigned kol_system_cpufreq()
{ {
asm ("int $0x40"::"a"(18), "b"(5)); asm volatile ("int $0x40"::"a"(18), "b"(5));
} }
unsigned kol_system_mem() unsigned kol_system_mem()
{ {
asm ("int $0x40"::"a"(18), "b"(17)); asm volatile ("int $0x40"::"a"(18), "b"(17));
} }
unsigned kol_system_memfree() unsigned kol_system_memfree()
{ {
asm ("int $0x40"::"a"(18), "b"(16)); asm volatile ("int $0x40"::"a"(18), "b"(16));
} }
unsigned kol_system_time_get() unsigned kol_system_time_get()
{ {
asm ("int $0x40"::"a"(3)); asm volatile ("int $0x40"::"a"(3));
} }
unsigned kol_system_date_get() unsigned kol_system_date_get()
{ {
asm ("int $0x40"::"a"(29)); asm volatile ("int $0x40"::"a"(29));
} }
unsigned kol_system_end(unsigned param) unsigned kol_system_end(unsigned param)
{ {
asm ("int $0x40"::"a"(18), "b"(9), "c"(param)); asm volatile ("int $0x40"::"a"(18), "b"(9), "c"(param));
} }
@ -337,30 +326,30 @@ void kol_path_full(char *full, char *fname)
char temp[256]; char temp[256];
switch (*fname) switch (*fname)
{ {
case '/': case '/':
strncpy(temp, fname+1, 2); strncpy(temp, fname+1, 2);
temp[2]=0; temp[2]=0;
if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) ) if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) )
strcpy (full, fname); strcpy (full, fname);
break; break;
case '.': case '.':
break; break;
default: default:
break; break;
}; };
} }
void kol_screen_wait_rr() void __attribute__((__always_inline__)) kol_screen_wait_rr()
{ {
asm ("int $0x40"::"a"(18), "b"(14)); asm volatile ("int $0x40"::"a"(18), "b"(14));
} }
@ -368,7 +357,7 @@ asm ("int $0x40"::"a"(18), "b"(14));
void kol_screen_get_size(unsigned *w, unsigned *h) void kol_screen_get_size(unsigned *w, unsigned *h)
{ {
unsigned size; unsigned size;
asm ("int $0x40":"=a"(size):"a"(14)); asm volatile ("int $0x40":"=a"(size):"a"(14));
*w = size / 65536; *w = size / 65536;
*h = size % 65536; *h = size % 65536;
} }
@ -377,46 +366,58 @@ asm ("int $0x40":"=a"(size):"a"(14));
unsigned kol_skin_height() unsigned kol_skin_height()
{ {
asm ("int $0x40"::"a"(48), "b"(4)); asm volatile ("int $0x40"::"a"(48), "b"(4));
} }
unsigned kol_thread_start(unsigned start, unsigned stack) unsigned kol_thread_start(unsigned start, unsigned stack)
{ {
asm ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack)); asm volatile ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack));
} }
unsigned kol_time_tick() unsigned kol_time_tick()
{ {
asm ("int $0x40"::"a"(26), "b"(9)); asm volatile ("int $0x40"::"a"(26), "b"(9));
} }
unsigned kol_sound_speaker(char data[]) unsigned kol_sound_speaker(char data[])
{ {
asm ("movl %0, %%esi"::"a"(data)); asm volatile ("movl %0, %%esi"::"a"(data));
asm ("int $0x40"::"a"(55), "b"(55)); asm volatile ("int $0x40"::"a"(55), "b"(55));
} }
unsigned kol_process_info(unsigned slot, char buf1k[]) unsigned kol_process_info(unsigned slot, char buf1k[])
{ {
asm ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot)); asm volatile ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot));
} }
int kol_process_kill_pid(unsigned process) int kol_process_kill_pid(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(18), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(18), "c"(process));
} }
int kol_kill_process(unsigned process) int kol_kill_process(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(2), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(2), "c"(process));
} }
void kol_get_kernel_ver(char buff16b[]) void kol_get_kernel_ver(char buff16b[])
{ {
asm ("int $0x40"::"a"(18), "b"(13), "c"(buff16b)); asm volatile ("int $0x40"::"a"(18), "b"(13), "c"(buff16b));
}
int kol_buffer_open(char name[], int mode, int size, char **buf)
{
int error;
asm volatile ("int $0x40":"=a"(*buf), "=d"(error):"a"(68), "b"(22), "c"(name), "d"(size), "S"(mode));
return error;
}
void kol_buffer_close(char name[])
{
asm volatile ("int $0x40"::"a"(68), "b"(23), "c"(name));
} }

16
programs/games/donkey/system/kolibri.h
View File

@ -1,6 +1,18 @@
#define NULL ((void*)0) #define NULL ((void*)0)
#define SHM_OPEN 0
#define SHM_OPEN_ALWAYS 0x04
#define SHM_CREATE 0x08
#define SHM_READ 0x00
#define SHM_WRITE 0x01
#define E_NOTFOUND 5
#define E_ACCESS 10
#define E_NOMEM 30
#define E_PARAM 33
typedef struct typedef struct
{ {
unsigned p00 __attribute__((packed)); unsigned p00 __attribute__((packed));
@ -37,7 +49,7 @@ void *data __attribute__((packed));
void kol_exit(); void kol_exit();
void kol_sleep(unsigned d); void kol_sleep(unsigned d);
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c); void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t);
void kol_wnd_move(unsigned x, unsigned y); void kol_wnd_move(unsigned x, unsigned y);
void kol_wnd_caption(char *s); void kol_wnd_caption(char *s);
void kol_event_mask(unsigned e); void kol_event_mask(unsigned e);
@ -90,3 +102,5 @@ unsigned kol_process_info(unsigned slot, char buf1k[]);
int kol_process_kill_pid(unsigned process); int kol_process_kill_pid(unsigned process);
void kol_get_kernel_ver(char buff16b[]); void kol_get_kernel_ver(char buff16b[]);
int kol_kill_process(unsigned process); int kol_kill_process(unsigned process);
int kol_buffer_open(char name[], int mode, int size, char **buf);
void kol_buffer_close(char name[]);

155
programs/games/mcities/system/kolibri.c
View File

@ -10,193 +10,183 @@ extern char KOL_DIR[256];
void kol_exit() void kol_exit()
{ {
asm ("int $0x40"::"a"(-1)); asm volatile ("int $0x40"::"a"(-1));
} }
void kol_sleep(unsigned d) void kol_sleep(unsigned d)
{ {
asm ("int $0x40"::"a"(5), "b"(d)); asm volatile ("int $0x40"::"a"(5), "b"(d));
} }
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) // define a window
// x, y - position; w, h - size; cs - color and style; c - caption; b - boder
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t)
{ {
asm ("nop"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(cs), "D"(t), "S"(b) );
asm ("movl $0xffffff, %esi \n int $0x40");
} }
void kol_wnd_move(unsigned x, unsigned y) void kol_wnd_move(unsigned x, unsigned y)
{ {
asm ("nop"::"a"(67), "b"(x), "c"(y)); asm volatile ("int $0x40"::"a"(67), "b"(x), "c"(y), "d"(-1), "S"(-1));
asm ("movl $-1, %edx \n movl $-1, %esi \n int $0x40");
} }
void kol_event_mask(unsigned e) void kol_event_mask(unsigned e)
{ {
asm ("int $0x40"::"a"(40), "b"(e)); asm volatile ("int $0x40"::"a"(40), "b"(e));
} }
unsigned kol_event_wait() unsigned kol_event_wait()
{ {
asm ("int $0x40"::"a"(10)); asm volatile ("int $0x40"::"a"(10));
} }
unsigned kol_event_wait_time(unsigned time) unsigned kol_event_wait_time(unsigned time)
{ {
asm ("int $0x40"::"a"(23), "b"(time)); asm volatile ("int $0x40"::"a"(23), "b"(time));
} }
unsigned kol_event_check() unsigned kol_event_check()
{ {
asm ("int $0x40"::"a"(11)); asm volatile ("int $0x40"::"a"(11));
} }
void kol_paint_start() void __attribute__((__always_inline__)) kol_paint_start()
{ {
asm ("int $0x40"::"a"(12), "b"(1)); asm volatile ("int $0x40"::"a"(12), "b"(1));
} }
void kol_paint_end() void __attribute__((__always_inline__)) kol_paint_end()
{ {
asm ("int $0x40"::"a"(12), "b"(2)); asm volatile ("int $0x40"::"a"(12), "b"(2));
} }
void kol_paint_pixel(unsigned x, unsigned y, unsigned c) void kol_paint_pixel(unsigned x, unsigned y, unsigned c)
{ {
asm ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c)); asm volatile ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c));
} }
void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c)
{ {
asm ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c));
} }
void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c) void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c)
{ {
asm ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c)); asm volatile ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c));
} }
void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c) void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c)
{ {
asm ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s)); asm volatile ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s));
} }
void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d) void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d)
{ {
asm ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d));
} }
void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette) void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette)
{ {
asm ("nop"::"c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(65), "b"(d), "c"(w*65536+h), "d"(x*65536+y), "D"(palette), "S"(8));
asm ("nop"::"a"(palette));
asm ("movl %eax, %edi");
asm ("xor %eax, %eax");
asm ("movl %eax, %ebp");
asm ("pushl $8");
asm ("popl %esi");
asm ("int $0x40"::"a"(65));
} }
unsigned kol_key_get() unsigned kol_key_get()
{ {
asm ("int $0x40"::"a"(2)); asm volatile ("int $0x40"::"a"(2));
} }
unsigned kol_key_control() unsigned kol_key_control()
{ {
asm ("int $0x40"::"a"(66), "b"(3)); asm volatile ("int $0x40"::"a"(66), "b"(3));
} }
void kol_key_lang_set(unsigned lang) void kol_key_lang_set(unsigned lang)
{ {
asm ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang)); asm volatile ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang));
} }
unsigned kol_key_lang_get() unsigned kol_key_lang_get()
{ {
asm ("int $0x40"::"a"(26), "b"(2), "c"(9)); asm volatile ("int $0x40"::"a"(26), "b"(2), "c"(9));
} }
void kol_key_mode_set(unsigned mode) void kol_key_mode_set(unsigned mode)
{ {
asm ("int $0x40"::"a"(66), "b"(1), "c"(mode)); asm volatile ("int $0x40"::"a"(66), "b"(1), "c"(mode));
} }
unsigned kol_key_mode_get() unsigned kol_key_mode_get()
{ {
asm ("int $0x40"::"a"(66), "b"(2)); asm volatile ("int $0x40"::"a"(66), "b"(2));
} }
unsigned kol_btn_get() unsigned kol_btn_get()
{ {
asm ("int $0x40"::"a"(17)); asm volatile ("int $0x40"::"a"(17));
} }
void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c) void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c)
{ {
asm ("nop"::"b"(x*65536+w), "c"(y*65536+h), "d"(d)); asm volatile ("int $0x40"::"a"(8), "b"(x*65536+w), "c"(y*65536+h), "d"(d), "S"(c));
asm ("nop"::"a"(c));
asm ("movl %eax, %esi");
asm ("int $0x40"::"a"(8));
} }
void kol_btn_type(unsigned t) void kol_btn_type(unsigned t)
{ {
asm ("int $0x40"::"a"(48), "b"(1), "c"(t)); asm volatile ("int $0x40"::"a"(48), "b"(1), "c"(t));
} }
void kol_wnd_caption(char *s) void kol_wnd_caption(char *s)
{ {
asm ("int $0x40"::"a"(71), "b"(1), "c"(s)); asm volatile ("int $0x40"::"a"(71), "b"(1), "c"(s));
} }
unsigned kol_mouse_pos() unsigned kol_mouse_pos()
{ {
asm ("int $0x40"::"a"(37), "b"(0)); asm volatile ("int $0x40"::"a"(37), "b"(0));
} }
unsigned kol_mouse_posw() unsigned kol_mouse_posw()
{ {
asm ("int $0x40"::"a"(37), "b"(1)); asm volatile ("int $0x40"::"a"(37), "b"(1));
} }
unsigned kol_mouse_btn() unsigned kol_mouse_btn()
{ {
asm ("int $0x40"::"a"(37), "b"(2)); asm volatile ("int $0x40"::"a"(37), "b"(2));
} }
void kol_board_putc(char c) void kol_board_putc(char c)
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
} }
@ -206,7 +196,7 @@ unsigned i;
i = 0; i = 0;
while (*(s+i)) while (*(s+i))
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i))); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i)));
i++; i++;
} }
} }
@ -220,20 +210,20 @@ if ( n > 1 )
kol_board_puti(n / 10); kol_board_puti(n / 10);
c = n % 10 + '0'; c = n % 10 + '0';
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
} }
int kol_file_70(kol_struct70 *k) int kol_file_70(kol_struct70 *k)
{ {
asm ("int $0x40"::"a"(70), "b"(k)); asm volatile ("int $0x40"::"a"(70), "b"(k));
} }
kol_struct_import* kol_cofflib_load(char *name) kol_struct_import* kol_cofflib_load(char *name)
{ {
asm ("int $0x40"::"a"(68), "b"(19), "c"(name)); asm volatile ("int $0x40"::"a"(68), "b"(19), "c"(name));
} }
@ -284,37 +274,37 @@ for (i=0;;i++)
unsigned kol_system_cpufreq() unsigned kol_system_cpufreq()
{ {
asm ("int $0x40"::"a"(18), "b"(5)); asm volatile ("int $0x40"::"a"(18), "b"(5));
} }
unsigned kol_system_mem() unsigned kol_system_mem()
{ {
asm ("int $0x40"::"a"(18), "b"(17)); asm volatile ("int $0x40"::"a"(18), "b"(17));
} }
unsigned kol_system_memfree() unsigned kol_system_memfree()
{ {
asm ("int $0x40"::"a"(18), "b"(16)); asm volatile ("int $0x40"::"a"(18), "b"(16));
} }
unsigned kol_system_time_get() unsigned kol_system_time_get()
{ {
asm ("int $0x40"::"a"(3)); asm volatile ("int $0x40"::"a"(3));
} }
unsigned kol_system_date_get() unsigned kol_system_date_get()
{ {
asm ("int $0x40"::"a"(29)); asm volatile ("int $0x40"::"a"(29));
} }
unsigned kol_system_end(unsigned param) unsigned kol_system_end(unsigned param)
{ {
asm ("int $0x40"::"a"(18), "b"(9), "c"(param)); asm volatile ("int $0x40"::"a"(18), "b"(9), "c"(param));
} }
@ -336,30 +326,30 @@ void kol_path_full(char *full, char *fname)
char temp[256]; char temp[256];
switch (*fname) switch (*fname)
{ {
case '/': case '/':
strncpy(temp, fname+1, 2); strncpy(temp, fname+1, 2);
temp[2]=0; temp[2]=0;
if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) ) if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) )
strcpy (full, fname); strcpy (full, fname);
break; break;
case '.': case '.':
break; break;
default: default:
break; break;
}; };
} }
void kol_screen_wait_rr() void __attribute__((__always_inline__)) kol_screen_wait_rr()
{ {
asm ("int $0x40"::"a"(18), "b"(14)); asm volatile ("int $0x40"::"a"(18), "b"(14));
} }
@ -367,7 +357,7 @@ asm ("int $0x40"::"a"(18), "b"(14));
void kol_screen_get_size(unsigned *w, unsigned *h) void kol_screen_get_size(unsigned *w, unsigned *h)
{ {
unsigned size; unsigned size;
asm ("int $0x40":"=a"(size):"a"(14)); asm volatile ("int $0x40":"=a"(size):"a"(14));
*w = size / 65536; *w = size / 65536;
*h = size % 65536; *h = size % 65536;
} }
@ -376,59 +366,58 @@ asm ("int $0x40":"=a"(size):"a"(14));
unsigned kol_skin_height() unsigned kol_skin_height()
{ {
asm ("int $0x40"::"a"(48), "b"(4)); asm volatile ("int $0x40"::"a"(48), "b"(4));
} }
unsigned kol_thread_start(unsigned start, unsigned stack) unsigned kol_thread_start(unsigned start, unsigned stack)
{ {
asm ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack)); asm volatile ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack));
} }
unsigned kol_time_tick() unsigned kol_time_tick()
{ {
asm ("int $0x40"::"a"(26), "b"(9)); asm volatile ("int $0x40"::"a"(26), "b"(9));
} }
unsigned kol_sound_speaker(char data[]) unsigned kol_sound_speaker(char data[])
{ {
asm ("movl %0, %%esi"::"a"(data)); asm volatile ("movl %0, %%esi"::"a"(data));
asm ("int $0x40"::"a"(55), "b"(55)); asm volatile ("int $0x40"::"a"(55), "b"(55));
} }
unsigned kol_process_info(unsigned slot, char buf1k[]) unsigned kol_process_info(unsigned slot, char buf1k[])
{ {
asm ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot)); asm volatile ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot));
} }
int kol_process_kill_pid(unsigned process) int kol_process_kill_pid(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(18), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(18), "c"(process));
} }
int kol_kill_process(unsigned process) int kol_kill_process(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(2), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(2), "c"(process));
} }
void kol_get_kernel_ver(char buff16b[]) void kol_get_kernel_ver(char buff16b[])
{ {
asm ("int $0x40"::"a"(18), "b"(13), "c"(buff16b)); asm volatile ("int $0x40"::"a"(18), "b"(13), "c"(buff16b));
} }
int kol_buffer_open(char name[], int mode, int size, char **buf) int kol_buffer_open(char name[], int mode, int size, char **buf)
{ {
int error; int error;
asm ("movl %0, %%esi"::"r"(mode)); asm volatile ("int $0x40":"=a"(*buf), "=d"(error):"a"(68), "b"(22), "c"(name), "d"(size), "S"(mode));
asm ("int $0x40":"=a"(*buf), "=d"(error):"a"(68), "b"(22), "c"(name), "d"(size));
return error; return error;
} }
void kol_buffer_close(char name[]) void kol_buffer_close(char name[])
{ {
asm ("int $0x40"::"a"(68), "b"(23), "c"(name)); asm volatile ("int $0x40"::"a"(68), "b"(23), "c"(name));
} }

2
programs/games/mcities/system/kolibri.h
View File

@ -49,7 +49,7 @@ void *data __attribute__((packed));
void kol_exit(); void kol_exit();
void kol_sleep(unsigned d); void kol_sleep(unsigned d);
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c); void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t);
void kol_wnd_move(unsigned x, unsigned y); void kol_wnd_move(unsigned x, unsigned y);
void kol_wnd_caption(char *s); void kol_wnd_caption(char *s);
void kol_event_mask(unsigned e); void kol_event_mask(unsigned e);

3
programs/games/piton/c_code.c
View File

@ -219,8 +219,7 @@ kol_paint_image(0, 0, scrw, scrh, screen.bmp);
void wnd_draw() void wnd_draw()
{ {
kol_paint_start(); kol_paint_start();
kol_wnd_define(280, 30, scrw+8, scrh+kol_skin_height()+4, 0x34888888); kol_wnd_define(280, 30, scrw+8, scrh+kol_skin_height()+4, 0x34888888, 0x34888888, STR_TITLE);
kol_wnd_caption(STR_TITLE);
screen_draw(); screen_draw();
kol_paint_end(); kol_paint_end();
} }

175
programs/games/piton/system/kolibri.c
View File

@ -10,193 +10,183 @@ extern char KOL_DIR[256];
void kol_exit() void kol_exit()
{ {
asm ("int $0x40"::"a"(-1)); asm volatile ("int $0x40"::"a"(-1));
} }
void kol_sleep(unsigned d) void kol_sleep(unsigned d)
{ {
asm ("int $0x40"::"a"(5), "b"(d)); asm volatile ("int $0x40"::"a"(5), "b"(d));
} }
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) // define a window
// x, y - position; w, h - size; cs - color and style; c - caption; b - boder
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t)
{ {
asm ("nop"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(cs), "D"(t), "S"(b) );
asm ("movl $0xffffff, %esi \n int $0x40");
} }
void kol_wnd_move(unsigned x, unsigned y) void kol_wnd_move(unsigned x, unsigned y)
{ {
asm ("nop"::"a"(67), "b"(x), "c"(y)); asm volatile ("int $0x40"::"a"(67), "b"(x), "c"(y), "d"(-1), "S"(-1));
asm ("movl $-1, %edx \n movl $-1, %esi \n int $0x40");
} }
void kol_event_mask(unsigned e) void kol_event_mask(unsigned e)
{ {
asm ("int $0x40"::"a"(40), "b"(e)); asm volatile ("int $0x40"::"a"(40), "b"(e));
} }
unsigned kol_event_wait() unsigned kol_event_wait()
{ {
asm ("int $0x40"::"a"(10)); asm volatile ("int $0x40"::"a"(10));
} }
unsigned kol_event_wait_time(unsigned time) unsigned kol_event_wait_time(unsigned time)
{ {
asm ("int $0x40"::"a"(23), "b"(time)); asm volatile ("int $0x40"::"a"(23), "b"(time));
} }
unsigned kol_event_check() unsigned kol_event_check()
{ {
asm ("int $0x40"::"a"(11)); asm volatile ("int $0x40"::"a"(11));
} }
void kol_paint_start() void __attribute__((__always_inline__)) kol_paint_start()
{ {
asm ("int $0x40"::"a"(12), "b"(1)); asm volatile ("int $0x40"::"a"(12), "b"(1));
} }
void kol_paint_end() void __attribute__((__always_inline__)) kol_paint_end()
{ {
asm ("int $0x40"::"a"(12), "b"(2)); asm volatile ("int $0x40"::"a"(12), "b"(2));
} }
void kol_paint_pixel(unsigned x, unsigned y, unsigned c) void kol_paint_pixel(unsigned x, unsigned y, unsigned c)
{ {
asm ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c)); asm volatile ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c));
} }
void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c)
{ {
asm ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c));
} }
void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c) void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c)
{ {
asm ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c)); asm volatile ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c));
} }
void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c) void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c)
{ {
asm ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s)); asm volatile ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s));
} }
void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d) void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d)
{ {
asm ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d));
} }
void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette) void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette)
{ {
asm ("nop"::"c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(65), "b"(d), "c"(w*65536+h), "d"(x*65536+y), "D"(palette), "S"(8));
asm ("nop"::"a"(palette));
asm ("movl %eax, %edi");
asm ("xor %eax, %eax");
asm ("movl %eax, %ebp");
asm ("pushl $8");
asm ("popl %esi");
asm ("int $0x40"::"a"(65));
} }
unsigned kol_key_get() unsigned kol_key_get()
{ {
asm ("int $0x40"::"a"(2)); asm volatile ("int $0x40"::"a"(2));
} }
unsigned kol_key_control() unsigned kol_key_control()
{ {
asm ("int $0x40"::"a"(66), "b"(3)); asm volatile ("int $0x40"::"a"(66), "b"(3));
} }
void kol_key_lang_set(unsigned lang) void kol_key_lang_set(unsigned lang)
{ {
asm ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang)); asm volatile ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang));
} }
unsigned kol_key_lang_get() unsigned kol_key_lang_get()
{ {
asm ("int $0x40"::"a"(26), "b"(2), "c"(9)); asm volatile ("int $0x40"::"a"(26), "b"(2), "c"(9));
} }
void kol_key_mode_set(unsigned mode) void kol_key_mode_set(unsigned mode)
{ {
asm ("int $0x40"::"a"(66), "b"(1), "c"(mode)); asm volatile ("int $0x40"::"a"(66), "b"(1), "c"(mode));
} }
unsigned kol_key_mode_get() unsigned kol_key_mode_get()
{ {
asm ("int $0x40"::"a"(66), "b"(2)); asm volatile ("int $0x40"::"a"(66), "b"(2));
} }
unsigned kol_btn_get() unsigned kol_btn_get()
{ {
asm ("int $0x40"::"a"(17)); asm volatile ("int $0x40"::"a"(17));
} }
void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c) void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c)
{ {
asm ("nop"::"b"(x*65536+w), "c"(y*65536+h), "d"(d)); asm volatile ("int $0x40"::"a"(8), "b"(x*65536+w), "c"(y*65536+h), "d"(d), "S"(c));
asm ("nop"::"a"(c));
asm ("movl %eax, %esi");
asm ("int $0x40"::"a"(8));
} }
void kol_btn_type(unsigned t) void kol_btn_type(unsigned t)
{ {
asm ("int $0x40"::"a"(48), "b"(1), "c"(t)); asm volatile ("int $0x40"::"a"(48), "b"(1), "c"(t));
} }
void kol_wnd_caption(char *s) void kol_wnd_caption(char *s)
{ {
asm ("int $0x40"::"a"(71), "b"(1), "c"(s)); asm volatile ("int $0x40"::"a"(71), "b"(1), "c"(s));
} }
unsigned kol_mouse_pos() unsigned kol_mouse_pos()
{ {
asm ("int $0x40"::"a"(37), "b"(0)); asm volatile ("int $0x40"::"a"(37), "b"(0));
} }
unsigned kol_mouse_posw() unsigned kol_mouse_posw()
{ {
asm ("int $0x40"::"a"(37), "b"(1)); asm volatile ("int $0x40"::"a"(37), "b"(1));
} }
unsigned kol_mouse_btn() unsigned kol_mouse_btn()
{ {
asm ("int $0x40"::"a"(37), "b"(2)); asm volatile ("int $0x40"::"a"(37), "b"(2));
} }
void kol_board_putc(char c) void kol_board_putc(char c)
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
} }
@ -206,7 +196,7 @@ unsigned i;
i = 0; i = 0;
while (*(s+i)) while (*(s+i))
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i))); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i)));
i++; i++;
} }
} }
@ -215,26 +205,25 @@ while (*(s+i))
void kol_board_puti(int n) void kol_board_puti(int n)
{ {
char c; char c;
int i = 0;
do if ( n > 1 )
{ kol_board_puti(n / 10);
c = n % 10 + '0';
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); c = n % 10 + '0';
i++; asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
}
while ((n /= 10) > 0);
} }
int kol_file_70(kol_struct70 *k) int kol_file_70(kol_struct70 *k)
{ {
asm ("int $0x40"::"a"(70), "b"(k)); asm volatile ("int $0x40"::"a"(70), "b"(k));
} }
kol_struct_import* kol_cofflib_load(char *name) kol_struct_import* kol_cofflib_load(char *name)
{ {
asm ("int $0x40"::"a"(68), "b"(19), "c"(name)); asm volatile ("int $0x40"::"a"(68), "b"(19), "c"(name));
} }
@ -285,37 +274,37 @@ for (i=0;;i++)
unsigned kol_system_cpufreq() unsigned kol_system_cpufreq()
{ {
asm ("int $0x40"::"a"(18), "b"(5)); asm volatile ("int $0x40"::"a"(18), "b"(5));
} }
unsigned kol_system_mem() unsigned kol_system_mem()
{ {
asm ("int $0x40"::"a"(18), "b"(17)); asm volatile ("int $0x40"::"a"(18), "b"(17));
} }
unsigned kol_system_memfree() unsigned kol_system_memfree()
{ {
asm ("int $0x40"::"a"(18), "b"(16)); asm volatile ("int $0x40"::"a"(18), "b"(16));
} }
unsigned kol_system_time_get() unsigned kol_system_time_get()
{ {
asm ("int $0x40"::"a"(3)); asm volatile ("int $0x40"::"a"(3));
} }
unsigned kol_system_date_get() unsigned kol_system_date_get()
{ {
asm ("int $0x40"::"a"(29)); asm volatile ("int $0x40"::"a"(29));
} }
unsigned kol_system_end(unsigned param) unsigned kol_system_end(unsigned param)
{ {
asm ("int $0x40"::"a"(18), "b"(9), "c"(param)); asm volatile ("int $0x40"::"a"(18), "b"(9), "c"(param));
} }
@ -337,30 +326,30 @@ void kol_path_full(char *full, char *fname)
char temp[256]; char temp[256];
switch (*fname) switch (*fname)
{ {
case '/': case '/':
strncpy(temp, fname+1, 2); strncpy(temp, fname+1, 2);
temp[2]=0; temp[2]=0;
if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) ) if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) )
strcpy (full, fname); strcpy (full, fname);
break; break;
case '.': case '.':
break; break;
default: default:
break; break;
}; };
} }
void kol_screen_wait_rr() void __attribute__((__always_inline__)) kol_screen_wait_rr()
{ {
asm ("int $0x40"::"a"(18), "b"(14)); asm volatile ("int $0x40"::"a"(18), "b"(14));
} }
@ -368,7 +357,7 @@ asm ("int $0x40"::"a"(18), "b"(14));
void kol_screen_get_size(unsigned *w, unsigned *h) void kol_screen_get_size(unsigned *w, unsigned *h)
{ {
unsigned size; unsigned size;
asm ("int $0x40":"=a"(size):"a"(14)); asm volatile ("int $0x40":"=a"(size):"a"(14));
*w = size / 65536; *w = size / 65536;
*h = size % 65536; *h = size % 65536;
} }
@ -377,46 +366,58 @@ asm ("int $0x40":"=a"(size):"a"(14));
unsigned kol_skin_height() unsigned kol_skin_height()
{ {
asm ("int $0x40"::"a"(48), "b"(4)); asm volatile ("int $0x40"::"a"(48), "b"(4));
} }
unsigned kol_thread_start(unsigned start, unsigned stack) unsigned kol_thread_start(unsigned start, unsigned stack)
{ {
asm ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack)); asm volatile ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack));
} }
unsigned kol_time_tick() unsigned kol_time_tick()
{ {
asm ("int $0x40"::"a"(26), "b"(9)); asm volatile ("int $0x40"::"a"(26), "b"(9));
} }
unsigned kol_sound_speaker(char data[]) unsigned kol_sound_speaker(char data[])
{ {
asm ("movl %0, %%esi"::"a"(data)); asm volatile ("movl %0, %%esi"::"a"(data));
asm ("int $0x40"::"a"(55), "b"(55)); asm volatile ("int $0x40"::"a"(55), "b"(55));
} }
unsigned kol_process_info(unsigned slot, char buf1k[]) unsigned kol_process_info(unsigned slot, char buf1k[])
{ {
asm ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot)); asm volatile ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot));
} }
int kol_process_kill_pid(unsigned process) int kol_process_kill_pid(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(18), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(18), "c"(process));
} }
int kol_kill_process(unsigned process) int kol_kill_process(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(2), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(2), "c"(process));
} }
void kol_get_kernel_ver(char buff16b[]) void kol_get_kernel_ver(char buff16b[])
{ {
asm ("int $0x40"::"a"(18), "b"(13), "c"(buff16b)); asm volatile ("int $0x40"::"a"(18), "b"(13), "c"(buff16b));
}
int kol_buffer_open(char name[], int mode, int size, char **buf)
{
int error;
asm volatile ("int $0x40":"=a"(*buf), "=d"(error):"a"(68), "b"(22), "c"(name), "d"(size), "S"(mode));
return error;
}
void kol_buffer_close(char name[])
{
asm volatile ("int $0x40"::"a"(68), "b"(23), "c"(name));
} }

16
programs/games/piton/system/kolibri.h
View File

@ -1,6 +1,18 @@
#define NULL ((void*)0) #define NULL ((void*)0)
#define SHM_OPEN 0
#define SHM_OPEN_ALWAYS 0x04
#define SHM_CREATE 0x08
#define SHM_READ 0x00
#define SHM_WRITE 0x01
#define E_NOTFOUND 5
#define E_ACCESS 10
#define E_NOMEM 30
#define E_PARAM 33
typedef struct typedef struct
{ {
unsigned p00 __attribute__((packed)); unsigned p00 __attribute__((packed));
@ -37,7 +49,7 @@ void *data __attribute__((packed));
void kol_exit(); void kol_exit();
void kol_sleep(unsigned d); void kol_sleep(unsigned d);
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c); void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t);
void kol_wnd_move(unsigned x, unsigned y); void kol_wnd_move(unsigned x, unsigned y);
void kol_wnd_caption(char *s); void kol_wnd_caption(char *s);
void kol_event_mask(unsigned e); void kol_event_mask(unsigned e);
@ -90,3 +102,5 @@ unsigned kol_process_info(unsigned slot, char buf1k[]);
int kol_process_kill_pid(unsigned process); int kol_process_kill_pid(unsigned process);
void kol_get_kernel_ver(char buff16b[]); void kol_get_kernel_ver(char buff16b[]);
int kol_kill_process(unsigned process); int kol_kill_process(unsigned process);
int kol_buffer_open(char name[], int mode, int size, char **buf);
void kol_buffer_close(char name[]);

18
programs/system/shell/cmd/cmd_memory.c
View File

@ -1,18 +0,0 @@
int cmd_memory(char param[])
{
unsigned total, free, used;
total = kol_system_mem();
free = kol_system_memfree();
used = total - free;
#if LANG_ENG
printf (" Total [kB / MB / %%]: %-7d / %-5d / 100\n\r Free [kB / MB / %%]: %-7d / %-5d / %d\n\r Used [kB / MB / %%]: %-7d / %-5d / %d\n\r",
#elif LANG_RUS
printf (" ‚ᥣ® [Š<> / Œ<> / %%]: %-7d / %-5d / 100\n\r ‘¢®¡®¤­® [Š<> / Œ<> / %%]: %-7d / %-5d / %d\n\r ˆá¯®«ì§ã¥âáï [Š<> / Œ<> / %%]: %-7d / %-5d / %d\n\r",
#endif
total, total/1024, free, free/1024, (free*100)/total, used, total/1024-free/1024, 100-(free*100)/total );
return TRUE;
}

155
programs/system/shell/system/kolibri.c
View File

@ -10,193 +10,183 @@ extern char KOL_DIR[256];
void kol_exit() void kol_exit()
{ {
asm ("int $0x40"::"a"(-1)); asm volatile ("int $0x40"::"a"(-1));
} }
void kol_sleep(unsigned d) void kol_sleep(unsigned d)
{ {
asm ("int $0x40"::"a"(5), "b"(d)); asm volatile ("int $0x40"::"a"(5), "b"(d));
} }
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) // define a window
// x, y - position; w, h - size; cs - color and style; c - caption; b - boder
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t)
{ {
asm ("nop"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(0), "b"(x*65536+w), "c"(y*65536+h), "d"(cs), "D"(t), "S"(b) );
asm ("movl $0xffffff, %esi \n int $0x40");
} }
void kol_wnd_move(unsigned x, unsigned y) void kol_wnd_move(unsigned x, unsigned y)
{ {
asm ("nop"::"a"(67), "b"(x), "c"(y)); asm volatile ("int $0x40"::"a"(67), "b"(x), "c"(y), "d"(-1), "S"(-1));
asm ("movl $-1, %edx \n movl $-1, %esi \n int $0x40");
} }
void kol_event_mask(unsigned e) void kol_event_mask(unsigned e)
{ {
asm ("int $0x40"::"a"(40), "b"(e)); asm volatile ("int $0x40"::"a"(40), "b"(e));
} }
unsigned kol_event_wait() unsigned kol_event_wait()
{ {
asm ("int $0x40"::"a"(10)); asm volatile ("int $0x40"::"a"(10));
} }
unsigned kol_event_wait_time(unsigned time) unsigned kol_event_wait_time(unsigned time)
{ {
asm ("int $0x40"::"a"(23), "b"(time)); asm volatile ("int $0x40"::"a"(23), "b"(time));
} }
unsigned kol_event_check() unsigned kol_event_check()
{ {
asm ("int $0x40"::"a"(11)); asm volatile ("int $0x40"::"a"(11));
} }
void kol_paint_start() void __attribute__((__always_inline__)) kol_paint_start()
{ {
asm ("int $0x40"::"a"(12), "b"(1)); asm volatile ("int $0x40"::"a"(12), "b"(1));
} }
void kol_paint_end() void __attribute__((__always_inline__)) kol_paint_end()
{ {
asm ("int $0x40"::"a"(12), "b"(2)); asm volatile ("int $0x40"::"a"(12), "b"(2));
} }
void kol_paint_pixel(unsigned x, unsigned y, unsigned c) void kol_paint_pixel(unsigned x, unsigned y, unsigned c)
{ {
asm ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c)); asm volatile ("int $0x40"::"a"(1), "b"(x), "c"(y), "d"(c));
} }
void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c) void kol_paint_bar(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c)
{ {
asm ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c)); asm volatile ("int $0x40"::"a"(13), "b"(x*65536+w), "c"(y*65536+h), "d"(c));
} }
void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c) void kol_paint_line(unsigned x1, unsigned y1, unsigned x2, unsigned y2, unsigned c)
{ {
asm ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c)); asm volatile ("int $0x40"::"a"(38), "b"(x1*65536+x2), "c"(y1*65536+y2), "d"(c));
} }
void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c) void kol_paint_string(unsigned x, unsigned y, char *s, unsigned c)
{ {
asm ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s)); asm volatile ("int $0x40"::"a"(4), "b"(x*65536+y), "c"(c), "d"(s));
} }
void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d) void kol_paint_image(unsigned x, unsigned y, unsigned w, unsigned h, char *d)
{ {
asm ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(7), "c"(w*65536+h), "d"(x*65536+y), "b"(d));
} }
void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette) void kol_paint_image_pal(unsigned x, unsigned y, unsigned w, unsigned h, char *d, unsigned *palette)
{ {
asm ("nop"::"c"(w*65536+h), "d"(x*65536+y), "b"(d)); asm volatile ("int $0x40"::"a"(65), "b"(d), "c"(w*65536+h), "d"(x*65536+y), "D"(palette), "S"(8));
asm ("nop"::"a"(palette));
asm ("movl %eax, %edi");
asm ("xor %eax, %eax");
asm ("movl %eax, %ebp");
asm ("pushl $8");
asm ("popl %esi");
asm ("int $0x40"::"a"(65));
} }
unsigned kol_key_get() unsigned kol_key_get()
{ {
asm ("int $0x40"::"a"(2)); asm volatile ("int $0x40"::"a"(2));
} }
unsigned kol_key_control() unsigned kol_key_control()
{ {
asm ("int $0x40"::"a"(66), "b"(3)); asm volatile ("int $0x40"::"a"(66), "b"(3));
} }
void kol_key_lang_set(unsigned lang) void kol_key_lang_set(unsigned lang)
{ {
asm ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang)); asm volatile ("int $0x40"::"a"(21), "b"(2), "c"(9), "d"(lang));
} }
unsigned kol_key_lang_get() unsigned kol_key_lang_get()
{ {
asm ("int $0x40"::"a"(26), "b"(2), "c"(9)); asm volatile ("int $0x40"::"a"(26), "b"(2), "c"(9));
} }
void kol_key_mode_set(unsigned mode) void kol_key_mode_set(unsigned mode)
{ {
asm ("int $0x40"::"a"(66), "b"(1), "c"(mode)); asm volatile ("int $0x40"::"a"(66), "b"(1), "c"(mode));
} }
unsigned kol_key_mode_get() unsigned kol_key_mode_get()
{ {
asm ("int $0x40"::"a"(66), "b"(2)); asm volatile ("int $0x40"::"a"(66), "b"(2));
} }
unsigned kol_btn_get() unsigned kol_btn_get()
{ {
asm ("int $0x40"::"a"(17)); asm volatile ("int $0x40"::"a"(17));
} }
void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c) void kol_btn_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned d, unsigned c)
{ {
asm ("nop"::"b"(x*65536+w), "c"(y*65536+h), "d"(d)); asm volatile ("int $0x40"::"a"(8), "b"(x*65536+w), "c"(y*65536+h), "d"(d), "S"(c));
asm ("nop"::"a"(c));
asm ("movl %eax, %esi");
asm ("int $0x40"::"a"(8));
} }
void kol_btn_type(unsigned t) void kol_btn_type(unsigned t)
{ {
asm ("int $0x40"::"a"(48), "b"(1), "c"(t)); asm volatile ("int $0x40"::"a"(48), "b"(1), "c"(t));
} }
void kol_wnd_caption(char *s) void kol_wnd_caption(char *s)
{ {
asm ("int $0x40"::"a"(71), "b"(1), "c"(s)); asm volatile ("int $0x40"::"a"(71), "b"(1), "c"(s));
} }
unsigned kol_mouse_pos() unsigned kol_mouse_pos()
{ {
asm ("int $0x40"::"a"(37), "b"(0)); asm volatile ("int $0x40"::"a"(37), "b"(0));
} }
unsigned kol_mouse_posw() unsigned kol_mouse_posw()
{ {
asm ("int $0x40"::"a"(37), "b"(1)); asm volatile ("int $0x40"::"a"(37), "b"(1));
} }
unsigned kol_mouse_btn() unsigned kol_mouse_btn()
{ {
asm ("int $0x40"::"a"(37), "b"(2)); asm volatile ("int $0x40"::"a"(37), "b"(2));
} }
void kol_board_putc(char c) void kol_board_putc(char c)
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
} }
@ -206,7 +196,7 @@ unsigned i;
i = 0; i = 0;
while (*(s+i)) while (*(s+i))
{ {
asm ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i))); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(*(s+i)));
i++; i++;
} }
} }
@ -220,20 +210,20 @@ if ( n > 1 )
kol_board_puti(n / 10); kol_board_puti(n / 10);
c = n % 10 + '0'; c = n % 10 + '0';
asm ("int $0x40"::"a"(63), "b"(1), "c"(c)); asm volatile ("int $0x40"::"a"(63), "b"(1), "c"(c));
} }
int kol_file_70(kol_struct70 *k) int kol_file_70(kol_struct70 *k)
{ {
asm ("int $0x40"::"a"(70), "b"(k)); asm volatile ("int $0x40"::"a"(70), "b"(k));
} }
kol_struct_import* kol_cofflib_load(char *name) kol_struct_import* kol_cofflib_load(char *name)
{ {
asm ("int $0x40"::"a"(68), "b"(19), "c"(name)); asm volatile ("int $0x40"::"a"(68), "b"(19), "c"(name));
} }
@ -284,37 +274,37 @@ for (i=0;;i++)
unsigned kol_system_cpufreq() unsigned kol_system_cpufreq()
{ {
asm ("int $0x40"::"a"(18), "b"(5)); asm volatile ("int $0x40"::"a"(18), "b"(5));
} }
unsigned kol_system_mem() unsigned kol_system_mem()
{ {
asm ("int $0x40"::"a"(18), "b"(17)); asm volatile ("int $0x40"::"a"(18), "b"(17));
} }
unsigned kol_system_memfree() unsigned kol_system_memfree()
{ {
asm ("int $0x40"::"a"(18), "b"(16)); asm volatile ("int $0x40"::"a"(18), "b"(16));
} }
unsigned kol_system_time_get() unsigned kol_system_time_get()
{ {
asm ("int $0x40"::"a"(3)); asm volatile ("int $0x40"::"a"(3));
} }
unsigned kol_system_date_get() unsigned kol_system_date_get()
{ {
asm ("int $0x40"::"a"(29)); asm volatile ("int $0x40"::"a"(29));
} }
unsigned kol_system_end(unsigned param) unsigned kol_system_end(unsigned param)
{ {
asm ("int $0x40"::"a"(18), "b"(9), "c"(param)); asm volatile ("int $0x40"::"a"(18), "b"(9), "c"(param));
} }
@ -336,30 +326,30 @@ void kol_path_full(char *full, char *fname)
char temp[256]; char temp[256];
switch (*fname) switch (*fname)
{ {
case '/': case '/':
strncpy(temp, fname+1, 2); strncpy(temp, fname+1, 2);
temp[2]=0; temp[2]=0;
if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) ) if ( (!strcmp("rd", temp)) || (!strcmp("hd", temp)) || (!strcmp("cd", temp)) )
strcpy (full, fname); strcpy (full, fname);
break; break;
case '.': case '.':
break; break;
default: default:
break; break;
}; };
} }
void kol_screen_wait_rr() void __attribute__((__always_inline__)) kol_screen_wait_rr()
{ {
asm ("int $0x40"::"a"(18), "b"(14)); asm volatile ("int $0x40"::"a"(18), "b"(14));
} }
@ -367,7 +357,7 @@ asm ("int $0x40"::"a"(18), "b"(14));
void kol_screen_get_size(unsigned *w, unsigned *h) void kol_screen_get_size(unsigned *w, unsigned *h)
{ {
unsigned size; unsigned size;
asm ("int $0x40":"=a"(size):"a"(14)); asm volatile ("int $0x40":"=a"(size):"a"(14));
*w = size / 65536; *w = size / 65536;
*h = size % 65536; *h = size % 65536;
} }
@ -376,59 +366,58 @@ asm ("int $0x40":"=a"(size):"a"(14));
unsigned kol_skin_height() unsigned kol_skin_height()
{ {
asm ("int $0x40"::"a"(48), "b"(4)); asm volatile ("int $0x40"::"a"(48), "b"(4));
} }
unsigned kol_thread_start(unsigned start, unsigned stack) unsigned kol_thread_start(unsigned start, unsigned stack)
{ {
asm ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack)); asm volatile ("int $0x40"::"a"(51), "b"(1), "c"(start), "d"(stack));
} }
unsigned kol_time_tick() unsigned kol_time_tick()
{ {
asm ("int $0x40"::"a"(26), "b"(9)); asm volatile ("int $0x40"::"a"(26), "b"(9));
} }
unsigned kol_sound_speaker(char data[]) unsigned kol_sound_speaker(char data[])
{ {
asm ("movl %0, %%esi"::"a"(data)); asm volatile ("movl %0, %%esi"::"a"(data));
asm ("int $0x40"::"a"(55), "b"(55)); asm volatile ("int $0x40"::"a"(55), "b"(55));
} }
unsigned kol_process_info(unsigned slot, char buf1k[]) unsigned kol_process_info(unsigned slot, char buf1k[])
{ {
asm ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot)); asm volatile ("int $0x40"::"a"(9), "b"(buf1k), "c"(slot));
} }
int kol_process_kill_pid(unsigned process) int kol_process_kill_pid(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(18), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(18), "c"(process));
} }
int kol_kill_process(unsigned process) int kol_kill_process(unsigned process)
{ {
asm ("int $0x40"::"a"(18), "b"(2), "c"(process)); asm volatile ("int $0x40"::"a"(18), "b"(2), "c"(process));
} }
void kol_get_kernel_ver(char buff16b[]) void kol_get_kernel_ver(char buff16b[])
{ {
asm ("int $0x40"::"a"(18), "b"(13), "c"(buff16b)); asm volatile ("int $0x40"::"a"(18), "b"(13), "c"(buff16b));
} }
int kol_buffer_open(char name[], int mode, int size, char **buf) int kol_buffer_open(char name[], int mode, int size, char **buf)
{ {
int error; int error;
asm ("movl %0, %%esi"::"r"(mode)); asm volatile ("int $0x40":"=a"(*buf), "=d"(error):"a"(68), "b"(22), "c"(name), "d"(size), "S"(mode));
asm ("int $0x40":"=a"(*buf), "=d"(error):"a"(68), "b"(22), "c"(name), "d"(size));
return error; return error;
} }
void kol_buffer_close(char name[]) void kol_buffer_close(char name[])
{ {
asm ("int $0x40"::"a"(68), "b"(23), "c"(name)); asm volatile ("int $0x40"::"a"(68), "b"(23), "c"(name));
} }

2
programs/system/shell/system/kolibri.h
View File

@ -49,7 +49,7 @@ void *data __attribute__((packed));
void kol_exit(); void kol_exit();
void kol_sleep(unsigned d); void kol_sleep(unsigned d);
void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned c); void kol_wnd_define(unsigned x, unsigned y, unsigned w, unsigned h, unsigned cs, unsigned b, char *t);
void kol_wnd_move(unsigned x, unsigned y); void kol_wnd_move(unsigned x, unsigned y);
void kol_wnd_caption(char *s); void kol_wnd_caption(char *s);
void kol_event_mask(unsigned e); void kol_event_mask(unsigned e);