Changes in / [eca2435:23efd30] in mainline

Files:

• kernel/arch/amd64/src/amd64.c (modified) (2 diffs)
• kernel/arch/ia32/src/ia32.c (modified) (2 diffs)
• uspace/srv/hid/console/gcons.c (modified) (2 diffs)
• uspace/srv/hw/char/i8042/i8042.c (modified) (4 diffs)

kernel/arch/amd64/src/amd64.c

@@ -212 +212 @@
                         i8042_wire(i8042_instance, kbrd);
                         trap_virtual_enable_irqs(1 << IRQ_KBD);
-                        trap_virtual_enable_irqs(1 << IRQ_MOUSE);
                 }
         }
@@ -220 +219 @@
          * self-sufficient.
          */
-        sysinfo_set_item_val("i8042", NULL, true);
-        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
-        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
-        sysinfo_set_item_val("i8042.address.physical", NULL,
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
             (uintptr_t) I8042_BASE);
-        sysinfo_set_item_val("i8042.address.kernel", NULL,
+        sysinfo_set_item_val("kbd.address.kernel", NULL,
             (uintptr_t) I8042_BASE);
 #endif

kernel/arch/ia32/src/ia32.c

@@ -170 +170 @@
                         i8042_wire(i8042_instance, kbrd);
                         trap_virtual_enable_irqs(1 << IRQ_KBD);
-                        trap_virtual_enable_irqs(1 << IRQ_MOUSE);
                 }
         }
@@ -178 +177 @@
          * self-sufficient.
          */
-        sysinfo_set_item_val("i8042", NULL, true);
-        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
-        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
-        sysinfo_set_item_val("i8042.address.physical", NULL,
+        sysinfo_set_item_val("kbd", NULL, true);
+        sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
             (uintptr_t) I8042_BASE);
-        sysinfo_set_item_val("i8042.address.kernel", NULL,
+        sysinfo_set_item_val("kbd.address.kernel", NULL,
             (uintptr_t) I8042_BASE);
 #endif

uspace/srv/hid/console/gcons.c

@@ -241 +241 @@
 
 /** Return x, where left <= x <= right && |a-x| == min(|a-x|) is smallest */
-static inline ssize_t limit(ssize_t a, ssize_t left, ssize_t right)
+static inline int limit(size_t a, size_t left, size_t right)
 {
         if (a < left)
@@ -261 +261 @@
         mouse_x = limit(mouse_x + dx, 0, xres);
         mouse_y = limit(mouse_y + dy, 0, yres);
-
-        if (active_console != KERNEL_CONSOLE)
-                async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
+        
+        async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
 }
 

uspace/srv/hw/char/i8042/i8042.c

@@ -169 +169 @@
         void *vaddr;
 
-        i8042_physical = sysinfo_value("i8042.address.physical");
-        i8042_kernel = sysinfo_value("i8042.address.kernel");
+        i8042_physical = sysinfo_value("kbd.address.physical");
+        i8042_kernel = sysinfo_value("kbd.address.kernel");
         if (pio_enable((void *) i8042_physical, sizeof(i8042_t), &vaddr) != 0)
                 return -1;
@@ -193 +193 @@
         i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
         i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
-        ipc_register_irq(sysinfo_value("i8042.inr_a"), device_assign_devno(), 0, &i8042_kbd);
-        ipc_register_irq(sysinfo_value("i8042.inr_b"), device_assign_devno(), 0, &i8042_kbd);
+        ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), 0, &i8042_kbd);
+        ipc_register_irq(sysinfo_value("mouse.inr"), device_assign_devno(), 0, &i8042_kbd);
 
         pio_write_8(&i8042->status, i8042_CMD_WRITE_CMDB);
@@ -208 +208 @@
 static void i8042_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
+        void *fs_va = NULL;
         ipc_callid_t callid;
         ipc_call_t call;
         ipcarg_t method;
         dev_handle_t dh;
+        int flags;
         int retval;
+        size_t cnt;
         int dev_id, i;
 
@@ -222 +225 @@
         /* Determine which disk device is the client connecting to. */
         dev_id = -1;
-        for (i = 0; i < MAX_DEVS; i++) {
+        for (i = 0; i < MAX_DEVS; i++)
                 if (i8042_port[i].dev_handle == dh)
                         dev_id = i;
-        }
-
-        if (dev_id < 0) {
+
+        if (dev_id < 0/* || disk[dev_id].present == false*/) {
                 ipc_answer_0(iid, EINVAL);
                 return;