Changeset 692c0d3e in mainline

Timestamp:

2011-01-07T15:38:39Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

97bfba1

Parents:

8f8a0cd6

Message:

Refactoring of device recognition routines

Location:

uspace/lib/usb

Files:

• include/usb/usbdrv.h (modified) (1 diff)
• src/recognise.c (modified) (4 diffs)

uspace/lib/usb/include/usb/usbdrv.h

@@ -96 +96 @@
 int usb_drv_async_wait_for(usb_handle_t);
 
+int usb_drv_create_match_ids_from_device_descriptor(match_id_list_t *,
+    const usb_standard_device_descriptor_t *);
+int usb_drv_create_match_ids_from_configuration_descriptor(match_id_list_t *,
+    const void *, size_t);
+
 int usb_drv_create_device_match_ids(int, match_id_list_t *, usb_address_t);
 int usb_drv_register_child_in_devman(int, device_t *, usb_address_t,

uspace/lib/usb/src/recognise.c

@@ -129 +129 @@
 }
 
+/** Create DDF match ids from USB device descriptor.
+ *
+ * @param matches List of match ids to extend.
+ * @param device_descriptor Device descriptor returned by given device.
+ * @return Error code.
+ */
+int usb_drv_create_match_ids_from_device_descriptor(
+    match_id_list_t *matches,
+    const usb_standard_device_descriptor_t *device_descriptor)
+{
+        int rc;
+        
+        /*
+         * Unless the vendor id is 0, the pair idVendor-idProduct
+         * quite uniquely describes the device.
+         */
+        if (device_descriptor->vendor_id != 0) {
+                /* First, with release number. */
+                rc = usb_add_match_id(matches, 100,
+                    "usb&vendor=%d&product=%d&release=" BCD_FMT,
+                    (int) device_descriptor->vendor_id,
+                    (int) device_descriptor->product_id,
+                    BCD_ARGS(device_descriptor->device_version));
+                if (rc != EOK) {
+                        return rc;
+                }
+                
+                /* Next, without release number. */
+                rc = usb_add_match_id(matches, 90, "usb&vendor=%d&product=%d",
+                    (int) device_descriptor->vendor_id,
+                    (int) device_descriptor->product_id);
+                if (rc != EOK) {
+                        return rc;
+                }
+        }       
+
+        /*
+         * If the device class points to interface we skip adding
+         * class directly.
+         */
+        if (device_descriptor->device_class != USB_CLASS_USE_INTERFACE) {
+                rc = usb_add_match_id(matches, 50, "usb&class=%s",
+                    usb_str_class(device_descriptor->device_class));
+                if (rc != EOK) {
+                        return rc;
+                }
+        }
+        
+        return EOK;
+}
+
+/** Create DDF match ids from USB configuration descriptor.
+ * The configuration descriptor is expected to be in the complete form,
+ * i.e. including interface, endpoint etc. descriptors.
+ *
+ * @param matches List of match ids to extend.
+ * @param config_descriptor Configuration descriptor returned by given device.
+ * @param total_size Size of the @p config_descriptor.
+ * @return Error code.
+ */
+int usb_drv_create_match_ids_from_configuration_descriptor(
+    match_id_list_t *matches,
+    const void *config_descriptor, size_t total_size)
+{
+        /*
+         * Iterate through config descriptor to find the interface
+         * descriptors.
+         */
+        size_t position = sizeof(usb_standard_configuration_descriptor_t);
+        while (position + 1 < total_size) {
+                uint8_t *current_descriptor
+                    = ((uint8_t *) config_descriptor) + position;
+                uint8_t cur_descr_len = current_descriptor[0];
+                uint8_t cur_descr_type = current_descriptor[1];
+                
+                position += cur_descr_len;
+                
+                if (cur_descr_type != USB_DESCTYPE_INTERFACE) {
+                        continue;
+                }
+                
+                /*
+                 * Finally, we found an interface descriptor.
+                 */
+                usb_standard_interface_descriptor_t *interface
+                    = (usb_standard_interface_descriptor_t *)
+                    current_descriptor;
+                
+                int rc = usb_add_match_id(matches, 50,
+                    "usb&interface&class=%s",
+                    usb_str_class(interface->interface_class));
+                if (rc != EOK) {
+                        return rc;
+                }
+        }
+        
+        return EOK;
+}
+
 /** Add match ids based on configuration descriptor.
  *
@@ -169 +268 @@
                         continue;
                 }
-
-                /*
-                 * Iterate through config descriptor to find the interface
-                 * descriptors.
-                 */
-                size_t position = sizeof(config_descriptor);
-                while (position + 1 < full_config_descriptor_size) {
-                        uint8_t *current_descriptor
-                            = ((uint8_t *) full_config_descriptor) + position;
-                        uint8_t cur_descr_len = current_descriptor[0];
-                        uint8_t cur_descr_type = current_descriptor[1];
-                        
-                        position += cur_descr_len;
-                        
-                        if (cur_descr_type != USB_DESCTYPE_INTERFACE) {
-                                continue;
-                        }
-                        /*
-                         * Finally, we found an interface descriptor.
-                         */
-                        usb_standard_interface_descriptor_t *interface
-                            = (usb_standard_interface_descriptor_t *)
-                            current_descriptor;
-                        
-                        rc = usb_add_match_id(matches, 50,
-                            "usb&interface&class=%s",
-                            usb_str_class(interface->interface_class));
-                        if (rc != EOK) {
-                                final_rc = rc;
-                                break;
-                        }
-                }
+                
+                rc = usb_drv_create_match_ids_from_configuration_descriptor(
+                    matches,
+                    full_config_descriptor, full_config_descriptor_size);
+                if (rc != EOK) {
+                        final_rc = rc;
+                        continue;
+                }
+                
         }
         
@@ -220 +296 @@
 {
         int rc;
+        
+        /*
+         * Retrieve device descriptor and add matches from it.
+         */
         usb_standard_device_descriptor_t device_descriptor;
 
@@ -227 +307 @@
                 return rc;
         }
-
-        /*
-         * Unless the vendor id is 0, the pair idVendor-idProduct
-         * quite uniquely describes the device.
-         */
-        if (device_descriptor.vendor_id != 0) {
-                /* First, with release number. */
-                rc = usb_add_match_id(matches, 100,
-                    "usb&vendor=%d&product=%d&release=" BCD_FMT,
-                    (int) device_descriptor.vendor_id,
-                    (int) device_descriptor.product_id,
-                    BCD_ARGS(device_descriptor.device_version));
-                if (rc != EOK) {
-                        return rc;
-                }
-                
-                /* Next, without release number. */
-                rc = usb_add_match_id(matches, 90, "usb&vendor=%d&product=%d",
-                    (int) device_descriptor.vendor_id,
-                    (int) device_descriptor.product_id);
-                if (rc != EOK) {
-                        return rc;
-                }
-
-        }       
-
-        /*
-         * If the device class points to interface we skip adding
-         * class directly.
-         */
-        if (device_descriptor.device_class != USB_CLASS_USE_INTERFACE) {
-                rc = usb_add_match_id(matches, 50, "usb&class=%s",
-                    usb_str_class(device_descriptor.device_class));
-                if (rc != EOK) {
-                        return rc;
-                }
-        }
+        
+        rc = usb_drv_create_match_ids_from_device_descriptor(matches,
+            &device_descriptor);
+        if (rc != EOK) {
+                return rc;
+        }
+        
         /*
          * Go through all configurations and add matches