Changes in uspace/lib/usb/src/usbdrv.c [71ed4849:97e660e] in mainline

File:

• uspace/lib/usb/src/usbdrv.c (modified) (8 diffs)

uspace/lib/usb/src/usbdrv.c

@@ -35 +35 @@
 #include <usb/usbdrv.h>
 #include <usbhc_iface.h>
-#include <usb_iface.h>
 #include <errno.h>
 #include <str_error.h>
@@ -55 +54 @@
 } transfer_info_t;
 
-/** Find handle of host controller the device is physically attached to.
- *
- * @param[in] dev Device looking for its host controller.
- * @param[out] handle Host controller devman handle.
- * @return Error code.
- */
-int usb_drv_find_hc(device_t *dev, devman_handle_t *handle)
-{
-        if (dev == NULL) {
-                return EBADMEM;
-        }
-        if (handle == NULL) {
-                return EBADMEM;
-        }
-
-        int parent_phone = devman_parent_device_connect(dev->handle,
-            IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
-        devman_handle_t h;
-        int rc = async_req_1_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
-
-        ipc_hangup(parent_phone);
-
-        if (rc != EOK) {
-                return rc;
-        }
-
-        *handle = h;
-
-        return EOK;
-}
-
-/** Connect to host controller the device is physically attached to.
- *
- * @param dev Device asking for connection.
- * @param hc_handle Devman handle of the host controller.
- * @param flags Connection flags (blocking connection).
- * @return Phone to the HC or error code.
- */
-int usb_drv_hc_connect(device_t *dev, devman_handle_t hc_handle,
-    unsigned int flags)
-{
-        return devman_device_connect(hc_handle, flags);
-}
-
 /** Connect to host controller the device is physically attached to.
  *
@@ -110 +60 @@
  * @return Phone to corresponding HC or error code.
  */
-int usb_drv_hc_connect_auto(device_t *dev, unsigned int flags)
-{
-        int rc;
-        devman_handle_t hc_handle;
-
+int usb_drv_hc_connect(device_t *dev, unsigned int flags)
+{
         /*
          * Call parent hub to obtain device handle of respective HC.
          */
-        rc = usb_drv_find_hc(dev, &hc_handle);
+
+        /*
+         * FIXME: currently we connect always to virtual host controller.
+         */
+        int rc;
+        devman_handle_t handle;
+
+        rc = devman_device_get_handle("/virt/usbhc", &handle, flags);
         if (rc != EOK) {
                 return rc;
         }
         
-        return usb_drv_hc_connect(dev, hc_handle, flags);
+        int phone = devman_device_connect(handle, flags);
+
+        return phone;
 }
 
@@ -134 +90 @@
 usb_address_t usb_drv_get_my_address(int phone, device_t *dev)
 {
-        sysarg_t address;
+        ipcarg_t address;
         int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_GET_ADDRESS,
@@ -176 +132 @@
 usb_address_t usb_drv_request_address(int phone)
 {
-        sysarg_t address;
+        ipcarg_t address;
         int rc = async_req_1_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_REQUEST_ADDRESS, &address);
@@ -342 +298 @@
  * @return Error status.
  */
-static int read_buffer_in(int phone, sysarg_t hash,
+static int read_buffer_in(int phone, ipcarg_t hash,
     void *buffer, size_t size, size_t *actual_size)
 {
         ipc_call_t answer_data;
-        sysarg_t answer_rc;
+        ipcarg_t answer_rc;
         aid_t req;
         int rc;
@@ -394 +350 @@
         transfer_info_t *transfer = (transfer_info_t *) handle;
 
-        sysarg_t answer_rc;
+        ipcarg_t answer_rc;
         async_wait_for(transfer->request, &answer_rc);
 
@@ -411 +367 @@
                  * We will use it when actually reading-in the data.
                  */
-                sysarg_t buffer_hash = IPC_GET_ARG1(transfer->reply);
+                ipcarg_t buffer_hash = IPC_GET_ARG1(transfer->reply);
                 if (buffer_hash == 0) {
                         rc = ENOENT;