Changeset 7fc092a in mainline for uspace/lib/usb/src/recognise.c

Timestamp:

2011-01-27T22:09:29Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

db7ed07

Parents:

9ee87f6 (diff), 6265a2b (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:

Changes from development branch

File:

• uspace/lib/usb/src/recognise.c (modified) (8 diffs)

uspace/lib/usb/src/recognise.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */
@@ -39 +39 @@
 #include <errno.h>
 
+/** Callback for getting host controller handle.
+ *
+ * @param dev Device in question.
+ * @param[out] handle Devman handle of the host controller.
+ * @return Error code.
+ */
 static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
 {
@@ -203 +209 @@
                 uint8_t cur_descr_len = current_descriptor[0];
                 uint8_t cur_descr_type = current_descriptor[1];
+
+                if (cur_descr_len == 0) {
+                        return ENOENT;
+                }
                 
                 position += cur_descr_len;
@@ -233 +243 @@
  * @param matches Match ids list to add matches to.
  * @param address USB address of the attached device.
+ * @param config_count Number of configurations the device has.
  * @return Error code.
  */
@@ -338 +349 @@
 /** Probe for device kind and register it in devman.
  *
- * @param hc Open phone to the host controller.
- * @param parent Parent device.
- * @param address Address of the (unknown) attached device.
+ * @param[in] hc Open phone to the host controller.
+ * @param[in] parent Parent device.
+ * @param[in] address Address of the (unknown) attached device.
+ * @param[out] child_handle Handle of the child device.
  * @return Error code.
  */
@@ -346 +358 @@
     usb_address_t address, devman_handle_t *child_handle)
 {
+        static size_t device_name_index = 0;
+
         device_t *child = NULL;
         char *child_name = NULL;
@@ -357 +371 @@
 
         /*
-         * TODO: some better child naming
-         */
-        rc = asprintf(&child_name, "usb%p", child);
+         * TODO: Once the device driver framework support persistent
+         * naming etc., something more descriptive could be created.
+         */
+        rc = asprintf(&child_name, "usbdev%02zu", device_name_index);
         if (rc < 0) {
                 goto failure;
@@ -381 +396 @@
         }
         
+        device_name_index++;
+
         return EOK;