Changeset 56fb3732 in mainline

Timestamp:

2010-12-28T10:28:16Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

de2c901

Parents:

6edd494

Message:

Add USB interface

Only boilerplate code for finding host controller device is physically
attached to is ready.

Location:

uspace/lib

Files:

• c/include/ipc/dev_iface.h (modified) (1 diff)
• drv/Makefile (modified) (1 diff)
• drv/generic/dev_iface.c (modified) (2 diffs)
• drv/generic/remote_usb.c (added)
• drv/include/remote_usb.h (added)
• drv/include/usb_iface.h (added)
• usb/include/usb/usbdrv.h (modified) (1 diff)
• usb/src/usbdrv.c (modified) (2 diffs)

uspace/lib/c/include/ipc/dev_iface.h

@@ -39 +39 @@
         CHAR_DEV_IFACE,
 
+        /** Interface provided by any USB device. */
+        USB_DEV_IFACE,
         /** Interface provided by USB host controller. */
         USBHC_DEV_IFACE,

uspace/lib/drv/Makefile

@@ -36 +36 @@
         generic/dev_iface.c \
         generic/remote_res.c \
+        generic/remote_usb.c \
         generic/remote_usbhc.c \
         generic/remote_char.c

uspace/lib/drv/generic/dev_iface.c

@@ -39 +39 @@
 #include "remote_res.h"
 #include "remote_char.h"
+#include "remote_usb.h"
 #include "remote_usbhc.h"
 
@@ -45 +46 @@
                 &remote_res_iface,
                 &remote_char_iface,
+                &remote_usb_iface,
                 &remote_usbhc_iface
         }

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

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

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, 0);
+        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);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        *handle = h;
+
+        return EOK;
+}
+
 /** Connect to host controller the device is physically attached to.
  *