Changeset a49e171 in mainline

Timestamp:

2011-04-08T11:59:36Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

dc4c19e

Parents:

c32a585a

Message:

Fix in mouse polling callback

File:

• uspace/drv/usbhid/mouse/mousedev.c (modified) (3 diffs)

uspace/drv/usbhid/mouse/mousedev.c

@@ -132 +132 @@
 
                 mouse_dev->console_phone = callback;
-                usb_log_debug("Console phone to mouse set ok.\n");
+                usb_log_debug("Console phone to mouse set ok (%d).\n", callback);
                 async_answer_0(icallid, EOK);
                 return;
@@ -199 +199 @@
         
         if (mouse_dev->console_phone >= 0) {
+                usb_log_debug("Console phone: %d\n", mouse_dev->console_phone);
                 if ((shift_x != 0) || (shift_y != 0)) {
                         /* FIXME: guessed for QEMU */
@@ -276 +277 @@
         }
         
-        usb_mouse_t *mouse_dev = (usb_mouse_t *)arg;
+        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
+        if (hid_dev->data == NULL) {
+                usb_log_error("Wrong argument to the mouse polling callback."
+                    "\n");
+                return false;
+        }
+        usb_mouse_t *mouse_dev = (usb_mouse_t *)hid_dev->data;
         
         return usb_mouse_process_boot_report(mouse_dev, buffer, buffer_size);