Changeset eca2435 in mainline for uspace/srv

Timestamp:

2010-01-06T20:52:16Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5eb5dcf, 985e26d2, a5603ff

Parents:

23efd30 (diff), 2ae1e6e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mouse fixes.

Location:

uspace/srv

Files:

• hid/console/gcons.c (modified) (2 diffs)
• hw/char/i8042/i8042.c (modified) (4 diffs)

uspace/srv/hid/console/gcons.c

@@ -241 +241 @@
 
 /** Return x, where left <= x <= right && |a-x| == min(|a-x|) is smallest */
-static inline int limit(size_t a, size_t left, size_t right)
+static inline ssize_t limit(ssize_t a, ssize_t left, ssize_t right)
 {
         if (a < left)
@@ -261 +261 @@
         mouse_x = limit(mouse_x + dx, 0, xres);
         mouse_y = limit(mouse_y + dy, 0, yres);
-        
-        async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
+
+        if (active_console != KERNEL_CONSOLE)
+                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("kbd.address.physical");
-        i8042_kernel = sysinfo_value("kbd.address.kernel");
+        i8042_physical = sysinfo_value("i8042.address.physical");
+        i8042_kernel = sysinfo_value("i8042.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("kbd.inr"), device_assign_devno(), 0, &i8042_kbd);
-        ipc_register_irq(sysinfo_value("mouse.inr"), device_assign_devno(), 0, &i8042_kbd);
+        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);
 
         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;
 
@@ -225 +222 @@
         /* 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/* || disk[dev_id].present == false*/) {
+        }
+
+        if (dev_id < 0) {
                 ipc_answer_0(iid, EINVAL);
                 return;