Changeset 41ef5b9 in mainline for uspace/app

Timestamp:

2011-03-21T17:16:10Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d0c40b

Parents:

fd9f6e4c (diff), 434ef65 (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 usb/development

Location:

uspace/app

Files:

• bdsh/cmds/modules/bdd/bdd.c (modified) (4 diffs)
• usbinfo/dev.c (modified) (5 diffs)
• usbinfo/info.c (modified) (8 diffs)
• usbinfo/main.c (modified) (3 diffs)
• usbinfo/usbinfo.h (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/bdd/bdd.c

@@ -70 +70 @@
         unsigned int i, j;
         devmap_handle_t handle;
+        aoff64_t offset;
         uint8_t *blk;
         size_t size, bytes, rows;
@@ -120 +121 @@
         }
 
+        offset = ba * block_size;
+
         while (size > 0) {
                 rc = block_read_direct(handle, ba, 1, blk);
@@ -133 +136 @@
 
                 for (j = 0; j < rows; j++) {
+                        printf("[%06" PRIxOFF64 "] ", offset);
                         for (i = 0; i < BPR; i++) {
                                 if (j * BPR + i < bytes)
@@ -152 +156 @@
                                 }
                         }
+                        offset += BPR;
                         putchar('\n');
                 }

uspace/app/usbinfo/dev.c

@@ -59 +59 @@
         }
 
