Changeset 3819ce5 in mainline for uspace/app

Timestamp:

2011-12-25T10:05:28Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ecf823a

Parents:

1440eae (diff), 7e1b130 (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 with mainline

Location:

uspace/app

Files:

• mkbd/main.c (modified) (1 diff)
• usbinfo/dev.c (modified) (2 diffs)
• usbinfo/info.c (modified) (2 diffs)
• usbinfo/main.c (modified) (1 diff)
• usbinfo/usbinfo.h (modified) (1 diff)

uspace/app/mkbd/main.c

@@ -48 +48 @@
 #include <usb/dev/pipes.h>
 #include <async.h>
+#include <usb/dev.h>
 #include <usb/hid/usages/core.h>
 #include <usb/hid/hidparser.h>

uspace/app/usbinfo/dev.c

@@ -34 +34 @@
  * Representation of queried device.
  */
-#include <usb/dev/pipes.h>
+#include <usb/dev.h>
+#include <usb/hc.h>
 #include <errno.h>
 #include <str_error.h>
@@ -52 +53 @@
         bool transfer_started = false;
 
-        rc = usb_device_connection_initialize(&dev->wire, hc_handle, dev_addr);
+        usb_hc_connection_initialize(&dev->hc_conn, hc_handle);
+
+        rc = usb_device_connection_initialize(
+            &dev->wire, &dev->hc_conn, dev_addr);
         if (rc != EOK) {
                 fprintf(stderr,

uspace/app/usbinfo/info.c

@@ -287 +287 @@
 void dump_strings(usbinfo_device_t *dev)
 {
+        /* Find used indexes. Devices with more than 64 strings are very rare.*/
+        uint64_t str_mask = 0;
+        find_string_indexes_callback((uint8_t *)&dev->device_descriptor, 0,
+            &str_mask);
+        usb_dp_walk_simple(dev->full_configuration_descriptor,
+            dev->full_configuration_descriptor_size,
+            usb_dp_standard_descriptor_nesting,
+            find_string_indexes_callback,
+            &str_mask);
+
+        if (str_mask == 0) {
+                printf("Device does not support string descriptors.\n");
+                return;
+        }
+
         /* Get supported languages. */
         l18_win_locales_t *langs;
@@ -305 +320 @@
         }
         printf(".\n");
-
-        /* Find used indexes. Device with more than 64 strings are very rare.
-         */
-        uint64_t str_mask = 0;
-        find_string_indexes_callback((uint8_t *)&dev->device_descriptor, 0,
-            &str_mask);
-        usb_dp_walk_simple(dev->full_configuration_descriptor,
-            dev->full_configuration_descriptor_size,
-            usb_dp_standard_descriptor_nesting,
-            find_string_indexes_callback,
-            &str_mask);
 
         /* Get all strings and dump them. */

uspace/app/usbinfo/main.c

@@ -44 +44 @@
 #include <loc.h>
 #include <usb/hc.h>
+#include <usb/dev.h>
 #include <usb/dev/pipes.h>
 #include "usbinfo.h"

uspace/app/usbinfo/usbinfo.h

@@ -44 +44 @@
 
 typedef struct {
+        usb_hc_connection_t hc_conn;
+        usb_device_connection_t wire;
         usb_pipe_t ctrl_pipe;
-        usb_device_connection_t wire;
         usb_standard_device_descriptor_t device_descriptor;
         uint8_t *full_configuration_descriptor;