Changeset 3121b5f in mainline

Timestamp:

2013-08-07T09:51:53Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e588d12

Parents:

5514cf7

Message:

rename get_device_handle ⇒ get_my_device_handle

Location:

uspace

Files:

• drv/bus/usb/usbmid/usbmid.c (modified) (1 diff)
• lib/drv/generic/remote_usb.c (modified) (6 diffs)
• lib/drv/include/usb_iface.h (modified) (2 diffs)
• lib/usbdev/src/devdrv.c (modified) (1 diff)
• lib/usbhost/src/ddf_helpers.c (modified) (2 diffs)

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

@@ -73 +73 @@
 /** DDF interface of the child - USB functions. */
 static usb_iface_t child_usb_iface = {
-        .get_device_handle = usb_iface_device_handle,
+        .get_my_device_handle = usb_iface_device_handle,
         .get_my_interface = usb_iface_iface_no,
 };

uspace/lib/drv/generic/remote_usb.c

@@ -65 +65 @@
 typedef enum {
         IPC_M_USB_GET_MY_INTERFACE,
-        IPC_M_USB_GET_DEVICE_HANDLE,
+        IPC_M_USB_GET_MY_DEVICE_HANDLE,
         IPC_M_USB_RESERVE_DEFAULT_ADDRESS,
         IPC_M_USB_RELEASE_DEFAULT_ADDRESS,
@@ -99 +99 @@
  * @return Error code.
  */
-int usb_get_device_handle(async_exch_t *exch, devman_handle_t *handle)
+int usb_get_my_device_handle(async_exch_t *exch, devman_handle_t *handle)
 {
         devman_handle_t h = 0;
         const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_DEVICE_HANDLE, &h);
+            IPC_M_USB_GET_MY_DEVICE_HANDLE, &h);
         if (ret == EOK && handle)
                 *handle = (devman_handle_t)h;
@@ -273 +273 @@
 
 static void remote_usb_get_my_interface(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-static void remote_usb_get_device_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usb_get_my_device_handle(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_reserve_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usb_release_default_address(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -286 +286 @@
 static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
         [IPC_M_USB_GET_MY_INTERFACE] = remote_usb_get_my_interface,
-        [IPC_M_USB_GET_DEVICE_HANDLE] = remote_usb_get_device_handle,
+        [IPC_M_USB_GET_MY_DEVICE_HANDLE] = remote_usb_get_my_device_handle,
         [IPC_M_USB_RESERVE_DEFAULT_ADDRESS] = remote_usb_reserve_default_address,
         [IPC_M_USB_RELEASE_DEFAULT_ADDRESS] = remote_usb_release_default_address,
@@ -323 +323 @@
 }
 
-void remote_usb_get_device_handle(ddf_fun_t *fun, void *iface,
+void remote_usb_get_my_device_handle(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
         const usb_iface_t *usb_iface = (usb_iface_t *) iface;
 
-        if (usb_iface->get_device_handle == NULL) {
+        if (usb_iface->get_my_device_handle == NULL) {
                 async_answer_0(callid, ENOTSUP);
                 return;
@@ -334 +334 @@
 
         devman_handle_t handle;
-        const int ret = usb_iface->get_device_handle(fun, &handle);
+        const int ret = usb_iface->get_my_device_handle(fun, &handle);
         if (ret != EOK) {
                 async_answer_0(callid, ret);

uspace/lib/drv/include/usb_iface.h

@@ -53 +53 @@
 
 int usb_get_my_interface(async_exch_t *, int *);
-int usb_get_device_handle(async_exch_t *, devman_handle_t *);
+int usb_get_my_device_handle(async_exch_t *, devman_handle_t *);
 
 int usb_reserve_default_address(async_exch_t *, usb_speed_t);
@@ -76 +76 @@
 typedef struct {
         int (*get_my_interface)(ddf_fun_t *, int *);
-        int (*get_device_handle)(ddf_fun_t *, devman_handle_t *);
+        int (*get_my_device_handle)(ddf_fun_t *, devman_handle_t *);
 
         int (*reserve_default_address)(ddf_fun_t *, usb_speed_t);

uspace/lib/usbdev/src/devdrv.c

@@ -443 +443 @@
         if (!exch)
                 return EPARTY;
-        int ret = usb_get_device_handle(exch, handle);
+        int ret = usb_get_my_device_handle(exch, handle);
         if (ret == EOK) {
                 ret = usb_get_my_interface(exch, iface_no);

uspace/lib/usbhost/src/ddf_helpers.c

@@ -182 +182 @@
 }
 
-/** Gets handle of the respective hc (this device, hc function).
- *
- * @param[in] root_hub_fun Root hub function seeking hc handle.
+/** Gets handle of the respective device.
+ *
+ * @param[in] fun Device function.
  * @param[out] handle Place to write the handle.
  * @return Error code.
  */
-static int get_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
+static int get_my_device_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
         assert(fun);
@@ -250 +250 @@
 /** Root hub USB interface */
 static usb_iface_t usb_iface = {
-        .get_device_handle = get_device_handle,
+        .get_my_device_handle = get_my_device_handle,
 
         .reserve_default_address = reserve_default_address,