Changeset faf498d in mainline

Timestamp:

2011-05-07T14:57:13Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

79784ef8, b23e9cc

Parents:

6985b4e

Message:

Nicer messages in usbinfo

Location:

uspace/app/usbinfo

Files:

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

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/main.c

@@ -308 +308 @@
                 }
 
-                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 *);