Changeset e9f0348 in mainline

Timestamp:

2011-04-08T09:16:33Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

c32a585a

Parents:

74a1ba9

Message:

Mouse driver integrated into the general HID driver.

Location:

uspace/drv/usbhid

Files:

• Makefile (modified) (1 diff)
• mouse/mousedev.c (added)
• mouse/mousedev.h (added)
• usbhid.c (modified) (7 diffs)
• usbhid.ma (modified) (1 diff)

uspace/drv/usbhid/Makefile

@@ -44 +44 @@
         kbd/kbdrepeat.c \
         generic/hiddev.c \
+        mouse/mousedev.c \
         $(STOLEN_LAYOUT_SOURCES)
 

uspace/drv/usbhid/usbhid.c

@@ -47 +47 @@
 #include "kbd/kbddev.h"
 #include "generic/hiddev.h"
-
-/*----------------------------------------------------------------------------*/
-
-/** Mouse polling endpoint description for boot protocol class. */
-static usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description = {
-        .transfer_type = USB_TRANSFER_INTERRUPT,
-        .direction = USB_DIRECTION_IN,
-        .interface_class = USB_CLASS_HID,
-        .interface_subclass = USB_HID_SUBCLASS_BOOT,
-        .interface_protocol = USB_HID_PROTOCOL_MOUSE,
-        .flags = 0
-};
+#include "mouse/mousedev.h"
+
+/*----------------------------------------------------------------------------*/
 
 /* Array of endpoints expected on the device, NULL terminated. */
@@ -68 +59 @@
 };
 
-static const char *HID_MOUSE_FUN_NAME = "mouse";
-static const char *HID_MOUSE_CLASS_NAME = "mouse";
-
 /*----------------------------------------------------------------------------*/
 
@@ -96 +84 @@
 /*----------------------------------------------------------------------------*/
 
-static bool usb_dummy_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg)
-{
-        usb_log_debug("Dummy polling callback.\n");
-        return false;
-}
-
-/*----------------------------------------------------------------------------*/
-
 static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
 {
@@ -125 +104 @@
                 
                 // set the polling callback
-                hid_dev->poll_callback = usb_dummy_polling_callback;
+                hid_dev->poll_callback = usb_mouse_polling_callback;
                 
         } else if (dev->pipes[USB_HID_GENERIC_POLL_EP_NO].present) {
@@ -161 +140 @@
             hid_dev->parser);
         
-        if (rc != EOK) {
+        if (rc != EOK || hid_dev->device_type == USB_HID_PROTOCOL_MOUSE) {
                 usb_log_warning("Could not process report descriptor.\n");
                 
                 if (hid_dev->device_type == USB_HID_PROTOCOL_KEYBOARD) {
                         usb_log_warning("Falling back to boot protocol.\n");
-                        
                         rc = usb_kbd_set_boot_protocol(hid_dev);
-                        
                 } else if (hid_dev->device_type == USB_HID_PROTOCOL_MOUSE) {
-                        usb_log_warning("No boot protocol for mouse yet.\n");
-                        rc = ENOTSUP;
+                        usb_log_warning("Falling back to boot protocol.\n");
+                        rc = usb_mouse_set_boot_protocol(hid_dev);
                 }
         }
@@ -222 +199 @@
                 break;
         case USB_HID_PROTOCOL_MOUSE:
-                break;
-        default:
-//              usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
-//                  hid_dev->usb_dev->interface_no, 0);
+                rc = usb_mouse_init(hid_dev);
+                if (rc != EOK) {
+                        usb_log_warning("Failed to initialize Mouse structure."
+                            "\n");
+                }
+                break;
+        default:
                 break;
         }
@@ -291 +271 @@
                 break;
         case USB_HID_PROTOCOL_MOUSE:
+                usb_mouse_deinit(*hid_dev);
                 break;
         default:

uspace/drv/usbhid/usbhid.ma

@@ -1 +1 @@
 100 usb&interface&class=HID&subclass=0x01&protocol=0x01
-100 usb&interface&class=HID&subclass=0x01&protocol=0x02
+1000 usb&interface&class=HID&subclass=0x01&protocol=0x02
 100 usb&interface&class=HID