Changes in / [c9256c5:74b1e40] in mainline

Files:

• .bzrignore (modified) (1 diff)
• uspace/Makefile.common (modified) (1 diff)
• uspace/app/lsusb/main.c (modified) (1 diff)
• uspace/app/mkbd/main.c (modified) (2 diffs)
• uspace/app/usbinfo/main.c (modified) (2 diffs)
• uspace/drv/uhci-rhd/port.h (modified) (1 diff)
• uspace/lib/usb/Makefile (modified) (1 diff)
• uspace/lib/usb/include/usb/driver.h (added)
• uspace/lib/usb/include/usb/hc.h (deleted)
• uspace/lib/usb/include/usb/host.h (added)
• uspace/lib/usb/src/ddfiface.c (modified) (1 diff)
• uspace/lib/usb/src/driver.c (added)
• uspace/lib/usb/src/hc.c (deleted)
• uspace/lib/usb/src/host.c (added)
• uspace/lib/usb/src/resolve.c (deleted)
• uspace/lib/usbdev/Makefile (modified) (1 diff)
• uspace/lib/usbdev/include/usb/dev/hc.h (added)
• uspace/lib/usbdev/include/usb/dev/hub.h (modified) (2 diffs)
• uspace/lib/usbdev/include/usb/dev/pipes.h (modified) (2 diffs)
• uspace/lib/usbdev/src/hub.c (modified) (1 diff)
• uspace/lib/usbdev/src/pipes.c (modified) (2 diffs)
• uspace/lib/usbdev/src/usbdevice.c (added)

.bzrignore

@@ -7 +7 @@
 *.map
 *.disasm
