Changeset 7ed5b576 in mainline

Timestamp:

2010-12-12T13:28:16Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0c05496, a66225f3

Parents:

03e02248

Message:

USB child device registration

Wrapper for adding child device (i.e. registration with devman) is ready. It takes care
of correct match id creation.

Location:

uspace/lib/usb

Files:

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

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

@@ -95 +95 @@
 
 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,
+    devman_handle_t *);
+
 
 #endif

uspace/lib/usb/src/recognise.c

@@ -174 +174 @@
 }
 
-#if 0
+
 /** Probe for device kind and register it in devman.
  *
  * @param hc Open phone to the host controller.
- * @param dev Parent device.
+ * @param parent Parent device.
  * @param address Address of the (unknown) attached device.
  * @return Error code.
  */
-int usb_drv_register_child_in_devman(int hc, device_t *dev,
-    usb_address_t address)
+int usb_drv_register_child_in_devman(int hc, device_t *parent,
+    usb_address_t address, devman_handle_t *child_handle)
 {
+        device_t *child = NULL;
+        char *child_name = NULL;
+        int rc;
+
+        child = create_device();
+        if (child == NULL) {
+                rc = ENOMEM;
+                goto failure;
+        }
+
+        /*
+         * TODO: some better child naming
+         */
+        rc = asprintf(&child_name, "usb%p", child);
+        if (rc < 0) {
+                goto failure;
+        }
+        child->name = child_name;
+        
+        rc = usb_drv_create_device_match_ids(hc, &child->match_ids, address);
+        if (rc != EOK) {
+                goto failure;
+        }
+
+        rc = child_device_register(child, parent);
+        if (rc != EOK) {
+                goto failure;
+        }
+
+        if (child_handle != NULL) {
+                *child_handle = child->handle;
+        }
+        
+        return EOK;
+
+failure:
+        if (child != NULL) {
+                child->name = NULL;
+                /* This takes care of match_id deallocation as well. */
+                delete_device(child);
+        }
+        if (child_name != NULL) {
+                free(child_name);
+        }
+
+        return rc;
 
 }
-#endif
+
 
 /**