Changeset 2d6787b in mainline

Timestamp:

2011-03-17T23:17:42Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a458bc9

Parents:

aad3587

Message:

Old code removal from usbinfo

Location:

uspace/app/usbinfo

Files:

• info.c (modified) (1 diff)
• usbinfo.h (modified) (1 diff)

uspace/app/usbinfo/info.c

@@ -246 +246 @@
 }
 
-int dump_device(devman_handle_t hc_handle, usb_address_t address)
-{
-        int rc;
-        usb_device_connection_t wire;
-        usb_endpoint_pipe_t ctrl_pipe;
-
-        /*
-         * 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_probe_default_control(&ctrl_pipe);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": probing default control pipe failed: %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;
-        }
-
-        /*
-         * Dump information about possible match ids.
-         */
-        match_id_list_t match_id_list;
-        init_match_ids(&match_id_list);
-        rc = usb_device_create_match_ids(&ctrl_pipe, &match_id_list);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to fetch match ids of the device: %s.\n",
-                    str_error(rc));
-                goto leave;
-        }
-        dump_match_ids(&match_id_list, get_indent(0));
-
-        /*
-         * Get device descriptor and dump it.
-         */
-        usb_standard_device_descriptor_t device_descriptor;
-        rc = usb_request_get_device_descriptor(&ctrl_pipe, &device_descriptor);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to fetch standard device descriptor: %s.\n",
-                    str_error(rc));
-                goto leave;
-        }
-        dump_usb_descriptor((uint8_t *)&device_descriptor, sizeof(device_descriptor));
-
-        rc = EOK;
-        goto leave;
-
-        /*
-         * Get first configuration descriptor and dump it.
-         */
-        usb_standard_configuration_descriptor_t config_descriptor;
-        int config_index = 0;
-        rc = usb_request_get_bare_configuration_descriptor(&ctrl_pipe,
-            config_index, &config_descriptor);
-        if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to fetch standard configuration descriptor: %s.\n",
-                    str_error(rc));
-                goto leave;
-        }
-        //dump_standard_configuration_descriptor(config_index, &config_descriptor);
-
-        void *full_config_descriptor = malloc(config_descriptor.total_length);
-        rc = usb_request_get_full_configuration_descriptor(&ctrl_pipe,
-            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));
-                goto leave;
-        }
-
-        dump_descriptor_tree(full_config_descriptor,
-            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. */
-        usb_endpoint_pipe_end_session(&ctrl_pipe);
-
-        return rc;
-}
-
 /** @}
  */

uspace/app/usbinfo/usbinfo.h

@@ -57 +57 @@
 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);
 void dump_descriptor_tree(uint8_t *, size_t);