Changes in / [4d20ef7:7205209] in mainline

Files:

• .bzrignore (modified) (1 diff)
• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/lsusb/Makefile (added)
• uspace/app/lsusb/main.c (added)
• uspace/app/usbinfo/main.c (modified) (2 diffs)
• uspace/doc/doxygroups.h (modified) (1 diff)
• uspace/drv/ehci-hcd/main.c (modified) (1 diff)
• uspace/drv/ohci/ohci.c (modified) (1 diff)
• uspace/drv/uhci-hcd/uhci.c (modified) (1 diff)
• uspace/drv/vhc/main.c (modified) (1 diff)
• uspace/lib/c/generic/devman.c (modified) (1 diff)
• uspace/lib/c/include/devman.h (modified) (1 diff)
• uspace/lib/c/include/ipc/devman.h (modified) (1 diff)
• uspace/lib/usb/Makefile (modified) (1 diff)
• uspace/lib/usb/include/usb/host.h (added)
• uspace/lib/usb/include/usb/usb.h (modified) (1 diff)
• uspace/lib/usb/src/host.c (added)
• uspace/srv/devman/main.c (modified) (2 diffs)

.bzrignore

@@ -49 +49 @@
 ./uspace/app/killall/killall
 ./uspace/app/klog/klog
+./uspace/app/lsusb/lsusb
 ./uspace/app/mkfat/mkfat
 ./uspace/app/netstart/netstart

boot/Makefile.common

@@ -128 +128 @@
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/mkfat/mkfat \
+        $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/redir/redir \

uspace/Makefile

@@ -41 +41 @@
         app/killall \
         app/klog \
+        app/lsusb \
         app/mkfat \
         app/redir \

uspace/app/usbinfo/main.c

@@ -45 +45 @@
 #include <usb/usbdevice.h>
 #include <usb/pipes.h>
+#include <usb/host.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,
@@ -60 +92 @@
         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;
         }
 

uspace/doc/doxygroups.h

