Changeset 2757247 in mainline

Timestamp:

2013-08-07T13:55:15Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0918382f

Parents:

e991937

Message:

libusbhost: Keep devices tree in internal representation.

This is necessary for USB 2.0

Location:

uspace/lib/usbhost

Files:

• include/usb/host/ddf_helpers.h (modified) (1 diff)
• src/ddf_helpers.c (modified) (15 diffs)

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -40 +40 @@
 #include <usbhc_iface.h>
 
-int hcd_ddf_add_usb_device(ddf_dev_t *parent,
-    usb_address_t address, usb_speed_t speed, const char *name,
-    const match_id_list_t *mids);
 int hcd_ddf_setup_hc(ddf_dev_t *device, usb_speed_t max_speed,
     size_t bw, bw_count_func_t bw_count);
 void hcd_ddf_clean_hc(ddf_dev_t *device);
 int hcd_ddf_setup_root_hub(ddf_dev_t *device);
-int hcd_ddf_new_device(ddf_dev_t *device, usb_address_t *address);
-int hcd_ddf_remove_device(ddf_dev_t *device, usb_address_t address);
 
 hcd_t *dev_to_hcd(ddf_dev_t *dev);

uspace/lib/usbhost/src/ddf_helpers.c

@@ -70 +70 @@
 typedef struct usb_dev {
         link_t link;
+        list_t devices;
         ddf_fun_t *fun;
         usb_address_t address;
         usb_speed_t speed;
+        unsigned port;
 } usb_dev_t;
+
+static int hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port,
+    usb_address_t *id);
+static int hcd_ddf_remove_device(ddf_dev_t *device, usb_dev_t *hub,
+    usb_address_t id);
+
+
+/* DDF INTERFACE */
 
 /** Register endpoint interface function.
@@ -162 +172 @@
         assert(dev);
         usb_address_t address = 0;
+        unsigned port = 0; //TODO provide real value here
         usb_log_debug("Device %d reported a new USB device\n", dev->address);
-        const int ret = hcd_ddf_new_device(ddf_dev, &address);
+        const int ret = hcd_ddf_new_device(ddf_dev, dev, port, &address);
         if (ret == EOK && handle)
                 *handle = address;
@@ -176 +187 @@
         assert(ddf_dev);
         assert(dev);
-        usb_log_debug("Device %d reported removal of device %d\n",
-            dev->address, (int)handle);
-        return hcd_ddf_remove_device(ddf_dev, (usb_address_t)handle);
+        usb_log_debug("Hub `%s' reported removal of device %d\n",
+            ddf_fun_get_name(fun), (int)handle);
+        return hcd_ddf_remove_device(ddf_dev, dev, (usb_address_t)handle);
 }
 
@@ -247 +258 @@
 }
 
-/** Root hub USB interface */
+/** USB device interface */
 static usb_iface_t usb_iface = {
         .get_my_device_handle = get_my_device_handle,
@@ -264 +275 @@
 };
 
-/** Standard USB RH options (device interface) */
+/** Standard USB device interface) */
 static ddf_dev_ops_t usb_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,
 };
+
+
+/* DDF HELPERS */
 
 #define GET_DEVICE_DESC(size) \
@@ -291 +305 @@
 };
 
-int hcd_ddf_add_usb_device(ddf_dev_t *parent,
-    usb_address_t address, usb_speed_t speed, const char *name,
+static int hcd_ddf_add_device(ddf_dev_t *parent, usb_dev_t *hub_dev,
+    unsigned port, usb_address_t address, usb_speed_t speed, const char *name,
     const match_id_list_t *mids)
 {
         assert(parent);
-        hc_dev_t *hc_dev = dev_to_hc_dev(parent);
 
         char default_name[10] = { 0 }; /* usbxyz-ss */
@@ -317 +330 @@
         info->speed = speed;
         info->fun = fun;
+        info->port = port;
         link_initialize(&info->link);
+        list_initialize(&info->devices);
 
         ddf_fun_set_ops(fun, &usb_ops);
@@ -331 +346 @@
         }
 
-        list_append(&info->link, &hc_dev->devices);
+        if (hub_dev) {
+                list_append(&info->link, &hub_dev->devices);
+        } else {
+                hc_dev_t *hc_dev = dev_to_hc_dev(parent);
+                list_append(&info->link, &hc_dev->devices);
+        }
         return EOK;
 }
@@ -354 +374 @@
 } while (0)
 
-
 /* This is a copy of lib/usbdev/src/recognise.c */
 static int create_match_ids(match_id_list_t *l,
@@ -385 +404 @@
 }
 
-int hcd_ddf_remove_device(ddf_dev_t *device, usb_address_t id)
+static int hcd_ddf_remove_device(ddf_dev_t *device, usb_dev_t *hub,
+    usb_address_t id)
 {
         assert(device);
@@ -399 +419 @@
         usb_dev_t *victim = NULL;
 
-        list_foreach(hc_dev->devices, it) {
+        list_foreach(hub->devices, it) {
                 victim = list_get_instance(it, usb_dev_t, link);
                 if (victim->address == id)
@@ -410 +430 @@
                 if (ret == EOK) {
                         ddf_fun_destroy(victim->fun);
-                        hcd_release_address(hcd, id);
+                        hcd_release_address(hcd, victim->address);
                 } else {
                         usb_log_warning("Failed to unbind device %d: %s\n",
@@ -420 +440 @@
 }
 
-int hcd_ddf_new_device(ddf_dev_t *device, usb_address_t *id)
+static int hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port,
+    usb_address_t *id)
 {
         assert(device);
@@ -526 +547 @@
 
         /* Register device */
-        ret = hcd_ddf_add_usb_device(device, address, speed, NULL, &mids);
+        ret = hcd_ddf_add_device(device, hub, port, address, speed, NULL, &mids);
         clean_match_ids(&mids);
         if (ret != EOK) {
@@ -553 +574 @@
 
         hcd_reserve_default_address(hcd, speed);
-        const int ret = hcd_ddf_new_device(device, NULL);
+        const int ret = hcd_ddf_new_device(device, NULL, 0, NULL);
         hcd_release_default_address(hcd);
         return ret;