Changeset 7bb8036 in mainline

Timestamp:

2011-05-06T13:01:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e549b

Parents:

04c1524

Message:

Mouse subdriver for generic mouse.

Location:

uspace/drv/usbhid

Files:

• subdrivers.c (modified) (2 diffs)
• usbhid.c (modified) (1 diff)

uspace/drv/usbhid/subdrivers.c

@@ -36 +36 @@
 #include "subdrivers.h"
 #include "usb/classes/hidut.h"
+#include "usb/classes/hidpath.h"
 
 #include "lgtch-ultrax/lgtch-ultrax.h"
+#include "mouse/mousedev.h"
 
 static usb_hid_subdriver_usage_t path_kbd[] = {
         {USB_HIDUT_PAGE_KEYBOARD, 0}, 
+        {0, 0}
+};
+
+static usb_hid_subdriver_usage_t path_mouse[] = {
+        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_MOUSE},
+        {USB_HIDUT_PAGE_GENERIC_DESKTOP, 
+         USB_HIDUT_USAGE_GENERIC_DESKTOP_POINTER},
+        {0, 0}
+};
+
+static usb_hid_subdriver_usage_t path_mouse2[] = {
+        {USB_HIDUT_PAGE_GENERIC_DESKTOP, USB_HIDUT_USAGE_GENERIC_DESKTOP_X},
         {0, 0}
 };
@@ -79 +93 @@
                 }
         },
+        {
+                path_mouse,
+                -1,
+                USB_HID_PATH_COMPARE_COLLECTION_ONLY,
+                -1,
+                -1,
+                {
+                        .init = usb_mouse_init,
+                        .deinit = usb_mouse_deinit,
+                        .poll = usb_mouse_polling_callback,
+                        .poll_end = NULL
+                }
+        },
+        {
+                path_mouse2,
+                -1,
+                USB_HID_PATH_COMPARE_END 
+                | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                -1,
+                -1,
+                {
+                        .init = usb_mouse_init,
+                        .deinit = usb_mouse_deinit,
+                        .poll = usb_mouse_polling_callback,
+                        .poll_end = NULL
+                }
+        },
         {NULL, -1, 0, -1, -1, {NULL, NULL, NULL, NULL}}
 };

uspace/drv/usbhid/usbhid.c

@@ -415 +415 @@
         
         // TODO: remove the mouse hack
-        if (hid_dev->poll_pipe_index == USB_HID_MOUSE_POLL_EP_NO ||
-            fallback) {
+        if (fallback) {
                 // fall back to boot protocol
                 switch (hid_dev->poll_pipe_index) {