Changeset 14dd4c9 in mainline

Timestamp:

2013-08-07T15:03:37Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fa9d3af

Parents:

0918382f

Message:

libusbhost: consolidate device lists and locking.

Root hub is added only once, there's no need for lock or list. Make the list
guard per device. Protect list append as well as removal.

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (8 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -46 +46 @@
 #define CTRL_PIPE_MIN_PACKET_SIZE 8
 
-typedef struct hc_dev {
-        ddf_fun_t *ctl_fun;
-        list_t devices;
-        fibril_mutex_t guard;
-        hcd_t hcd;
-} hc_dev_t;
-
-static hc_dev_t *dev_to_hc_dev(ddf_dev_t *dev)
-{
-        return ddf_dev_data_get(dev);
-}
-
-hcd_t *dev_to_hcd(ddf_dev_t *dev)
-{
-        hc_dev_t *hc_dev = dev_to_hc_dev(dev);
-        if (!hc_dev) {
-                usb_log_error("Invalid HCD device.\n");
-                return NULL;
-        }
-        return &hc_dev->hcd;
-}
-
 typedef struct usb_dev {
         link_t link;
         list_t devices;
+        fibril_mutex_t guard;
         ddf_fun_t *fun;
         usb_address_t address;
@@ -76 +55 @@
         unsigned port;
 } usb_dev_t;
+
+typedef struct hc_dev {
+        ddf_fun_t *ctl_fun;
+        hcd_t hcd;
+        usb_dev_t *root_hub;
+} hc_dev_t;
+
+static hc_dev_t *dev_to_hc_dev(ddf_dev_t *dev)
+{
+        return ddf_dev_data_get(dev);
+}
+
+hcd_t *dev_to_hcd(ddf_dev_t *dev)
+{
+        hc_dev_t *hc_dev = dev_to_hc_dev(dev);
+        if (!hc_dev) {
+                usb_log_error("Invalid HCD device.\n");
+                return NULL;
+        }
+        return &hc_dev->hcd;
+}
+
 
 static int hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port);
@@ -312 +313 @@
         }
 
-        //TODO more checks
         ddf_fun_t *fun = ddf_fun_create(parent, fun_inner, name);
         if (!fun)
@@ -327 +327 @@
         link_initialize(&info->link);
         list_initialize(&info->devices);
+        fibril_mutex_initialize(&info->guard);
 
         ddf_fun_set_ops(fun, &usb_ops);
@@ -341 +342 @@
 
         if (hub_dev) {
+                fibril_mutex_lock(&hub_dev->guard);
                 list_append(&info->link, &hub_dev->devices);
+                fibril_mutex_unlock(&hub_dev->guard);
         } else {
                 hc_dev_t *hc_dev = dev_to_hc_dev(parent);
-                list_append(&info->link, &hc_dev->devices);
+                assert(hc_dev->root_hub == NULL);
+                hc_dev->root_hub = info;
         }
         return EOK;
@@ -409 +413 @@
         assert(hc_dev);
 
-        fibril_mutex_lock(&hc_dev->guard);
+        fibril_mutex_lock(&hub->guard);
 
         usb_dev_t *victim = NULL;
@@ -420 +424 @@
         if (victim && victim->port == port) {
                 list_remove(&victim->link);
-                fibril_mutex_unlock(&hc_dev->guard);
+                fibril_mutex_unlock(&hub->guard);
                 const int ret = ddf_fun_unbind(victim->fun);
                 if (ret == EOK) {
@@ -585 +589 @@
                 return ENOMEM;
         }
-        list_initialize(&instance->devices);
-        fibril_mutex_initialize(&instance->guard);
+        instance->root_hub = NULL;
         hcd_init(&instance->hcd, max_speed, bw, bw_count);