Changeset 9e195e2c in mainline for uspace/app/usbinfo/main.c

Timestamp:

2011-05-12T09:03:00Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d59d0bb

Parents:

456aea3 (diff), c372e03 (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:

Merge from development

File:

• uspace/app/usbinfo/main.c (modified) (3 diffs)

uspace/app/usbinfo/main.c

@@ -45 +45 @@
 #include <usb/usbdevice.h>
 #include <usb/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,
@@ -60 +93 @@
         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;
         }
 
@@ -271 +309 @@
                 }
 
-                usbinfo_device_t *dev = prepare_device(hc_handle, dev_addr);
+                usbinfo_device_t *dev = prepare_device(devpath,
+                    hc_handle, dev_addr);
                 if (dev == NULL) {
                         continue;