Changeset 78dbf5b in mainline for uspace/drv/usbhid/subdrivers.c

Timestamp:

2011-05-07T08:38:40Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

fb295b6

Parents:

6c6a95d2 (diff), 45a2688 (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:

Fixes (parsing), mouse driver improved, generic HID driver improved

File:

• uspace/drv/usbhid/subdrivers.c (modified) (2 diffs)

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}}
 };