WebSVN – HelenOS-historic – Path Comparison – / – /uspace/trunk/kbd/ Rev 1719 and /uspace/trunk/kbd/ Rev 1720

Ignore whitespace Rev 1719 → Rev 1720

 /uspace/trunk/kbd/generic/kbd.c
 ,6 → 112,8
             phone2cons = IPC_GET_ARG3(call);
             retval = 0;
             break;
+        default:
+            retval = EINVAL;
         }
         ipc_answer_fast(callid, retval, 0, 0);
     }
 ,13 → 122,7
 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())
 ,12 → 134,13
     async_set_client_connection(console_connection);
     async_set_interrupt_received(irq_handler);
     /* Register service at nameserver */
-    if ((res = ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, &phonead)) != 0) {
+    if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, &phonead) != 0)
         return -1;
-    }
     async_manager();
+    /* Never reached */
+    return 0;
 }
 /**

 /uspace/trunk/kbd/arch/ia32/src/kbd.c
 ,7 → 265,7
     i8042_cmds
 };
-static int key_released(keybuffer_t *keybuffer, unsigned char key)
+static void key_released(keybuffer_t *keybuffer, unsigned char key)
 {
     switch (key) {
         case SC_LSHIFT:
 ,7 → 284,7
     }
 }
-static int key_pressed(keybuffer_t *keybuffer, unsigned char key)
+static void key_pressed(keybuffer_t *keybuffer, unsigned char key)
 {
     int *map = sc_primary_map;
     int ascii = sc_primary_map[key];
 ,7 → 390,7
  */
 int kbd_arch_init(void)
 {
-    int rc1, i;
+    int i;
     int mouseenabled = 0;
     iospace_enable(task_get_id(),(void *)i8042_DATA, 5);