Changeset cdc1aa1 in mainline for uspace/app

Timestamp:

2010-12-10T09:50:58Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

7964475, bf2063e9

Parents:

040068c (diff), 99ea659c (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 retrieval of configuration descriptor

The merge also includes extension of `usbinfo' app.

Location:

uspace/app/usbinfo

Files:

• dump.c (modified) (3 diffs)
• main.c (modified) (5 diffs)
• usbinfo.h (modified) (1 diff)

uspace/app/usbinfo/dump.c

@@ -47 +47 @@
 
 #define INDENT "  "
+#define BYTES_PER_LINE 12
 
 #define BCD_INT(a) (((unsigned int)(a)) / 256)
@@ -53 +54 @@
 #define BCD_FMT "%x.%x"
 #define BCD_ARGS(a) BCD_INT((a)), BCD_FRAC((a))
+
+void dump_buffer(const char *msg, const uint8_t *buffer, size_t length)
+{
+        printf("%s\n", msg);
+
+        size_t i;
+        for (i = 0; i < length; i++) {
+                printf("  0x%02X", buffer[i]);
+                if (((i > 0) && (((i+1) % BYTES_PER_LINE) == 0))
+                    || (i + 1 == length)) {
+                        printf("\n");
+                }
+        }
+}
 
 void dump_standard_device_descriptor(usb_standard_device_descriptor_t *d)
@@ -75 +90 @@
 }
 
+void dump_standard_configuration_descriptor(
+    int index, usb_standard_configuration_descriptor_t *d)
+{
+        bool self_powered = d->attributes & 64;
+        bool remote_wakeup = d->attributes & 32;
+        
+        printf("Standard configuration descriptor #%d\n", index);
+        printf(INDENT "bLength = %d\n", d->length);
+        printf(INDENT "bDescriptorType = 0x%02x\n", d->descriptor_type);
+        printf(INDENT "wTotalLength = %d\n", d->total_length);
+        printf(INDENT "bNumInterfaces = %d\n", d->interface_count);
+        printf(INDENT "bConfigurationValue = %d\n", d->configuration_number);
+        printf(INDENT "iConfiguration = %d\n", d->str_configuration);
+        printf(INDENT "bmAttributes = %d [%s%s%s]\n", d->attributes,
+            self_powered ? "self-powered" : "",
+            (self_powered & remote_wakeup) ? ", " : "",
+            remote_wakeup ? "remote-wakeup" : "");
+        printf(INDENT "MaxPower = %d (%dmA)\n", d->max_power,
+            2 * d->max_power);
+        // printf(INDENT " = %d\n", d->);
+}
+
+
 /** @}
  */

uspace/app/usbinfo/main.c

@@ -44 +44 @@
 #include "usbinfo.h"
 
+#define DEFAULT_HOST_CONTROLLER_PATH "/virt/usbhc"
+
 static void print_usage(char *app_name)
 {
         printf(NAME ": query USB devices for descriptors\n\n");
         printf("Usage: %s /path/to/hc usb-address\n where\n", app_name);
-        printf("   /path/to/hc   Devman path to USB host controller\n");
+        printf("   /path/to/hc   Devman path to USB host controller " \
+            "(use `-' for\n");
+        printf("                   default HC at `%s').\n",
+            DEFAULT_HOST_CONTROLLER_PATH);
         printf("   usb-address   USB address of device to be queried\n");
         printf("\n");
@@ -68 +73 @@
 }
 
-int main(int argc, char * argv[])
+int main(int argc, char *argv[])
 {
         if (argc != 3) {
@@ -81 +86 @@
          * Connect to given host controller driver.
          */
+        if (str_cmp(hc_path, "-") == 0) {
+                hc_path = (char *) DEFAULT_HOST_CONTROLLER_PATH;
+        }
         int hc_phone = connect_to_hc(hc_path);
         if (hc_phone < 0) {
@@ -107 +115 @@
          */
         usb_standard_device_descriptor_t device_descriptor;
-        usb_dprintf("usbinfo", 1,
+        usb_dprintf(NAME, 1,
             "usb_drv_req_get_device_descriptor(%d, %d, %p)\n",
             hc_phone, (int) address, &device_descriptor);
@@ -121 +129 @@
         dump_standard_device_descriptor(&device_descriptor);
 
+        /*
+         * Get first configuration descriptor and dump it.
+         */
+        usb_standard_configuration_descriptor_t config_descriptor;
+        int config_index = 0;
+        usb_dprintf(NAME, 1,
+            "usb_drv_req_get_bare_configuration_descriptor(%d, %d, %d, %p)\n",
+            hc_phone, (int) address, config_index, &config_descriptor);
+
+        rc = usb_drv_req_get_bare_configuration_descriptor(hc_phone, address,
+            config_index, &config_descriptor );
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to fetch standard configuration descriptor: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+        dump_standard_configuration_descriptor(config_index,
+            &config_descriptor);
+
+        void *full_config_descriptor = malloc(config_descriptor.total_length);
+        usb_dprintf(NAME, 1,
+            "usb_drv_req_get_full_configuration_descriptor(%d, %d, %d, %p, %zu)\n",
+            hc_phone, (int) address, config_index,
+            full_config_descriptor, config_descriptor.total_length);
+
+        rc = usb_drv_req_get_full_configuration_descriptor(hc_phone, address,
+            config_index,
+            full_config_descriptor, config_descriptor.total_length, NULL);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to fetch full configuration descriptor: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+        dump_buffer("Full configuration descriptor:",
+            full_config_descriptor, config_descriptor.total_length);
 
         return EOK;

uspace/app/usbinfo/usbinfo.h

@@ -43 +43 @@
 #define NAME "usbinfo"
 
+void dump_buffer(const char *, const uint8_t *, size_t);
 void dump_standard_device_descriptor(usb_standard_device_descriptor_t *);
+void dump_standard_configuration_descriptor(int, 
+    usb_standard_configuration_descriptor_t *);
 
 #endif