Changeset 4a7a8d4 in mainline for uspace/app

Timestamp:

2011-05-13T10:31:54Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

aca3489

Parents:

05e21ffc (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 with usb/development

Location:

uspace/app

Files:

• lsusb/Makefile (modified) (1 diff)
• lsusb/main.c (modified) (2 diffs)
• tester/Makefile (modified) (1 diff)
• tester/adt/usbaddrkeep.def (deleted)
• tester/tester.c (modified) (1 diff)
• tester/tester.h (modified) (1 diff)
• usbinfo/Makefile (modified) (1 diff)
• usbinfo/dev.c (modified) (6 diffs)
• usbinfo/info.c (modified) (1 diff)
• usbinfo/main.c (modified) (2 diffs)
• usbinfo/usbinfo.h (modified) (1 diff)
• vuhid/Makefile (modified) (1 diff)

uspace/app/lsusb/Makefile

@@ -30 +30 @@
 BINARY = lsusb
 
-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/lsusb/main.c

@@ -44 +44 @@
 #include <devman.h>
 #include <devmap.h>
+#include <usb/hub.h>
 #include <usb/host.h>
 
 #define NAME "lsusb"
 
-#define MAX_FAILED_ATTEMPTS 4
+#define MAX_FAILED_ATTEMPTS 10
 #define MAX_PATH_LENGTH 1024
+
+static void print_found_hc(size_t class_index, const char *path)
+{
+        // printf(NAME ": host controller %zu is `%s'.\n", class_index, path);
+        printf("Bus %02zu: %s\n", class_index, path);
+}
+static void print_found_dev(usb_address_t addr, const char *path)
+{
+        // printf(NAME ":     device with address %d is `%s'.\n", addr, path);
+        printf("  Device %02d: %s\n", addr, path);
+}
+
+static void print_hc_devices(devman_handle_t hc_handle)
+{
+        int rc;
+        usb_hc_connection_t conn;
+
+        usb_hc_connection_initialize(&conn, hc_handle);
+        rc = usb_hc_connection_open(&conn);
+        if (rc != EOK) {
+                printf(NAME ": failed to connect to HC: %s.\n",
+                    str_error(rc));
+                return;
+        }
+        usb_address_t addr;
+        for (addr = 1; addr < 5; addr++) {
+                devman_handle_t dev_handle;
+                rc = usb_hc_get_handle_by_address(&conn, addr, &dev_handle);
+                if (rc != EOK) {
+                        continue;
+                }
+                char path[MAX_PATH_LENGTH];
+                rc = devman_get_device_path(dev_handle, path, MAX_PATH_LENGTH);
+                if (rc != EOK) {
+                        continue;
+                }
+                print_found_dev(addr, path);
+        }
+        usb_hc_connection_close(&conn);
+}
 
 int main(int argc, char *argv[])
@@ -69 +110 @@
                         continue;
                 }
-                printf(NAME ": host controller %zu is `%s'.\n",
-                    class_index, path);
+                print_found_hc(class_index, path);
+                print_hc_devices(hc_handle);
         }
 

uspace/app/tester/Makefile

@@ -31 +31 @@
 BINARY = tester
 
-LIBS += $(LIBUSB_PREFIX)/libusb.a
-EXTRA_CFLAGS += -I$(LIBUSB_PREFIX)/include
-
 SOURCES = \
         tester.c \
-        adt/usbaddrkeep.c \
         thread/thread1.c \
         print/print1.c \

uspace/app/tester/tester.c

@@ -64 +64 @@
 #include "mm/mapping1.def"
 #include "hw/serial/serial1.def"
-#include "adt/usbaddrkeep.def"
 #include "hw/misc/virtchar1.def"
 #include "devs/devman1.def"

uspace/app/tester/tester.h

@@ -80 +80 @@
 extern const char *test_mapping1(void);
 extern const char *test_serial1(void);
-extern const char *test_usbaddrkeep(void);
 extern const char *test_virtchar1(void);
 extern const char *test_devman1(void);

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

@@ -46 +46 @@
 #include <usb/pipes.h>
 #include <usb/host.h>
+#include <usb/driver.h>
 #include "usbinfo.h"
 
@@ -308 +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 *);
 

uspace/app/vuhid/Makefile

@@ -34 +34 @@
 LIBS = \
         $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
+        $(LIBUSBHID_PREFIX)/libusbhid.a \
+        $(LIBUSBDEV_PREFIX)/libusbdev.a \
         $(LIBUSB_PREFIX)/libusb.a
 EXTRA_CFLAGS = \
         -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
+        -I$(LIBUSBHID_PREFIX)/include \
         -I$(LIBUSBVIRT_PREFIX)/include \
         -I$(LIBDRV_PREFIX)/include