-        rc = usb_endpoint_pipe_initialize_default_control(&dev->ctrl_pipe,
+        rc = usb_pipe_initialize_default_control(&dev->ctrl_pipe,
             &dev->wire);
         if (rc != EOK) {
@@ -68 +68 @@
         }
 
-        rc = usb_endpoint_pipe_probe_default_control(&dev->ctrl_pipe);
+        rc = usb_pipe_probe_default_control(&dev->ctrl_pipe);
         if (rc != EOK) {
                 fprintf(stderr,
@@ -76 +76 @@
         }
 
-        rc = usb_endpoint_pipe_start_session(&dev->ctrl_pipe);
+        rc = usb_pipe_start_session(&dev->ctrl_pipe);
         if (rc != EOK) {
                 fprintf(stderr,
@@ -107 +107 @@
 
 leave:
-        if (usb_endpoint_pipe_is_session_started(&dev->ctrl_pipe)) {
-                usb_endpoint_pipe_end_session(&dev->ctrl_pipe);
+        if (usb_pipe_is_session_started(&dev->ctrl_pipe)) {
+                usb_pipe_end_session(&dev->ctrl_pipe);
         }
 
@@ -118 +118 @@
 void destroy_device(usbinfo_device_t *dev)
 {
-        usb_endpoint_pipe_end_session(&dev->ctrl_pipe);
+        usb_pipe_end_session(&dev->ctrl_pipe);
         free(dev);
 }

uspace/app/usbinfo/info.c

@@ -42 +42 @@
 #include <usb/classes/classes.h>
 #include <usb/classes/hid.h>
+#include <usb/classes/hub.h>
 #include "usbinfo.h"
 
@@ -109 +110 @@
     usb_standard_device_descriptor_t *descriptor)
 {
-        printf("%sDevice (0x%04x by 0x%04x, %s)\n", prefix,
+        printf("%sDevice (0x%04x by 0x%04x, %s, %zu configurations)\n", prefix,
             (int) descriptor->product_id,
             (int) descriptor->vendor_id,
-            usb_str_class(descriptor->device_class));
+            usb_str_class(descriptor->device_class),
+            (size_t) descriptor->configuration_count);
 }
 
@@ -118 +120 @@
     usb_standard_configuration_descriptor_t *descriptor)
 {
-        printf("%sConfiguration #%d\n", prefix,
-            (int) descriptor->configuration_number);
+        printf("%sConfiguration #%d (%zu interfaces, total %zuB)\n", prefix,
+            (int) descriptor->configuration_number,
+            (size_t) descriptor->interface_count,
+            (size_t) descriptor->total_length);
 }
 
@@ -125 +129 @@
     usb_standard_interface_descriptor_t *descriptor)
 {
-        printf("%sInterface #%d (%s, 0x%02x, 0x%02x)\n", prefix,
+        printf("%sInterface #%d (%s, 0x%02x, 0x%02x), alternate %d\n", prefix,
             (int) descriptor->interface_number,
             usb_str_class(descriptor->interface_class),
             (int) descriptor->interface_subclass,
-            (int) descriptor->interface_protocol);
+            (int) descriptor->interface_protocol,
+            (int) descriptor->alternate_setting);
 }
 
@@ -153 +158 @@
 }
 
-
-static void dump_descriptor_tree_brief_callback(uint8_t *descriptor,
+static void dump_descriptor_tree_brief_hub(const char *prefix,
+    usb_hub_descriptor_header_t *descriptor)
+{
+        printf("%shub (%d ports)\n", prefix,
+            (int) descriptor->port_count);
+}
+
+
+static void dump_descriptor_tree_callback(uint8_t *descriptor,
     size_t depth, void *arg)
 {
@@ -171 +183 @@
                 if (descr_size >= sizeof(descriptor_type)) { \
                         callback(indent, (descriptor_type *) descriptor); \
+                        if (arg != NULL) { \
+                                usb_dump_standard_descriptor(stdout, \
+                                    get_indent(depth +2), "\n", \
+                                    descriptor, descr_size); \
+                        } \
                 } else { \
                         descr_type = -1; \
@@ -191 +208 @@
                     usb_standard_hid_descriptor_t,
                     dump_descriptor_tree_brief_hid);
+                /*
+                 * Probably useless, hub descriptor shall not be part of
+                 * configuration descriptor.
+                 */
+                _BRANCH(USB_DESCTYPE_HUB,
+                    usb_hub_descriptor_header_t,
+                    dump_descriptor_tree_brief_hub);
 
                 default:
@@ -203 +227 @@
 void dump_descriptor_tree_brief(usbinfo_device_t *dev)
 {
-        dump_descriptor_tree_brief_callback((uint8_t *)&dev->device_descriptor,
+        dump_descriptor_tree_callback((uint8_t *)&dev->device_descriptor,
             (size_t) -1, NULL);
         usb_dp_walk_simple(dev->full_configuration_descriptor,
             dev->full_configuration_descriptor_size,
             usb_dp_standard_descriptor_nesting,
-            dump_descriptor_tree_brief_callback,
+            dump_descriptor_tree_callback,
             NULL);
 }
+
+void dump_descriptor_tree_full(usbinfo_device_t *dev)
+{
+        dump_descriptor_tree_callback((uint8_t *)&dev->device_descriptor,
+            (size_t) -1, dev);
+        usb_dp_walk_simple(dev->full_configuration_descriptor,
+            dev->full_configuration_descriptor_size,
+            usb_dp_standard_descriptor_nesting,
+            dump_descriptor_tree_callback,
+            dev);
+}
+
 
 void dump_strings(usbinfo_device_t *dev)

uspace/app/usbinfo/main.c

@@ -134 +134 @@
         _OPTION("-m --match-ids", "Print match ids generated for the device.");
         _OPTION("-t --descriptor-tree", "Print descriptor tree.");
+        _OPTION("-T --descriptor-tree-full", "Print detailed descriptor tree");
         _OPTION("-s --strings", "Try to print all string descriptors.");
 
@@ -149 +150 @@
         {"match-ids", no_argument, NULL, 'm'},
         {"descriptor-tree", no_argument, NULL, 't'},
+        {"descriptor-tree-full", no_argument, NULL, 'T'},
         {"strings", no_argument, NULL, 's'},
         {0, 0, NULL, 0}
 };
-static const char *short_options = "himts";
+static const char *short_options = "himtTs";
 
 static usbinfo_action_t actions[] = {
@@ -168 +170 @@
                 .opt = 't',
                 .action = dump_descriptor_tree_brief,
+                .active = false
+        },
+        {
+                .opt = 'T',
+                .action = dump_descriptor_tree_full,
                 .active = false
         },

uspace/app/usbinfo/usbinfo.h

@@ -44 +44 @@
 
 typedef struct {
-        usb_endpoint_pipe_t ctrl_pipe;
+        usb_pipe_t ctrl_pipe;
         usb_device_connection_t wire;
         usb_standard_device_descriptor_t device_descriptor;
@@ -82 +82 @@
 void dump_device_match_ids(usbinfo_device_t *);
 void dump_descriptor_tree_brief(usbinfo_device_t *);
+void dump_descriptor_tree_full(usbinfo_device_t *);
 void dump_strings(usbinfo_device_t *);