@@ -220 +220 @@
 
         /**
+         * @defgroup lsusb HelenOS version of lsusb command
+         * @ingroup usb
+         * @brief Application for listing USB host controllers.
+         * @details
+         * List all found host controllers.
+         */
+
+        /**
          * @defgroup drvusbmid USB multi interface device driver
          * @ingroup usb

uspace/drv/ehci-hcd/main.c

@@ -97 +97 @@
         }
         hc_fun->ops = &hc_ops;
+
         ret = ddf_fun_bind(hc_fun);
-
         CHECK_RET_RETURN(ret,
             "Failed to bind EHCI function: %s.\n",
+            str_error(ret));
+        ret = ddf_fun_add_to_class(hc_fun, USB_HC_DDF_CLASS_NAME);
+        CHECK_RET_RETURN(ret,
+            "Failed to add EHCI to HC class: %s.\n",
             str_error(ret));
 

uspace/drv/ohci/ohci.c

@@ -185 +185 @@
             "Failed(%d) to bind OHCI device function: %s.\n",
             ret, str_error(ret));
+        ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME);
+        CHECK_RET_DEST_FUN_RETURN(ret,
+            "Failed to add OHCI to HC class: %s.\n", str_error(ret));
+
 #undef CHECK_RET_HC_RETURN
 

uspace/drv/uhci-hcd/uhci.c

@@ -210 +210 @@
             "Failed(%d) to bind UHCI device function: %s.\n",
             ret, str_error(ret));
+        ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME);
+        CHECK_RET_DEST_FUN_RETURN(ret,
+            "Failed to add UHCI to HC class: %s.\n", str_error(ret));
+
 #undef CHECK_RET_HC_RETURN
 

uspace/drv/vhc/main.c

@@ -104 +104 @@
         }
 
-        ddf_fun_add_to_class(hc, "usbhc");
+        rc = ddf_fun_add_to_class(hc, USB_HC_DDF_CLASS_NAME);
+        if (rc != EOK) {
+                usb_log_fatal("Failed to add function to HC class: %s.\n",
+                    str_error(rc));
+                free(data);
+                return rc;
+        }
 
         virtual_hub_device_init(hc);

uspace/lib/c/generic/devman.c

@@ -374 +374 @@
 }
 
+int devman_get_device_path(devman_handle_t handle, char *path, size_t path_size)
+{
+        int phone = devman_get_phone(DEVMAN_CLIENT, 0);
+
+        if (phone < 0)
+                return phone;
+
+        async_serialize_start();
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(phone, DEVMAN_DEVICE_GET_DEVICE_PATH,
+            handle, &answer);
+
+        ipc_call_t data_request_call;
+        aid_t data_request = async_data_read(phone, path, path_size,
+            &data_request_call);
+        if (data_request == 0) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                return ENOMEM;
+        }
+
+        sysarg_t data_request_rc;
+        sysarg_t opening_request_rc;
+        async_wait_for(data_request, &data_request_rc);
+        async_wait_for(req, &opening_request_rc);
+
+        async_serialize_end();
+
+        if (data_request_rc != EOK) {
+                /* Prefer the return code of the opening request. */
+                if (opening_request_rc != EOK) {
+                        return (int) opening_request_rc;
+                } else {
+                        return (int) data_request_rc;
+                }
+        }
+        if (opening_request_rc != EOK) {
+                return (int) opening_request_rc;
+        }
+
+        path[path_size - 1] = 0;
+
+        if (IPC_GET_ARG2(data_request_call) >= path_size) {
+                return ELIMIT;
+        }
+
+        return EOK;
+}
+
 
 /** @}

uspace/lib/c/include/devman.h

@@ -55 +55 @@
 extern int devman_device_get_handle_by_class(const char *, const char *,
     devman_handle_t *, unsigned int);
+extern int devman_get_device_path(devman_handle_t, char *, size_t);
 
 extern int devman_add_device_to_class(devman_handle_t, const char *);

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

@@ -149 +149 @@
 typedef enum {
         DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
-        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS
+        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
+        DEVMAN_DEVICE_GET_DEVICE_PATH
 } client_to_devman_t;
 

uspace/lib/usb/Makefile

@@ -46 +46 @@
         src/hidparser.c \
         src/hiddescriptor.c \
+        src/host.c \
         src/hub.c \
         src/pipepriv.c \

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

@@ -172 +172 @@
 } usb_packet_id;
 
+/** Class name for USB host controllers. */
+#define USB_HC_DDF_CLASS_NAME "usbhc"
+
 #endif
 /**

uspace/srv/devman/main.c

@@ -515 +515 @@
 }
 
+/** Find device path by its handle. */
+static void devman_get_device_path_by_handle(ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        devman_handle_t handle = IPC_GET_ARG1(*icall);
+
+        fun_node_t *fun = find_fun_node(&device_tree, handle);
+        if (fun == NULL) {
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        ipc_callid_t data_callid;
+        size_t data_len;
+        if (!async_data_read_receive(&data_callid, &data_len)) {
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+
+        void *buffer = malloc(data_len);
+        if (buffer == NULL) {
+                async_answer_0(data_callid, ENOMEM);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        size_t sent_length = str_size(fun->pathname);
+        if (sent_length > data_len) {
+                sent_length = data_len;
+        }
+
+        async_data_read_finalize(data_callid, fun->pathname, sent_length);
+        async_answer_0(iid, EOK);
+
+        free(buffer);
+}
+
 
 /** Function for handling connections from a client to the device manager. */
@@ -536 +573 @@
                 case DEVMAN_DEVICE_GET_HANDLE_BY_CLASS:
                         devman_function_get_handle_by_class(callid, &call);
+                        break;
+                case DEVMAN_DEVICE_GET_DEVICE_PATH:
+                        devman_get_device_path_by_handle(callid, &call);
                         break;
                 default: