Changes in uspace/drv/bus/usb/usbhid/usbhid.c [9d58539:e2dfa86] in mainline

File:

• uspace/drv/bus/usb/usbhid/usbhid.c (modified) (19 diffs)

uspace/drv/bus/usb/usbhid/usbhid.c

@@ -41 +41 @@
 #include <usb/hid/hidreport.h>
 #include <usb/hid/request.h>
+
 #include <errno.h>
+#include <macros.h>
 #include <str_error.h>
 
@@ -58 +60 @@
         NULL
 };
-/*----------------------------------------------------------------------------*/
+
 static int usb_hid_set_boot_kbd_subdriver(usb_hid_dev_t *hid_dev)
 {
@@ -74 +76 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 static int usb_hid_set_boot_mouse_subdriver(usb_hid_dev_t *hid_dev)
 {
@@ -90 +92 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 static int usb_hid_set_generic_hid_subdriver(usb_hid_dev_t *hid_dev)
 {
@@ -110 +112 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 static bool usb_hid_ids_match(const usb_hid_dev_t *hid_dev,
     const usb_hid_subdriver_mapping_t *mapping)
 {
-        assert(hid_dev != NULL);
-        assert(hid_dev->usb_dev != NULL);
-
-        return (hid_dev->usb_dev->descriptors.device.vendor_id
-            == mapping->vendor_id
-            && hid_dev->usb_dev->descriptors.device.product_id
-            == mapping->product_id);
-}
-/*----------------------------------------------------------------------------*/
+        assert(hid_dev);
+        assert(hid_dev->usb_dev);
+        assert(mapping);
+        const usb_standard_device_descriptor_t *d =
+            &usb_device_descriptors(hid_dev->usb_dev)->device;
+
+        return (d->vendor_id == mapping->vendor_id)
+            && (d->product_id == mapping->product_id);
+}
+
 static bool usb_hid_path_matches(usb_hid_dev_t *hid_dev,
     const usb_hid_subdriver_mapping_t *mapping)
@@ -178 +181 @@
         return matches;
 }
-/*----------------------------------------------------------------------------*/
+
 static int usb_hid_save_subdrivers(usb_hid_dev_t *hid_dev,
     const usb_hid_subdriver_t **subdrivers, unsigned count)
@@ -211 +214 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 static int usb_hid_find_subdrivers(usb_hid_dev_t *hid_dev)
 {
@@ -263 +266 @@
         return usb_hid_save_subdrivers(hid_dev, subdrivers, count);
 }
-/*----------------------------------------------------------------------------*/
-static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, const usb_device_t *dev)
+
+static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
 {
         assert(hid_dev);
@@ -270 +273 @@
 
         static const struct {
-                unsigned ep_number;
+                const usb_endpoint_description_t *desc;
                 const char* description;
         } endpoints[] = {
-                {USB_HID_KBD_POLL_EP_NO, "Keyboard endpoint"},
-                {USB_HID_MOUSE_POLL_EP_NO, "Mouse endpoint"},
-                {USB_HID_GENERIC_POLL_EP_NO, "Generic HID endpoint"},
+                {&usb_hid_kbd_poll_endpoint_description, "Keyboard endpoint"},
+                {&usb_hid_mouse_poll_endpoint_description, "Mouse endpoint"},
+                {&usb_hid_generic_poll_endpoint_description, "Generic HID endpoint"},
         };
 
-        for (unsigned i = 0; i < sizeof(endpoints)/sizeof(endpoints[0]); ++i) {
-                if (endpoints[i].ep_number >= dev->pipes_count) {
-                        return EINVAL;
-                }
-                if (dev->pipes[endpoints[i].ep_number].present) {
+        for (unsigned i = 0; i < ARRAY_SIZE(endpoints); ++i) {
+                usb_endpoint_mapping_t *epm =
+                    usb_device_get_mapped_ep_desc(dev, endpoints[i].desc);
+                if (epm && epm->present) {
                         usb_log_debug("Found: %s.\n", endpoints[i].description);
-                        hid_dev->poll_pipe_index = endpoints[i].ep_number;
+                        hid_dev->poll_pipe_mapping = epm;
                         return EOK;
                 }
@@ -290 +292 @@
         return ENOTSUP;
 }
-/*----------------------------------------------------------------------------*/
+
 static int usb_hid_init_report(usb_hid_dev_t *hid_dev)
 {
@@ -322 +324 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /*
  * This functions initializes required structures from the device's descriptors
@@ -351 +353 @@
         /* The USB device should already be initialized, save it in structure */
         hid_dev->usb_dev = dev;
-        hid_dev->poll_pipe_index = -1;
+        hid_dev->poll_pipe_mapping = NULL;
 
         int rc = usb_hid_check_pipes(hid_dev, dev);
@@ -381 +383 @@
                     "boot protocol.\n");
 
-                switch (hid_dev->poll_pipe_index) {
-                case USB_HID_KBD_POLL_EP_NO:
+                switch (hid_dev->poll_pipe_mapping->interface->interface_protocol) {
+                case USB_HID_PROTOCOL_KEYBOARD:
                         usb_log_info("Falling back to kbd boot protocol.\n");
                         rc = usb_kbd_set_boot_protocol(hid_dev);
@@ -389 +391 @@
                         }
                         break;
-                case USB_HID_MOUSE_POLL_EP_NO:
+                case USB_HID_PROTOCOL_MOUSE:
                         usb_log_info("Falling back to mouse boot protocol.\n");
                         rc = usb_mouse_set_boot_protocol(hid_dev);
@@ -397 +399 @@
                         break;
                 default:
-                        assert(hid_dev->poll_pipe_index
-                            == USB_HID_GENERIC_POLL_EP_NO);
                         usb_log_info("Falling back to generic HID driver.\n");
                         usb_hid_set_generic_hid_subdriver(hid_dev);
@@ -458 +458 @@
         return rc;
 }
-/*----------------------------------------------------------------------------*/
+
 bool usb_hid_polling_callback(usb_device_t *dev, uint8_t *buffer,
     size_t buffer_size, void *arg)
@@ -485 +485 @@
             &hid_dev->report, buffer, buffer_size, &hid_dev->report_id);
         if (rc != EOK) {
-                usb_log_warning("Error in usb_hid_parse_report():"
+                usb_log_warning("Failure in usb_hid_parse_report():"
                     "%s\n", str_error(rc));
         }
@@ -500 +500 @@
         return cont;
 }
-/*----------------------------------------------------------------------------*/
+
 void usb_hid_polling_ended_callback(usb_device_t *dev, bool reason, void *arg)
 {
@@ -517 +517 @@
         hid_dev->running = false;
 }
-/*----------------------------------------------------------------------------*/
+
 void usb_hid_new_report(usb_hid_dev_t *hid_dev)
 {
         ++hid_dev->report_nr;
 }
-/*----------------------------------------------------------------------------*/
+
 int usb_hid_report_number(const usb_hid_dev_t *hid_dev)
 {
         return hid_dev->report_nr;
 }
-/*----------------------------------------------------------------------------*/
+
 void usb_hid_deinit(usb_hid_dev_t *hid_dev)
 {