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

File:

• uspace/drv/bus/usb/usbhid/usbhid.c (modified) (10 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>
 
@@ -116 +114 @@
     const usb_hid_subdriver_mapping_t *mapping)
 {
-        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);
+        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);
 }
 
@@ -267 +264 @@
 }
 
-static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
+static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, const usb_device_t *dev)
 {
         assert(hid_dev);
@@ -273 +270 @@
 
         static const struct {
-                const usb_endpoint_description_t *desc;
+                unsigned ep_number;
                 const char* description;
         } endpoints[] = {
-                {&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"},
+                {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"},
         };
 
-        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) {
+        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) {
                         usb_log_debug("Found: %s.\n", endpoints[i].description);
-                        hid_dev->poll_pipe_mapping = epm;
+                        hid_dev->poll_pipe_index = endpoints[i].ep_number;
                         return EOK;
                 }
@@ -353 +351 @@
         /* The USB device should already be initialized, save it in structure */
         hid_dev->usb_dev = dev;
-        hid_dev->poll_pipe_mapping = NULL;
+        hid_dev->poll_pipe_index = -1;
 
         int rc = usb_hid_check_pipes(hid_dev, dev);
@@ -383 +381 @@
                     "boot protocol.\n");
 
-                switch (hid_dev->poll_pipe_mapping->interface->interface_protocol) {
-                case USB_HID_PROTOCOL_KEYBOARD:
+                switch (hid_dev->poll_pipe_index) {
+                case USB_HID_KBD_POLL_EP_NO:
                         usb_log_info("Falling back to kbd boot protocol.\n");
                         rc = usb_kbd_set_boot_protocol(hid_dev);
@@ -391 +389 @@
                         }
                         break;
-                case USB_HID_PROTOCOL_MOUSE:
+                case USB_HID_MOUSE_POLL_EP_NO:
                         usb_log_info("Falling back to mouse boot protocol.\n");
                         rc = usb_mouse_set_boot_protocol(hid_dev);
@@ -399 +397 @@
                         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);
@@ -415 +415 @@
         }
 
-        /*
-         * 1) subdriver vytvori vlastnu ddf_fun, vlastne ddf_dev_ops, ktore da
-         *    do nej.
-         * 2) do tych ops do .interfaces[DEV_IFACE_USBHID (asi)] priradi 
-         *    vyplnenu strukturu usbhid_iface_t.
-         * 3) klientska aplikacia - musi si rucne vytvorit telefon
-         *    (devman_device_connect() - cesta k zariadeniu (/hw/pci0/...) az 
-         *    k tej fcii.
-         *    pouzit usb/classes/hid/iface.h - prvy int je telefon
-         */
+        /* Initialize subdrivers */
         bool ok = false;
         for (unsigned i = 0; i < hid_dev->subdriver_count; ++i) {
@@ -485 +476 @@
             &hid_dev->report, buffer, buffer_size, &hid_dev->report_id);
         if (rc != EOK) {
-                usb_log_warning("Failure in usb_hid_parse_report():"
+                usb_log_warning("Error in usb_hid_parse_report():"
                     "%s\n", str_error(rc));
         }