Changeset 0918382f in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2013-08-07T15:00:36Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

14dd4c9

Parents:

2757247

Message:

usb: Switch to using port number as device identifier.

Port number info will be needed for HS SPLIT transactions. Moreover,
it can be used to produce predictable, persistent device names.

Switch port_number from size_t to unsigned. There are max 256 ports so
even short would be enough.

File:

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

uspace/lib/usbhost/src/ddf_helpers.c

@@ -77 +77 @@
 } 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);
+static int hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port);
+static int hcd_ddf_remove_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port);
 
 
@@ -164 +162 @@
 }
 
-static int device_enumerate(ddf_fun_t *fun, usb_device_handle_t *handle)
+static int device_enumerate(ddf_fun_t *fun, unsigned port)
 {
         assert(fun);
@@ -171 +169 @@
         assert(ddf_dev);
         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, dev, port, &address);
-        if (ret == EOK && handle)
-                *handle = address;
-        return ret;
-}
-
-static int device_remove(ddf_fun_t *fun, usb_device_handle_t handle)
+        usb_log_debug("Hub %d reported a new USB device on port: %u\n",
+            dev->address, port);
+        return hcd_ddf_new_device(ddf_dev, dev, port);
+}
+
+static int device_remove(ddf_fun_t *fun, unsigned port)
 {
         assert(fun);
@@ -187 +181 @@
         assert(ddf_dev);
         assert(dev);
-        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);
+        usb_log_debug("Hub `%s' reported removal of device on port %u\n",
+            ddf_fun_get_name(fun), port);
+        return hcd_ddf_remove_device(ddf_dev, dev, port);
 }
 
@@ -405 +399 @@
 
 static int hcd_ddf_remove_device(ddf_dev_t *device, usb_dev_t *hub,
-    usb_address_t id)
+    unsigned port)
 {
         assert(device);
@@ -421 +415 @@
         list_foreach(hub->devices, it) {
                 victim = list_get_instance(it, usb_dev_t, link);
-                if (victim->address == id)
+                if (victim->port == port)
                         break;
         }
-        if (victim && victim->address == id) {
+        if (victim && victim->port == port) {
                 list_remove(&victim->link);
                 fibril_mutex_unlock(&hc_dev->guard);
@@ -432 +426 @@
                         hcd_release_address(hcd, victim->address);
                 } else {
-                        usb_log_warning("Failed to unbind device %d: %s\n",
-                            id, str_error(ret));
+                        usb_log_warning("Failed to unbind device `%s': %s\n",
+                            ddf_fun_get_name(victim->fun), str_error(ret));
                 }
                 return EOK;
@@ -440 +434 @@
 }
 
-static int hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port,
-    usb_address_t *id)
+static int hcd_ddf_new_device(ddf_dev_t *device, usb_dev_t *hub, unsigned port)
 {
         assert(device);
@@ -552 +545 @@
                 hcd_remove_ep(hcd, target, USB_DIRECTION_BOTH);
                 hcd_release_address(hcd, target.address);
-                return ret;
-        }
-        if (ret == EOK && id)
-                *id = target.address;
+        }
 
         return ret;
@@ -574 +564 @@
 
         hcd_reserve_default_address(hcd, speed);
-        const int ret = hcd_ddf_new_device(device, NULL, 0, NULL);
+        const int ret = hcd_ddf_new_device(device, NULL, 0);
         hcd_release_default_address(hcd);
         return ret;