Changeset 52c4264 in mainline for uspace/lib/usb/src

Timestamp:

2012-08-17T12:23:52Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

267f235

Parents:

ae2c925 (diff), ad78054 (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:

Merge mainline changes

Location:

uspace/lib/usb/src

Files:

• ddfiface.c (modified) (4 diffs)
• hc.c (modified) (1 diff)

uspace/lib/usb/src/ddfiface.c

@@ -68 +68 @@
 {
         assert(fun);
-        return usb_get_hc_by_handle(fun->handle, handle);
+        return usb_get_hc_by_handle(ddf_fun_get_handle(fun), handle);
 }
 
@@ -82 +82 @@
 
         if (handle != NULL) {
-                *handle = fun->handle;
+                *handle = ddf_fun_get_handle(fun);
         }
 
@@ -99 +99 @@
 {
         assert(fun);
-        return usb_get_address_by_handle(fun->handle, address);
+        return usb_get_address_by_handle(ddf_fun_get_handle(fun), address);
 }
 
@@ -116 +116 @@
     usb_address_t *address)
 {
-        assert(fun);
-        assert(fun->driver_data);
-        const usb_hub_attached_device_t *device = fun->driver_data;
+        const usb_hub_attached_device_t *device = ddf_fun_data_get(fun);
         assert(device->fun == fun);
         if (address)

uspace/lib/usb/src/hc.c

@@ -115 +115 @@
  */
 int usb_hc_connection_initialize_from_device(usb_hc_connection_t *connection,
-    const ddf_dev_t *device)
-{
-        assert(connection);
-
-        if (device == NULL) {
+    ddf_dev_t *device)
+{
+        if (device == NULL)
                 return EBADMEM;
-        }
 
         devman_handle_t hc_handle;
-        const int rc = usb_get_hc_by_handle(device->handle, &hc_handle);
+        const int rc = usb_get_hc_by_handle(ddf_dev_get_handle(device), &hc_handle);
         if (rc == EOK) {
                 usb_hc_connection_initialize(connection, hc_handle);