Changeset 36e9cd1 in mainline for uspace/srv/hid
- Timestamp:
- 2010-02-10T23:15:27Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0701066
- Parents:
- 3149fc0
- Location:
- uspace/srv/hid
- Files:
-
- 7 edited
-
console/gcons.c (modified) (1 diff)
-
fb/serial_console.c (modified) (6 diffs)
-
kbd/port/msim.c (modified) (1 diff)
-
kbd/port/ns16550.c (modified) (1 diff)
-
kbd/port/sgcn.c (modified) (2 diffs)
-
kbd/port/ski.c (modified) (2 diffs)
-
kbd/port/z8530.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/hid/console/gcons.c
r3149fc0 r36e9cd1 448 448 449 449 int pm = make_pixmap(_binary_gfx_anim_1_ppm_start, 450 ( int) &_binary_gfx_anim_1_ppm_size);450 (size_t) &_binary_gfx_anim_1_ppm_size); 451 451 async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); 452 452 453 453 pm = make_pixmap(_binary_gfx_anim_2_ppm_start, 454 ( int) &_binary_gfx_anim_2_ppm_size);454 (size_t) &_binary_gfx_anim_2_ppm_size); 455 455 async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); 456 456 457 457 pm = make_pixmap(_binary_gfx_anim_3_ppm_start, 458 ( int) &_binary_gfx_anim_3_ppm_size);458 (size_t) &_binary_gfx_anim_3_ppm_size); 459 459 async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); 460 460 461 461 pm = make_pixmap(_binary_gfx_anim_4_ppm_start, 462 ( int) &_binary_gfx_anim_4_ppm_size);462 (size_t) &_binary_gfx_anim_4_ppm_size); 463 463 async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm); 464 464 -
uspace/srv/hid/fb/serial_console.c
r3149fc0 r36e9cd1 57 57 void serial_putchar(wchar_t ch); 58 58 59 static int scr_width;60 static int scr_height;59 static unsigned int scr_width; 60 static unsigned int scr_height; 61 61 static bool color = true; /** True if producing color output. */ 62 62 static bool utf8 = false; /** True if producing UTF8 output. */ … … 108 108 void serial_putchar(wchar_t ch) 109 109 { 110 uint8_tbuf[STR_BOUNDS(1)];110 char buf[STR_BOUNDS(1)]; 111 111 size_t offs; 112 112 size_t i; … … 294 294 } 295 295 296 int lastcol = 0;297 int lastrow = 0;296 unsigned int lastcol = 0; 297 unsigned int lastrow = 0; 298 298 299 299 /** … … 309 309 310 310 wchar_t c; 311 int col, row, w, h; 311 unsigned int col; 312 unsigned int row; 313 unsigned int w; 314 unsigned int h; 312 315 int i; 313 316 … … 358 361 break; 359 362 } 360 if ( col + w > scr_width || row + h > scr_height) {363 if ((col + w > scr_width) || (row + h > scr_height)) { 361 364 retval = EINVAL; 362 365 break; … … 424 427 case FB_SCROLL: 425 428 i = IPC_GET_ARG1(call); 426 if ((i > scr_height) || (i < -scr_height)) {429 if ((i > (int) scr_height) || (i < -((int) scr_height))) { 427 430 retval = EINVAL; 428 431 break; -
uspace/srv/hid/kbd/port/msim.c
r3149fc0 r36e9cd1 64 64 { 65 65 async_set_interrupt_received(msim_irq_handler); 66 msim_cmds[0].addr = sysinfo_value("kbd.address.virtual");66 msim_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual"); 67 67 ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 68 68 0, &msim_kbd); -
uspace/srv/hid/kbd/port/ns16550.c
r3149fc0 r36e9cd1 107 107 } 108 108 109 void ns16550_port_yield(void)110 {111 }112 113 void ns16550_port_reclaim(void)114 {115 }116 117 109 static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call) 118 110 { -
uspace/srv/hid/kbd/port/sgcn.c
r3149fc0 r36e9cd1 92 92 93 93 /* polling thread */ 94 static void *sgcn_thread_impl(void *arg);94 static void sgcn_thread_impl(void *arg); 95 95 96 96 static volatile bool polling_disabled = false; … … 167 167 * Thread to poll SGCN for keypresses. 168 168 */ 169 static void *sgcn_thread_impl(void *arg)169 static void sgcn_thread_impl(void *arg) 170 170 { 171 171 (void) arg; -
uspace/srv/hid/kbd/port/ski.c
r3149fc0 r36e9cd1 49 49 #define POLL_INTERVAL 10000 50 50 51 static void *ski_thread_impl(void *arg);51 static void ski_thread_impl(void *arg); 52 52 static int32_t ski_getchar(void); 53 53 … … 84 84 85 85 /** Thread to poll Ski for keypresses. */ 86 static void *ski_thread_impl(void *arg)86 static void ski_thread_impl(void *arg) 87 87 { 88 88 int32_t c; -
uspace/srv/hid/kbd/port/z8530.c
r3149fc0 r36e9cd1 96 96 } 97 97 98 void z8530_port_yield(void)99 {100 }101 102 void z8530_port_reclaim(void)103 {104 }105 106 98 static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call) 107 99 {
Note:
See TracChangeset
for help on using the changeset viewer.
