Changeset cdc1aa1 in mainline for uspace/app/usbinfo/main.c

Timestamp:

2010-12-10T09:50:58Z (13 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.

File:

• uspace/app/usbinfo/main.c (modified) (5 diffs)

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;