Changeset 27ed734c in mainline for uspace/lib/usb/src/ddfiface.c

Timestamp:

2011-10-31T13:06:57Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5e07cbc0

Parents:

d25e0a4

Message:

usb: Rename get_address ⇒ get_my_address and remove redundant handle parameter.

If you want to know what address the device uses ask the device not host controller.

File:

• uspace/lib/usb/src/ddfiface.c (modified) (4 diffs)

uspace/lib/usb/src/ddfiface.c

@@ -44 +44 @@
 
 /** DDF interface for USB device, implementation for typical hub. */
-usb_iface_t  usb_iface_hub_impl = {
+usb_iface_t usb_iface_hub_impl = {
         .get_hc_handle = usb_iface_get_hc_handle_device_impl,
-        .get_address = usb_iface_get_address_forward_impl,
+        .get_my_address = usb_iface_get_my_address_forward_impl,
 };
 
 /** DDF interface for USB device, implementation for child of a typical hub. */
-usb_iface_t  usb_iface_hub_child_impl = {
+usb_iface_t usb_iface_hub_child_impl = {
         .get_hc_handle = usb_iface_get_hc_handle_device_impl,
-        .get_address = usb_iface_get_address_from_device_data,
+        .get_my_address = usb_iface_get_my_address_from_device_data,
 };
 
@@ -92 +92 @@
  * @return Error code.
  */
-int usb_iface_get_address_forward_impl(ddf_fun_t *fun, devman_handle_t handle,
+int usb_iface_get_my_address_forward_impl(ddf_fun_t *fun,
     usb_address_t *address)
 {
         assert(fun);
-        assert(handle == 0);
 
         async_sess_t *parent_sess =
@@ -107 +106 @@
 
         sysarg_t addr;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_ADDRESS, handle, &addr);
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_MY_ADDRESS, &addr);
 
         async_exchange_end(exch);
@@ -133 +132 @@
  * @return Error code.
  */
-int usb_iface_get_address_from_device_data(ddf_fun_t *fun,
-    devman_handle_t handle, usb_address_t *address)
+int usb_iface_get_my_address_from_device_data(ddf_fun_t *fun,
+    usb_address_t *address)
 {
         assert(fun);
-        assert(handle == 0);
         assert(fun->driver_data);
         usb_hub_attached_device_t *device = fun->driver_data;