Changeset 04028225 in mainline

Timestamp:

2011-05-20T20:11:39Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a9ab7f47

Parents:

0edf7c7

Message:

Getting address by handle also moved into libusb

Location:

uspace

Files:

• app/mkbd/main.c (modified) (1 diff)
• app/usbinfo/main.c (modified) (1 diff)
• lib/usb/include/usb/hc.h (modified) (1 diff)
• lib/usb/src/hc.c (modified) (1 diff)
• lib/usbdev/include/usb/dev/pipes.h (modified) (1 diff)
• lib/usbdev/src/pipes.c (modified) (1 diff)

uspace/app/mkbd/main.c

@@ -173 +173 @@
                 /* Try to get its address. */
                 if (!addr_found) {
-                        addr = usb_device_get_assigned_address(dev_handle);
+                        addr = usb_hc_get_address_by_handle(dev_handle);
                         if (addr >= 0) {
                                 addr_found = true;

uspace/app/usbinfo/main.c

@@ -128 +128 @@
                 /* Try to get its address. */
                 if (!addr_found) {
-                        addr = usb_device_get_assigned_address(dev_handle);
+                        addr = usb_hc_get_address_by_handle(dev_handle);
                         if (addr >= 0) {
                                 addr_found = true;

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

@@ -60 +60 @@
     devman_handle_t *);
 
+int usb_hc_get_address_by_handle(devman_handle_t);
+
 int usb_ddf_get_hc_handle_by_class(size_t, devman_handle_t *);
 

uspace/lib/usb/src/hc.c

@@ -171 +171 @@
 }
 
+/** Tell USB address assigned to device with given handle.
+ *
+ * @param dev_handle Devman handle of the USB device in question.
+ * @return USB address or negative error code.
+ */
+usb_address_t usb_hc_get_address_by_handle(devman_handle_t dev_handle)
+{
+        int parent_phone = devman_parent_device_connect(dev_handle,
+            IPC_FLAG_BLOCKING);
+        if (parent_phone < 0) {
+                return parent_phone;
+        }
+
+        sysarg_t address;
+
+        int rc = async_req_2_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_ADDRESS,
+            dev_handle, &address);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        async_hangup(parent_phone);
+
+        return (usb_address_t) address;
+}
+
 
 /** Get host controller handle by its class index.

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -163 +163 @@
 
 int usb_device_get_assigned_interface(ddf_dev_t *);
-usb_address_t usb_device_get_assigned_address(devman_handle_t);
 
 int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *,

uspace/lib/usbdev/src/pipes.c

@@ -97 +97 @@
 
         return (int) iface_no;
-}
-
-/** Tell USB address assigned to given device.
- *
- * @param dev_handle Devman handle of the USB device in question.
- * @return USB address or negative error code.
- */
-usb_address_t usb_device_get_assigned_address(devman_handle_t dev_handle)
-{
-        int parent_phone = devman_parent_device_connect(dev_handle,
-            IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
-        sysarg_t address;
-
-        int rc = async_req_2_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_ADDRESS,
-            dev_handle, &address);
-
-        if (rc != EOK) {
-                return rc;
-        }
-
-        async_hangup(parent_phone);
-
-        return (usb_address_t) address;
 }