/uspace/trunk/fb/fb.c |
---|
292,6 → 292,8 |
static void scroll_port_nodb(viewport_t *vport, int lines) |
{ |
int y; |
int startline; |
int endline; |
if (lines > 0) { |
for (y=vport->y; y < vport->y+vport->height - lines; y++) |
561,6 → 563,7 |
static void draw_text_data(viewport_t *vport, keyfield_t *data) |
{ |
int i; |
char c; |
int col,row; |
clear_port(vport); |
596,7 → 599,7 |
} |
/** Create a new pixmap and return appropriate ID */ |
static int shm2pixmap(unsigned char *shm, size_t size) |
static int shm2pixmap(char *shm, size_t size) |
{ |
int pm; |
pixmap_t *pmap; |
644,7 → 647,7 |
static keyfield_t *interbuffer = NULL; |
static size_t intersize = 0; |
static unsigned char *shm = NULL; |
static char *shm = NULL; |
static ipcarg_t shm_id = 0; |
static size_t shm_size; |
669,7 → 672,7 |
return 1; |
} else { |
intersize = IPC_GET_ARG2(*call); |
receive_comm_area(callid,call,(void *)&interbuffer); |
receive_comm_area(callid,call,(void **)&interbuffer); |
} |
return 1; |
case FB_PREPARE_SHM: |
731,7 → 734,7 |
static void copy_vp_to_pixmap(viewport_t *vport, pixmap_t *pmap) |
{ |
int y; |
int x,y; |
int rowsize; |
int tmp; |
int width = vport->width; |
782,7 → 785,7 |
{ |
pixmap_t *pmap = &pixmaps[pm]; |
viewport_t *vport = &viewports[vp]; |
int y; |
int x,y; |
int tmp, srcrowsize; |
int realwidth, realheight, realrowsize; |
int width = vport->width; |
920,7 → 923,7 |
break; |
case FB_ANIM_DROP: |
i = IPC_GET_ARG1(*call); |
if (i >= MAX_ANIMATIONS || i < 0) { |
if (nvp >= MAX_ANIMATIONS || i < 0) { |
retval = EINVAL; |
break; |
} |
1138,6 → 1141,8 |
break; |
} |
if (! viewports[i].initialized ) { |
while (1) |
; |
retval = EADDRNOTAVAIL; |
break; |
} |
1199,7 → 1204,6 |
continue; |
case FB_POINTER_MOVE: |
mouse_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call)); |
retval = 0; |
break; |
default: |
retval = ENOENT; |
/uspace/trunk/fb/ppm.c |
---|
56,7 → 56,7 |
} |
} |
int ppm_get_data(unsigned char *data, size_t dtsz, unsigned int *width, unsigned int *height) |
int ppm_get_data(unsigned char *data, size_t dtsz, int *width, int *height) |
{ |
/* Read magic */ |
if (data[0] != 'P' || data[1] != '6') |
89,6 → 89,7 |
unsigned int width, height; |
unsigned int maxcolor; |
int i; |
void *maxdatap = data + datasz; |
unsigned int color; |
unsigned int coef; |
123,6 → 124,4 |
(*putpixel)(vport, sx+(i % width), sy+(i / width), color); |
data += 3; |
} |
return 0; |
} |
/uspace/trunk/fb/ega.c |
---|
158,15 → 158,14 |
static int save_screen(void) |
{ |
int i; |
for (i=0; ( i < MAX_SAVED_SCREENS ) && (saved_screens[i].data); i++) |
; |
short *mem; |
for (i=0 ;( i < MAX_SAVED_SCREENS ) && (saved_screens[i].data); i++); |
if (i == MAX_SAVED_SCREENS) |
return EINVAL; |
if (!(saved_screens[i].data=malloc( 2 * scr_width*scr_height ))) |
return ENOMEM; |
memcpy(saved_screens[i].data, scr_addr, 2 * scr_width * scr_height); |
memcpy (saved_screens[i].data ,scr_addr ,2 * scr_width * scr_height) |
; |
return i; |
} |
173,7 → 172,7 |
static int print_screen(int i) |
{ |
if (saved_screens[i].data) |
memcpy(scr_addr, saved_screens[i].data, 2 * scr_width * scr_height); |
memcpy (scr_addr,saved_screens[i].data, 2 * scr_width * scr_height); |
else return EINVAL; |
return i; |
} |
209,7 → 208,7 |
/* We accept one area for data interchange */ |
intersize = IPC_GET_ARG2(call); |
if (intersize >= scr_width*scr_height*sizeof(*interbuf)) { |
receive_comm_area(callid,&call,(void *)&interbuf); |
receive_comm_area(callid,&call,(void **)&interbuf); |
continue; |
} |
retval = EINVAL; |
270,7 → 269,6 |
fgcolor = IPC_GET_ARG1(call); |
bgcolor = IPC_GET_ARG2(call); |
style = EGA_STYLE(fgcolor, bgcolor); |
retval = 0; |
break; |
case FB_VP_DRAW_PIXMAP: |
i = IPC_GET_ARG2(call); |
289,7 → 287,6 |
free(saved_screens[i].data); |
saved_screens[i].data = NULL; |
} |
retval = 0; |
break; |
default: |
/uspace/trunk/fb/ppm.h |
---|
35,6 → 35,6 |
unsigned int sy, |
unsigned int maxwidth, unsigned int maxheight, |
putpixel_cb_t fnc,void *); |
int ppm_get_data(unsigned char *data, size_t dtsz, unsigned int *width, unsigned int *height); |
int ppm_get_data(unsigned char *data, size_t dtsz, int *width, int *height); |
#endif |
/uspace/trunk/libc/generic/psthread.c |
---|
155,8 → 155,7 |
threads_in_manager--; |
} /* If ctype == PS_TO_MANAGER, don't save ourselves to any list, we should |
* already be somewhere, or we will be lost */ |
} else |
srcpt = NULL; /* Avoid GCC warning, if ctype == PS_FROM_DEAD, srcpt is not used */ |
} |
/* Choose new thread to run */ |
if (ctype == PS_TO_MANAGER || ctype == PS_FROM_DEAD) { |
/uspace/trunk/kbd/arch/ia32/src/kbd.c |
---|
265,7 → 265,7 |
i8042_cmds |
}; |
static void key_released(keybuffer_t *keybuffer, unsigned char key) |
static int key_released(keybuffer_t *keybuffer, unsigned char key) |
{ |
switch (key) { |
case SC_LSHIFT: |
284,7 → 284,7 |
} |
} |
static void key_pressed(keybuffer_t *keybuffer, unsigned char key) |
static int key_pressed(keybuffer_t *keybuffer, unsigned char key) |
{ |
int *map = sc_primary_map; |
int ascii = sc_primary_map[key]; |
390,7 → 390,7 |
*/ |
int kbd_arch_init(void) |
{ |
int i; |
int rc1, i; |
int mouseenabled = 0; |
iospace_enable(task_get_id(),(void *)i8042_DATA, 5); |
/uspace/trunk/kbd/generic/kbd.c |
---|
112,8 → 112,6 |
phone2cons = IPC_GET_ARG3(call); |
retval = 0; |
break; |
default: |
retval = EINVAL; |
} |
ipc_answer_fast(callid, retval, 0, 0); |
} |
122,7 → 120,13 |
int main(int argc, char **argv) |
{ |
ipc_call_t call; |
ipc_callid_t callid; |
int res; |
ipcarg_t phonead; |
ipcarg_t phoneid; |
char connected = 0; |
ipcarg_t retval, arg1, arg2; |
/* Initialize arch dependent parts */ |
if (kbd_arch_init()) |
134,13 → 138,12 |
async_set_client_connection(console_connection); |
async_set_interrupt_received(irq_handler); |
/* Register service at nameserver */ |
if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, &phonead) != 0) |
if ((res = ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, &phonead)) != 0) { |
return -1; |
} |
async_manager(); |
/* Never reached */ |
return 0; |
} |
/** |