Changeset 00c18bc in mainline

Timestamp:

2011-03-20T23:39:40Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f0fdc7d

Parents:

33577f81 (diff), 2211125e (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:

Add USB fallback driver

The purpose of it is to see all USB devices in the system.

Files:

• .bzrignore (modified) (1 diff)
• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/app/usbinfo/info.c (modified) (3 diffs)
• uspace/doc/doxygroups.h (modified) (1 diff)
• uspace/drv/usbflbk/Makefile (added)
• uspace/drv/usbflbk/main.c (added)
• uspace/drv/usbflbk/usbflbk.ma (added)
• uspace/lib/usb/src/recognise.c (modified) (2 diffs)

.bzrignore

@@ -88 +88 @@
 ./uspace/drv/uhci-hcd/uhci-hcd
 ./uspace/drv/uhci-rhd/uhci-rhd
+./uspace/drv/usbflbk/usbflbk
 ./uspace/drv/usbhub/usbhub
 ./uspace/drv/usbhid/usbhid

boot/arch/amd64/Makefile.inc

@@ -47 +47 @@
         uhci-hcd \
         uhci-rhd \
+        usbflbk \
         usbhub \
         usbhid \

uspace/Makefile

@@ -121 +121 @@
                 drv/uhci-hcd \
                 drv/uhci-rhd \
+                drv/usbflbk \
                 drv/usbhid \
                 drv/usbhub \
@@ -140 +141 @@
                 drv/uhci-hcd \
                 drv/uhci-rhd \
+                drv/usbflbk \
                 drv/usbhid \
                 drv/usbhub \

uspace/app/usbinfo/info.c

@@ -109 +109 @@
     usb_standard_device_descriptor_t *descriptor)
 {
-        printf("%sDevice (0x%04x by 0x%04x, %s)\n", prefix,
+        printf("%sDevice (0x%04x by 0x%04x, %s, %zu configurations)\n", prefix,
             (int) descriptor->product_id,
             (int) descriptor->vendor_id,
-            usb_str_class(descriptor->device_class));
+            usb_str_class(descriptor->device_class),
+            (size_t) descriptor->configuration_count);
 }
 
@@ -118 +119 @@
     usb_standard_configuration_descriptor_t *descriptor)
 {
-        printf("%sConfiguration #%d\n", prefix,
-            (int) descriptor->configuration_number);
+        printf("%sConfiguration #%d (%zu interfaces)\n", prefix,
+            (int) descriptor->configuration_number,
+            (size_t) descriptor->interface_count);
 }
 
@@ -125 +127 @@
     usb_standard_interface_descriptor_t *descriptor)
 {
-        printf("%sInterface #%d (%s, 0x%02x, 0x%02x)\n", prefix,
+        printf("%sInterface #%d (%s, 0x%02x, 0x%02x), alternate %d\n", prefix,
             (int) descriptor->interface_number,
             usb_str_class(descriptor->interface_class),
             (int) descriptor->interface_subclass,
-            (int) descriptor->interface_protocol);
+            (int) descriptor->interface_protocol,
+            (int) descriptor->alternate_setting);
 }
 

uspace/doc/doxygroups.h

@@ -274 +274 @@
          */
 
-
+        /**
+         * @defgroup drvusbfallback USB fallback driver.
+         * @ingroup usb
+         * @brief Fallback driver for any USB device.
+         * @details
+         * The purpose of this driver is to simplify querying of unknown
+         * devices from within HelenOS (without a driver, no node at all
+         * may appear under /dev/devices).
+         */
+
+

uspace/lib/usb/src/recognise.c

@@ -247 +247 @@
 #undef VENDOR_ONLY_FMT
 #undef VENDOR_ONLY_ARGS
+
+        /* As a last resort, try fallback driver. */
+        ADD_MATCHID_OR_RETURN(matches, 10, "usb&interface&fallback");
 
         return EOK;
@@ -291 +294 @@
         }
         
+        /* As a last resort, try fallback driver. */
+        ADD_MATCHID_OR_RETURN(matches, 10, "usb&fallback");
+
         return EOK;
 }