Changeset 2b0db98 in mainline for uspace/lib/usb

Timestamp:

2011-01-07T14:02:56Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

6986418

Parents:

d99120f (diff), 0f191a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged development into lelian/hidd

Location:

uspace/lib/usb

Files:

• include/usb/hcdhubd.h (modified) (1 diff)
• include/usb/usbdrv.h (modified) (1 diff)
• src/hcdhubd.c (modified) (3 diffs)
• src/recognise.c (modified) (3 diffs)
• src/usbdrv.c (modified) (3 diffs)

uspace/lib/usb/include/usb/hcdhubd.h

@@ -207 +207 @@
 int usb_hc_add_child_device(device_t *, const char *, const char *, bool);
 
+
+/**
+ * @}
+ */
+
 #endif

uspace/lib/usb/include/usb/usbdrv.h

@@ -41 +41 @@
 #include <usb/descriptor.h>
 
-int usb_drv_hc_connect(device_t *, unsigned int);
+int usb_drv_find_hc(device_t *, devman_handle_t *);
+int usb_drv_hc_connect(device_t *, devman_handle_t, unsigned int);
+int usb_drv_hc_connect_auto(device_t *, unsigned int);
 
 int usb_drv_reserve_default_address(int);

uspace/lib/usb/src/hcdhubd.c

@@ -36 +36 @@
 #include <usb/devreq.h>
 #include <usbhc_iface.h>
+#include <usb_iface.h>
 #include <usb/descriptor.h>
 #include <driver.h>
@@ -45 +46 @@
 #include "hcdhubd_private.h"
 
+
+static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+{
+        assert(dev);
+        assert(dev->parent != NULL);
+
+        device_t *parent = dev->parent;
+
+        if (parent->ops && parent->ops->interfaces[USB_DEV_IFACE]) {
+                usb_iface_t *usb_iface
+                    = (usb_iface_t *) parent->ops->interfaces[USB_DEV_IFACE];
+                assert(usb_iface != NULL);
+                if (usb_iface->get_hc_handle) {
+                        int rc = usb_iface->get_hc_handle(parent, handle);
+                        return rc;
+                }
+        }
+
+        return ENOTSUP;
+}
+
+static usb_iface_t usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle
+};
+
+static device_ops_t child_ops = {
+        .interfaces[USB_DEV_IFACE] = &usb_iface
+};
+
 /** Callback when new device is detected and must be handled by this driver.
  *
@@ -129 +159 @@
         }
         child->name = child_info->name;
+        child->parent = child_info->parent;
+        child->ops = &child_ops;
 
         match_id = create_match_id();

uspace/lib/usb/src/recognise.c

@@ -33 +33 @@
  * @brief Functions for recognising kind of attached devices.
  */
+#include <usb_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/classes/classes.h>
@@ -38 +39 @@
 #include <errno.h>
 
+static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+{
+        assert(dev);
+        assert(dev->parent != NULL);
+
+        device_t *parent = dev->parent;
+
+        if (parent->ops && parent->ops->interfaces[USB_DEV_IFACE]) {
+                usb_iface_t *usb_iface
+                    = (usb_iface_t *) parent->ops->interfaces[USB_DEV_IFACE];
+                assert(usb_iface != NULL);
+                if (usb_iface->get_hc_handle) {
+                        int rc = usb_iface->get_hc_handle(parent, handle);
+                        return rc;
+                }
+        }
+
+        return ENOTSUP;
+}
+
+static usb_iface_t usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle
+};
+
+static device_ops_t child_ops = {
+        .interfaces[USB_DEV_IFACE] = &usb_iface
+};
 
 #define BCD_INT(a) (((unsigned int)(a)) / 256)
@@ -285 +313 @@
                 goto failure;
         }
+        child->parent = parent;
         child->name = child_name;
+        child->ops = &child_ops;
         
         rc = usb_drv_create_device_match_ids(hc, &child->match_ids, address);

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>
@@ -54 +55 @@
 } 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.
  *
@@ -60 +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);
 }