Changeset 92574f4 in mainline for uspace/app/usbinfo/info.c

Timestamp:

2011-02-24T12:03:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

uspace/app/usbinfo/info.c

@@ -37 +37 @@
 #include <str_error.h>
 #include <errno.h>
-#include <usb/usbdrv.h>
 #include <usb/pipes.h>
+#include <usb/recognise.h>
 #include <usb/request.h>
 #include "usbinfo.h"
@@ -47 +47 @@
         usb_device_connection_t wire;
         usb_endpoint_pipe_t ctrl_pipe;
-        ctrl_pipe.hc_phone = -1;
-
-        int hc_phone = devman_device_connect(hc_handle, 0);
-        if (hc_phone < 0) {
-                fprintf(stderr,
-                    NAME ": failed to connect to host controller (%zu): %s.\n",
-                        (size_t) hc_handle, str_error(hc_phone));
-                return hc_phone;
+
+        /*
+         * Initialize pipes.
+         */
+        rc = usb_device_connection_initialize(&wire, hc_handle, address);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to create connection to the device: %s.\n",
+                    str_error(rc));
+                goto leave;
+        }
+        rc = usb_endpoint_pipe_initialize_default_control(&ctrl_pipe, &wire);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to create default control pipe: %s.\n",
+                    str_error(rc));
+                goto leave;
+        }
+        rc = usb_endpoint_pipe_start_session(&ctrl_pipe);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to start session on control pipe: %s.\n",
+                    str_error(rc));
+                goto leave;
         }
 
@@ -62 +78 @@
         match_id_list_t match_id_list;
         init_match_ids(&match_id_list);
-        rc = usb_drv_create_device_match_ids(hc_phone, &match_id_list, address);
+        rc = usb_device_create_match_ids(&ctrl_pipe, &match_id_list);
         if (rc != EOK) {
                 fprintf(stderr,
@@ -70 +86 @@
         }
         dump_match_ids(&match_id_list);
-
-        /*
-         * Initialize pipes.
-         */
-        rc = usb_device_connection_initialize(&wire, hc_handle, address);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to create connection to the device: %s.\n",
-                    str_error(rc));
-                goto leave;
-        }
-        rc = usb_endpoint_pipe_initialize_default_control(&ctrl_pipe, &wire);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to create default control pipe: %s.\n",
-                    str_error(rc));
-                goto leave;
-        }
-        rc = usb_endpoint_pipe_start_session(&ctrl_pipe);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to start session on control pipe: %s.\n",
-                    str_error(rc));
-                goto leave;
-        }
 
         /*
@@ -138 +129 @@
             config_descriptor.total_length);
 
+        /*
+         * Get supported languages of STRING descriptors.
+         */
+        l18_win_locales_t *langs;
+        size_t langs_count;
+        rc = usb_request_get_supported_languages(&ctrl_pipe,
+            &langs, &langs_count);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to get list of supported languages: %s.\n",
+                    str_error(rc));
+                goto skip_strings;
+        }
+
+        printf("String languages (%zu):", langs_count);
+        size_t i;
+        for (i = 0; i < langs_count; i++) {
+                printf(" 0x%04x", (int) langs[i]);
+        }
+        printf(".\n");
+
+        /*
+         * Dump all strings in all available langages;
+         */
+        for (i = 0; i < langs_count; i++) {
+                l18_win_locales_t lang = langs[i];
+
+                printf("%sStrings for language 0x%04x:\n", get_indent(0),
+                    (int) lang);
+
+                /*
+                 * Try all indexes - we will see what pops-up ;-).
+                 * However, to speed things up, we will stop after
+                 * encountering several broken (or nonexistent ones)
+                 * descriptors in line.
+                 */
+                size_t idx;
+                size_t failed_count = 0;
+                for (idx = 1; idx < 0xFF; idx++) {
+                        char *string;
+                        rc = usb_request_get_string(&ctrl_pipe, idx, lang,
+                            &string);
+                        if (rc != EOK) {
+                                failed_count++;
+                                if (failed_count > 3) {
+                                        break;
+                                }
+                                continue;
+                        }
+                        printf("%sString #%zu: \"%s\"\n", get_indent(1),
+                            idx, string);
+                        free(string);
+                        failed_count = 0; /* Reset failed counter. */
+                }
+        }
+
+
+skip_strings:
+
         rc = EOK;
+
 leave:
         /* Ignoring errors here. */
-        ipc_hangup(hc_phone);
         usb_endpoint_pipe_end_session(&ctrl_pipe);