Changeset 1e6dc5b in mainline

Timestamp:

2011-10-31T12:08:43Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1c1b577

Parents:

59c163c

Message:

libusb: Default get_address handler uses fun→driver_data structure.

Location:

uspace/lib/usb

Files:

• Makefile (modified) (1 diff)
• include/usb/ddfiface.h (modified) (1 diff)
• src/ddfiface.c (modified) (3 diffs)

uspace/lib/usb/Makefile

@@ -31 +31 @@
 EXTRA_CFLAGS += \
         -I$(LIBDRV_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
         -Iinclude
 

uspace/lib/usb/include/usb/ddfiface.h

@@ -44 +44 @@
 extern usb_iface_t usb_iface_hub_impl;
 
-int usb_iface_get_address_set_my_handle_impl(ddf_fun_t *, devman_handle_t,
+int usb_iface_get_address_from_device_data(ddf_fun_t *, devman_handle_t,
     usb_address_t *);
 extern usb_iface_t usb_iface_hub_child_impl;

uspace/lib/usb/src/ddfiface.c

@@ -39 +39 @@
 #include <usb/hc.h>
 #include <usb/debug.h>
+#include <usb/dev/hub.h>
 #include <errno.h>
 #include <assert.h>
@@ -51 +52 @@
 usb_iface_t  usb_iface_hub_child_impl = {
         .get_hc_handle = usb_iface_get_hc_handle_device_impl,
-        .get_address = usb_iface_get_address_set_my_handle_impl
+        .get_address = usb_iface_get_address_from_device_data,
 };
 
@@ -131 +132 @@
  * @return Error code.
  */
-int usb_iface_get_address_set_my_handle_impl(ddf_fun_t *fun,
+int usb_iface_get_address_from_device_data(ddf_fun_t *fun,
     devman_handle_t handle, usb_address_t *address)
 {
-        if (handle == 0) {
-                handle = fun->handle;
-        }
-        return usb_iface_get_address_forward_impl(fun, handle, address);
+        assert(fun);
+        assert(handle == 0);
+        assert(fun->driver_data);
+        usb_hub_attached_device_t *device = fun->driver_data;
+        assert(device->fun == fun);
+        if (address)
+                *address = device->address;
+        return EOK;
 }