Changeset eea3e39 in mainline

Timestamp:

2011-10-31T09:46:52Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3562cd18

Parents:

cae002c

Message:

libusb: Rename get_address implementations.

The new names describe the functionality better.

Location:

uspace

Files:

• drv/bus/usb/usbmid/usbmid.c (modified) (1 diff)
• lib/usb/include/usb/ddfiface.h (modified) (1 diff)
• lib/usb/src/ddfiface.c (modified) (7 diffs)
• lib/usbdev/src/recognise.c (modified) (2 diffs)

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -63 +63 @@
 static usb_iface_t child_usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle_hub_child_impl,
-        .get_address = usb_iface_get_address_hub_impl,
+        .get_address = usb_iface_get_address_forward_impl,
         .get_interface = usb_iface_get_interface_impl
 };

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

@@ -40 +40 @@
 
 int usb_iface_get_hc_handle_hub_impl(ddf_fun_t *, devman_handle_t *);
-int usb_iface_get_address_hub_impl(ddf_fun_t *, devman_handle_t,
+int usb_iface_get_address_forward_impl(ddf_fun_t *, devman_handle_t,
     usb_address_t *);
 extern usb_iface_t usb_iface_hub_impl;
 
 int usb_iface_get_hc_handle_hub_child_impl(ddf_fun_t *, devman_handle_t *);
-int usb_iface_get_address_hub_child_impl(ddf_fun_t *, devman_handle_t,
+int usb_iface_get_address_set_my_handle_impl(ddf_fun_t *, devman_handle_t,
     usb_address_t *);
 extern usb_iface_t usb_iface_hub_child_impl;

uspace/lib/usb/src/ddfiface.c

@@ -45 +45 @@
 usb_iface_t  usb_iface_hub_impl = {
         .get_hc_handle = usb_iface_get_hc_handle_hub_impl,
-        .get_address = usb_iface_get_address_hub_impl
+        .get_address = usb_iface_get_address_forward_impl,
 };
 
@@ -51 +51 @@
 usb_iface_t  usb_iface_hub_child_impl = {
         .get_hc_handle = usb_iface_get_hc_handle_hub_child_impl,
-        .get_address = usb_iface_get_address_hub_child_impl
+        .get_address = usb_iface_get_address_set_my_handle_impl
 };
 
@@ -125 +125 @@
  * @return Error code.
  */
-int usb_iface_get_address_hub_impl(ddf_fun_t *fun, devman_handle_t handle,
+int usb_iface_get_address_forward_impl(ddf_fun_t *fun, devman_handle_t handle,
     usb_address_t *address)
 {
         assert(fun);
-        
+
         async_sess_t *parent_sess =
             devman_parent_device_connect(EXCHANGE_SERIALIZE, fun->handle,
@@ -135 +135 @@
         if (!parent_sess)
                 return ENOMEM;
-        
+
         async_exch_t *exch = async_exchange_begin(parent_sess);
-        
+
         sysarg_t addr;
         int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_ADDRESS, handle, &addr);
-        
+
         async_exchange_end(exch);
         async_hangup(parent_sess);
-        
+
         if (rc != EOK)
                 return rc;
-        
+
         if (address != NULL)
                 *address = (usb_address_t) addr;
-        
+
         return EOK;
 }
@@ -157 +157 @@
  * a hub driver.
  *
+ * This implementation eccepts 0 as valid handle and replaces it with fun's
+ * handle.
+ *
  * @param[in] fun Device function the operation is running on.
  * @param[in] handle Devman handle of USB device we want address of.
@@ -162 +165 @@
  * @return Error code.
  */
-int usb_iface_get_address_hub_child_impl(ddf_fun_t *fun,
+int usb_iface_get_address_set_my_handle_impl(ddf_fun_t *fun,
     devman_handle_t handle, usb_address_t *address)
 {
@@ -168 +171 @@
                 handle = fun->handle;
         }
-        return usb_iface_get_address_hub_impl(fun, handle, address);
+        return usb_iface_get_address_forward_impl(fun, handle, address);
 }
 

uspace/lib/usbdev/src/recognise.c

@@ -50 +50 @@
 
 /** DDF operations of child devices. */
-ddf_dev_ops_t child_ops = {
+static ddf_dev_ops_t child_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface_hub_child_impl
 };
@@ -339 +339 @@
  * @param[in] hc_handle Handle of the host controller.
  * @param[in] parent Parent device.
- * @param[in] dev_ops Child device ops.
+ * @param[in] dev_ops Child device ops. Default child_ops will be used if NULL.
  * @param[in] dev_data Arbitrary pointer to be stored in the child
  *      as @c driver_data.