-*.lo
-*.la
-*.so.*
-*.so0
 _link.ld
 ./*.iso

uspace/Makefile.common

@@ -131 +131 @@
         endif
 endif
-# Build static whenever we use libusb because that library uses 
-# thread local variables
-ifneq ($(findstring usb, $(LIBS)),)
-        STATIC_BUILD = y
-endif
 
 ifeq ($(STATIC_BUILD), y)

uspace/app/lsusb/main.c

@@ -45 +45 @@
 #include <devmap.h>
 #include <usb/dev/hub.h>
-#include <usb/hc.h>
+#include <usb/host.h>
 
 #define NAME "lsusb"

uspace/app/mkbd/main.c

@@ -45 +45 @@
 #include <devmap.h>
 #include <usb/dev/hub.h>
-#include <usb/hc.h>
+#include <usb/host.h>
+#include <usb/driver.h>
 #include <usb/dev/pipes.h>
 
@@ -172 +173 @@
                 /* Try to get its address. */
                 if (!addr_found) {
-                        addr = usb_hc_get_address_by_handle(dev_handle);
+                        addr = usb_device_get_assigned_address(dev_handle);
                         if (addr >= 0) {
                                 addr_found = true;

uspace/app/usbinfo/main.c

@@ -43 +43 @@
 #include <devman.h>
 #include <devmap.h>
-#include <usb/hc.h>
+#include <usb/dev/hc.h>
 #include <usb/dev/pipes.h>
+#include <usb/host.h>
+#include <usb/driver.h>
 #include "usbinfo.h"
+
+static bool try_parse_class_and_address(const char *path,
+    devman_handle_t *out_hc_handle, usb_address_t *out_device_address)
+{
+        size_t class_index;
+        size_t address;
+        int rc;
+        char *ptr;
+
+        rc = str_size_t(path, &ptr, 10, false, &class_index);
+        if (rc != EOK) {
+                return false;
+        }
+        if ((*ptr == ':') || (*ptr == '.')) {
+                ptr++;
+        } else {
+                return false;
+        }
+        rc = str_size_t(ptr, NULL, 10, true, &address);
+        if (rc != EOK) {
+                return false;
+        }
+        rc = usb_ddf_get_hc_handle_by_class(class_index, out_hc_handle);
+        if (rc != EOK) {
+                return false;
+        }
+        if (out_device_address != NULL) {
+                *out_device_address = (usb_address_t) address;
+        }
+        return true;
+}
+
+static bool resolve_hc_handle_and_dev_addr(const char *devpath,
+    devman_handle_t *out_hc_handle, usb_address_t *out_device_address)
+{
+        int rc;
+
+        /* Hack for QEMU to save-up on typing ;-). */
+        if (str_cmp(devpath, "qemu") == 0) {
+                devpath = "/hw/pci0/00:01.2/uhci-rh/usb00_a1";
+        }
+
+        /* Hack for virtual keyboard. */
+        if (str_cmp(devpath, "virt") == 0) {
+                devpath = "/virt/usbhc/usb00_a1/usb00_a2";
+        }
+
+        if (try_parse_class_and_address(devpath,
+            out_hc_handle, out_device_address)) {
+                return true;
+        }
+
+        char *path = str_dup(devpath);
+        if (path == NULL) {
+                return ENOMEM;
+        }
+
+        devman_handle_t hc = 0;
+        bool hc_found = false;
+        usb_address_t addr = 0;
+        bool addr_found = false;
+
+        /* Remove suffixes and hope that we will encounter device node. */
+        while (str_length(path) > 0) {
+                /* Get device handle first. */
+                devman_handle_t dev_handle;
+                rc = devman_device_get_handle(path, &dev_handle, 0);
+                if (rc != EOK) {
+                        free(path);
+                        return false;
+                }
+
+                /* Try to find its host controller. */
+                if (!hc_found) {
+                        rc = usb_hc_find(dev_handle, &hc);
+                        if (rc == EOK) {
+                                hc_found = true;
+                        }
+                }
+                /* Try to get its address. */
+                if (!addr_found) {
+                        addr = usb_device_get_assigned_address(dev_handle);
+                        if (addr >= 0) {
+                                addr_found = true;
+                        }
+                }
+
+                /* Speed-up. */
+                if (hc_found && addr_found) {
+                        break;
+                }
+
+                /* Remove the last suffix. */
+                char *slash_pos = str_rchr(path, '/');
+                if (slash_pos != NULL) {
+                        *slash_pos = 0;
+                }
+        }
+
+        free(path);
+
+        if (hc_found && addr_found) {
+                if (out_hc_handle != NULL) {
+                        *out_hc_handle = hc;
+                }
+                if (out_device_address != NULL) {
+                        *out_device_address = addr;
+                }
+                return true;
+        } else {
+                return false;
+        }
+}
 
 static void print_usage(char *app_name)
@@ -185 +300 @@
                 devman_handle_t hc_handle = 0;
                 usb_address_t dev_addr = 0;
-                int rc = usb_resolve_device_handle(devpath,
-                    &hc_handle, &dev_addr, NULL);
-                if (rc != EOK) {
+                bool found = resolve_hc_handle_and_dev_addr(devpath,
+                    &hc_handle, &dev_addr);
+                if (!found) {
                         fprintf(stderr, NAME ": device `%s' not found "
                             "or not of USB kind, skipping.\n",

uspace/drv/uhci-rhd/port.h

@@ -38 +38 @@
 #include <fibril.h>
 #include <ddf/driver.h>
-#include <usb/hc.h> /* usb_hc_connection_t */
+#include <usb/dev/hc.h> /* usb_hc_connection_t */
 
 typedef uint16_t port_status_t;

uspace/lib/usb/Makefile

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

uspace/lib/usb/src/ddfiface.c

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

uspace/lib/usbdev/Makefile

@@ -46 +46 @@
         src/pipesio.c \
         src/recognise.c \
-        src/request.c
+        src/request.c \
+        src/usbdevice.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usbdev/include/usb/dev/hub.h

@@ -39 +39 @@
 
 #include <sys/types.h>
-#include <usb/hc.h>
+#include <usb/dev/hc.h>
 
 int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
@@ -63 +63 @@
     const usb_hc_attached_device_t *);
 int usb_hc_unregister_device(usb_hc_connection_t *, usb_address_t);
+int usb_hc_get_handle_by_address(usb_hc_connection_t *, usb_address_t,
+    devman_handle_t *);
 
 #endif

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <usb/usb.h>
-#include <usb/hc.h>
+#include <usb/dev/hc.h>
 #include <usb/descriptor.h>
 #include <ipc/devman.h>
@@ -163 +163 @@
 
 int usb_device_get_assigned_interface(ddf_dev_t *);
+usb_address_t usb_device_get_assigned_address(devman_handle_t);
 
 int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *,

uspace/lib/usbdev/src/hub.c

@@ -120 +120 @@
 }
 
+/** Get handle of USB device with given address.
+ *
+ * @param[in] connection Opened connection to host controller.
+ * @param[in] address Address of device in question.
+ * @param[out] handle Where to write the device handle.
+ * @return Error code.
+ */
+int usb_hc_get_handle_by_address(usb_hc_connection_t *connection,
+    usb_address_t address, devman_handle_t *handle)
+{
+        CHECK_CONNECTION(connection);
+
+        sysarg_t tmp;
+        int rc = async_req_2_1(connection->hc_phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_HANDLE_BY_ADDRESS,
+            address, &tmp);
+        if ((rc == EOK) && (handle != NULL)) {
+                *handle = tmp;
+        }
+
+        return rc;
+}
 
 static void unregister_control_endpoint_on_default_address(

uspace/lib/usbdev/src/pipes.c

@@ -36 +36 @@
 #include <usb/dev/pipes.h>
 #include <usb/debug.h>
-#include <usb/hc.h>
+#include <usb/driver.h>
 #include <usbhc_iface.h>
 #include <usb_iface.h>
@@ -97 +97 @@
 
         return (int) iface_no;
+}
+
+/** Tell USB address assigned to given device.
+ *
+ * @param dev_handle Devman handle of the USB device in question.
+ * @return USB address or negative error code.
+ */
+usb_address_t usb_device_get_assigned_address(devman_handle_t dev_handle)
+{
+        int parent_phone = devman_parent_device_connect(dev_handle,
+            IPC_FLAG_BLOCKING);
+        if (parent_phone < 0) {
+                return parent_phone;
+        }
+
+        sysarg_t address;
+
+        int rc = async_req_2_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_ADDRESS,
+            dev_handle, &address);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        async_hangup(parent_phone);
+
+        return (usb_address_t) address;
 }