Changeset a81a1d09 in mainline for uspace/app/usbinfo

Timestamp:

2011-05-11T16:49:28Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

Location:

uspace/app/usbinfo

Files:

• Makefile (modified) (1 diff)
• dev.c (modified) (6 diffs)
• info.c (modified) (1 diff)
• main.c (modified) (3 diffs)
• usbinfo.h (modified) (1 diff)

uspace/app/usbinfo/Makefile

@@ -30 +30 @@
 BINARY = usbinfo
 
-LIBS = $(LIBUSB_PREFIX)/libusb.a $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIBDRV_PREFIX)/include
+LIBS = \
+        $(LIBUSBDEV_PREFIX)/libusbdev.a \
+        $(LIBUSB_PREFIX)/libusb.a \
+        $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS = \
+        -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
+        -I$(LIBDRV_PREFIX)/include
 
 SOURCES = \

uspace/app/usbinfo/dev.c

@@ -40 +40 @@
 #include "usbinfo.h"
 
-usbinfo_device_t *prepare_device(devman_handle_t hc_handle,
-    usb_address_t dev_addr)
+usbinfo_device_t *prepare_device(const char *name,
+    devman_handle_t hc_handle, usb_address_t dev_addr)
 {
         usbinfo_device_t *dev = malloc(sizeof(usbinfo_device_t));
@@ -55 +55 @@
         if (rc != EOK) {
                 fprintf(stderr,
-                    NAME ": failed to create connection to the device: %s.\n",
-                    str_error(rc));
+                    NAME ": failed to create connection to device %s: %s.\n",
+                    name, str_error(rc));
                 goto leave;
         }
@@ -64 +64 @@
         if (rc != EOK) {
                 fprintf(stderr,
-                    NAME ": failed to create default control pipe: %s.\n",
-                    str_error(rc));
+                    NAME ": failed to create default control pipe to %s: %s.\n",
+                    name, str_error(rc));
                 goto leave;
         }
@@ -71 +71 @@
         rc = usb_pipe_probe_default_control(&dev->ctrl_pipe);
         if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": probing default control pipe failed: %s.\n",
-                    str_error(rc));
+                if (rc == ENOENT) {
+                        fprintf(stderr, NAME ": " \
+                            "device %s not present or malfunctioning.\n",
+                            name);
+                } else {
+                        fprintf(stderr, NAME ": " \
+                            "probing default control pipe of %s failed: %s.\n",
+                            name, str_error(rc));
+                }
                 goto leave;
         }
@@ -84 +90 @@
         if (rc != EOK) {
                 fprintf(stderr,
-                    NAME ": failed to retrieve device descriptor: %s.\n",
-                    str_error(rc));
+                    NAME ": failed to retrieve device descriptor of %s: %s.\n",
+                    name, str_error(rc));
                 goto leave;
         }
@@ -93 +99 @@
             &dev->full_configuration_descriptor_size);
         if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to retrieve configuration descriptor: %s.\n",
-                    str_error(rc));
+                fprintf(stderr, NAME ": " \
+                    "failed to retrieve configuration descriptor of %s: %s.\n",
+                    name, str_error(rc));
                 goto leave;
         }

uspace/app/usbinfo/info.c

@@ -41 +41 @@
 #include <usb/request.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hid.h>
 #include <usb/classes/hub.h>
 #include "usbinfo.h"

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;

uspace/app/usbinfo/usbinfo.h

@@ -71 +71 @@
 }
 
-usbinfo_device_t *prepare_device(devman_handle_t, usb_address_t);
+usbinfo_device_t *prepare_device(const char *, devman_handle_t, usb_address_t);
 void destroy_device(usbinfo_device_t *);