Changeset e8f826b in mainline

Timestamp:

2011-05-20T20:29:27Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

400735e, c9256c5

Parents:

96f2aa6

Message:

Merged headers in libusb

Location:

uspace

Files:

• app/mkbd/main.c (modified) (1 diff)
• app/usbinfo/main.c (modified) (1 diff)
• lib/usb/Makefile (modified) (1 diff)
• lib/usb/include/usb/driver.h (deleted)
• lib/usb/include/usb/hc.h (modified) (1 diff)
• lib/usb/src/ddfiface.c (modified) (1 diff)
• lib/usb/src/driver.c (deleted)
• lib/usb/src/hc.c (modified) (2 diffs)
• lib/usb/src/resolve.c (modified) (1 diff)
• lib/usbdev/src/pipes.c (modified) (1 diff)

uspace/app/mkbd/main.c

@@ -46 +46 @@
 #include <usb/dev/hub.h>
 #include <usb/hc.h>
-#include <usb/driver.h>
 #include <usb/dev/pipes.h>
 

uspace/app/usbinfo/main.c

@@ -44 +44 @@
 #include <devmap.h>
 #include <usb/hc.h>
-#include <usb/driver.h>
 #include <usb/dev/pipes.h>
-#include <usb/driver.h>
 #include "usbinfo.h"
 

uspace/lib/usb/Makefile

@@ -37 +37 @@
         src/ddfiface.c \
         src/debug.c \
-        src/driver.c \
         src/dump.c \
         src/hc.c \

uspace/lib/usb/include/usb/hc.h

@@ -62 +62 @@
 int usb_hc_get_address_by_handle(devman_handle_t);
 
+int usb_hc_find(devman_handle_t, devman_handle_t *);
+
+int usb_resolve_device_handle(const char *, devman_handle_t *, usb_address_t *,
+    devman_handle_t *);
+
 int usb_ddf_get_hc_handle_by_class(size_t, devman_handle_t *);
 

uspace/lib/usb/src/ddfiface.c

@@ -37 +37 @@
 #include <async.h>
 #include <usb/ddfiface.h>
-#include <usb/driver.h>
+#include <usb/hc.h>
 #include <usb/debug.h>
 #include <errno.h>

uspace/lib/usb/src/hc.c

@@ -39 +39 @@
 #include <usbhc_iface.h>
 #include <usb/hc.h>
-#include <usb/driver.h>
 #include <usb/debug.h>
 #include <errno.h>
@@ -232 +231 @@
 }
 
+/** Find host controller handle that is ancestor of given device.
+ *
+ * @param[in] device_handle Device devman handle.
+ * @param[out] hc_handle Where to store handle of host controller
+ *      controlling device with @p device_handle handle.
+ * @return Error code.
+ */
+int usb_hc_find(devman_handle_t device_handle, devman_handle_t *hc_handle)
+{
+        int parent_phone = devman_parent_device_connect(device_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);
+
+        async_hangup(parent_phone);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if (hc_handle != NULL) {
+                *hc_handle = h;
+        }
+
+        return EOK;
+}
+
 /**
  * @}

uspace/lib/usb/src/resolve.c

@@ -34 +34 @@
  */
 #include <inttypes.h>
-#include <usb/driver.h>
 #include <usb/hc.h>
 #include <devman.h>

uspace/lib/usbdev/src/pipes.c

@@ -36 +36 @@
 #include <usb/dev/pipes.h>
 #include <usb/debug.h>
-#include <usb/driver.h>
+#include <usb/hc.h>
 #include <usbhc_iface.h>
 #include <usb_iface.h>