Changeset 563fb40 in mainline

Timestamp:

2011-02-15T21:30:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

72363a1

Parents:

fa2f79d

Message:

Less usage of old drivers API

Location:

uspace

Files:

• drv/uhci-rhd/root_hub.c (modified) (1 diff)
• drv/usbhub/usbhub.c (modified) (1 diff)
• lib/usb/src/pipes.c (modified) (3 diffs)

uspace/drv/uhci-rhd/root_hub.c

@@ -47 +47 @@
         assert(rh);
         int ret;
-        ret = usb_drv_find_hc(rh, &instance->hc_handle);
+        ret = usb_hc_find(rh->handle, &instance->hc_handle);
         usb_log_info("rh found(%d) hc handle: %d.\n", ret, instance->hc_handle);
         if (ret != EOK) {

uspace/drv/usbhub/usbhub.c

@@ -50 +50 @@
 #include "usb/usb.h"
 
+static int iface_get_hc_handle(device_t *device, devman_handle_t *handle)
+{
+        return usb_hc_find(device->handle, handle);
+}
+
 static usb_iface_t hub_usb_iface = {
-        .get_hc_handle = usb_drv_find_hc
+        .get_hc_handle = iface_get_hc_handle
 };
 

uspace/lib/usb/src/pipes.c

@@ -35 +35 @@
 #include <usb/usb.h>
 #include <usb/pipes.h>
+#include <usbhc_iface.h>
 #include <errno.h>
 #include <assert.h>
-#include <usb/usbdrv.h>
+
+/** Tell USB address assigned to given device.
+ *
+ * @param phone Phone to my HC.
+ * @param dev Device in question.
+ * @return USB address or error code.
+ */
+static usb_address_t get_my_address(int phone, device_t *dev)
+{
+        sysarg_t address;
+        int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_ADDRESS,
+            dev->handle, &address);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        return (usb_address_t) address;
+}
 
 /** Initialize connection to USB device.
@@ -55 +75 @@
         usb_address_t my_address;
 
-        rc = usb_drv_find_hc(device, &hc_handle);
+        rc = usb_hc_find(device->handle, &hc_handle);
         if (rc != EOK) {
                 return rc;
@@ -65 +85 @@
         }
 
-        my_address = usb_drv_get_my_address(hc_phone, device);
+        my_address = get_my_address(hc_phone, device);
         if (my_address < 0) {
                 rc = my_address;