Changeset 71ed4849 in mainline for uspace/lib/usb/src/usbdrv.c

Timestamp:

2010-12-28T14:00:36Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8f8a0cd6

Parents:

de2c901

Message:

Connecting to "parent" host controller

USB drivers can now connect to host controller drivers they physically
belong to (so far, everything connected to VHC).

Each USB device must implement the USB interface of libdrv to allow
this (it is absolutely neccesary for hubs).

USB drivers can use usb_drv_hc_connect() to connect to "their" host
controller.

Child devices created with usb_drv_register_child_in_devman()are set
to handle this connection automatically.

UHCI and VHC drivers were updated.

File:

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

uspace/lib/usb/src/usbdrv.c

@@ -70 +70 @@
         }
 
-        int parent_phone = devman_parent_device_connect(dev->handle, 0);
+        int parent_phone = devman_parent_device_connect(dev->handle,
+            IPC_FLAG_BLOCKING);
         if (parent_phone < 0) {
                 return parent_phone;
@@ -78 +79 @@
         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;
@@ -85 +89 @@
 
         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);
 }
 
@@ -93 +110 @@
  * @return Phone to corresponding HC or error code.
  */
-int usb_drv_hc_connect(device_t *dev, unsigned int flags)
-{
+int usb_drv_hc_connect_auto(device_t *dev, unsigned int flags)
+{
+        int rc;
+        devman_handle_t hc_handle;
+
         /*
          * Call parent hub to obtain device handle of respective HC.
          */
-
-        /*
-         * FIXME: currently we connect always to virtual host controller.
-         */
-        int rc;
-        devman_handle_t handle;
-
-        rc = devman_device_get_handle("/virt/usbhc", &handle, flags);
+        rc = usb_drv_find_hc(dev, &hc_handle);
         if (rc != EOK) {
                 return rc;
         }
         
-        int phone = devman_device_connect(handle, flags);
-
-        return phone;
+        return usb_drv_hc_connect(dev, hc_handle, flags);
 }