Changeset 27ed734c in mainline for uspace/lib/usb

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

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.

Location:

uspace/lib/usb

Files:

• include/usb/ddfiface.h (modified) (1 diff)
• include/usb/hc.h (modified) (1 diff)
• src/ddfiface.c (modified) (4 diffs)
• src/hc.c (modified) (2 diffs)
• src/resolve.c (modified) (1 diff)

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

@@ -40 +40 @@
 
 int usb_iface_get_hc_handle_device_impl(ddf_fun_t *, devman_handle_t *);
-int usb_iface_get_address_forward_impl(ddf_fun_t *, devman_handle_t,
-    usb_address_t *);
+int usb_iface_get_my_address_forward_impl(ddf_fun_t *, usb_address_t *);
 extern usb_iface_t usb_iface_hub_impl;
 
-int usb_iface_get_address_from_device_data(ddf_fun_t *, devman_handle_t,
-    usb_address_t *);
+int usb_iface_get_my_address_from_device_data(ddf_fun_t *, usb_address_t *);
 extern usb_iface_t usb_iface_hub_child_impl;
 
 int usb_iface_get_hc_handle_hc_impl(ddf_fun_t *, devman_handle_t *);
-
 
 #endif

uspace/lib/usb/include/usb/hc.h

@@ -62 +62 @@
     devman_handle_t *);
 
-usb_address_t usb_hc_get_address_by_handle(devman_handle_t);
+usb_address_t usb_get_address_by_handle(devman_handle_t);
 
 int usb_hc_find(devman_handle_t, devman_handle_t *);

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;

uspace/lib/usb/src/hc.c

@@ -174 +174 @@
  * @return USB address or negative error code.
  */
-usb_address_t usb_hc_get_address_by_handle(devman_handle_t dev_handle)
+usb_address_t usb_get_address_by_handle(devman_handle_t dev_handle)
 {
         async_sess_t *parent_sess =
@@ -185 +185 @@
         
         sysarg_t address;
-        int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_ADDRESS,
-            dev_handle, &address);
+        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_MY_ADDRESS, &address);
         
         async_exchange_end(exch);

uspace/lib/usb/src/resolve.c

@@ -200 +200 @@
                 /* Try to get its address. */
                 if (!found_addr) {
-                        dev_addr = usb_hc_get_address_by_handle(tmp_handle);
+                        dev_addr = usb_get_address_by_handle(tmp_handle);
                         if (dev_addr >= 0) {
                                 found_addr = true;