Changeset 3100ebe in mainline

Timestamp:

2011-03-16T10:14:57Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

81ca204

Parents:

2180979

Message:

Preparation for more modular usbinfo

Location:

uspace/app/usbinfo

Files:

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

uspace/app/usbinfo/Makefile

@@ -34 +34 @@
 
 SOURCES = \
+        dev.c \
         dump.c \
         info.c \

uspace/app/usbinfo/dump.c

@@ -101 +101 @@
 }
 
-void dump_match_ids(match_id_list_t *matches)
+void dump_match_ids(match_id_list_t *matches, const char *line_prefix)
 {
-        printf("Match ids:\n");
         link_t *link;
         for (link = matches->ids.next;
@@ -110 +109 @@
                 match_id_t *match = list_get_instance(link, match_id_t, link);
 
-                printf(INDENT "%d %s\n", match->score, match->id);
+                printf("%s%d %s\n", line_prefix, match->score, match->id);
         }
 }

uspace/app/usbinfo/info.c

@@ -42 +42 @@
 #include "usbinfo.h"
 
+void dump_short_device_identification(usbinfo_device_t *dev)
+{
+        printf("%sDevice 0x%04x by vendor 0x%04x\n", get_indent(0),
+            (int) dev->device_descriptor.product_id,
+            (int) dev->device_descriptor.vendor_id);
+}
+
+void dump_device_match_ids(usbinfo_device_t *dev)
+{
+        match_id_list_t matches;
+        init_match_ids(&matches);
+        usb_device_create_match_ids_from_device_descriptor(
+            &dev->device_descriptor, &matches);
+        dump_match_ids(&matches, get_indent(0));
+}
+
 int dump_device(devman_handle_t hc_handle, usb_address_t address)
 {
@@ -92 +108 @@
                 goto leave;
         }
-        dump_match_ids(&match_id_list);
+        dump_match_ids(&match_id_list, get_indent(0));
 
         /*

uspace/app/usbinfo/main.c

@@ -164 +164 @@
                 }
 
-                printf("Device `%s':\n------------\n", devpath);
-                dump_device(hc_handle, dev_addr);
+                usbinfo_device_t *dev = prepare_device(hc_handle, dev_addr);
+                if (dev == NULL) {
+                        continue;
+                }
+
+                /* Run actions the user specified. */
+                /* TODO */
+
+
+                printf("%s\n", devpath);
+                dump_short_device_identification(dev);
+                dump_device_match_ids(dev);
+
+                /* Destroy the control pipe (close the session etc.). */
+                destroy_device(dev);
         }
 

uspace/app/usbinfo/usbinfo.h

@@ -38 +38 @@
 #include <usb/usb.h>
 #include <usb/descriptor.h>
+#include <usb/pipes.h>
 #include <usb/debug.h>
 #include <ipc/devman.h>
 
+typedef struct {
+        usb_endpoint_pipe_t ctrl_pipe;
+        usb_device_connection_t wire;
+        usb_standard_device_descriptor_t device_descriptor;
+} usbinfo_device_t;
 
 #define NAME "usbinfo"
@@ -46 +52 @@
 void dump_buffer(const char *, size_t, const uint8_t *, size_t);
 const char *get_indent(size_t);
-void dump_match_ids(match_id_list_t *matches);
+void dump_match_ids(match_id_list_t *, const char *);
 void dump_usb_descriptor(uint8_t *, size_t);
 int dump_device(devman_handle_t, usb_address_t);
@@ -56 +62 @@
 }
 
+usbinfo_device_t *prepare_device(devman_handle_t, usb_address_t);
+void destroy_device(usbinfo_device_t *);
+
+
+void dump_short_device_identification(usbinfo_device_t *);
+void dump_device_match_ids(usbinfo_device_t *);
+
 #endif
 /**