Changeset 0c05496 in mainline

Timestamp:

2010-12-12T13:46:21Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1f3158c, a822cd8, b666608

Parents:

e7b9541 (diff), 7ed5b576 (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 vojtechhorky/ - child device registration

The changes are mostly about wrapper for adding USB child device.

Location:

uspace

Files:

• app/usbinfo/dump.c (modified) (1 diff)
• app/usbinfo/main.c (modified) (1 diff)
• app/usbinfo/usbinfo.h (modified) (2 diffs)
• lib/usb/Makefile (modified) (2 diffs)
• lib/usb/include/usb/classes/classes.h (modified) (1 diff)
• lib/usb/include/usb/usbdrv.h (modified) (1 diff)
• lib/usb/src/class.c (added)
• lib/usb/src/recognise.c (added)

uspace/app/usbinfo/dump.c

@@ -69 +69 @@
 }
 
+void dump_match_ids(match_id_list_t *matches)
+{
+        printf("Match ids:\n");
+        link_t *link;
+        for (link = matches->ids.next;
+            link != &matches->ids;
+            link = link->next) {
+                match_id_t *match = list_get_instance(link, match_id_t, link);
+
+                printf(INDENT "%d %s\n", match->score, match->id);
+        }
+}
+
 void dump_standard_device_descriptor(usb_standard_device_descriptor_t *d)
 {

uspace/app/usbinfo/main.c

@@ -112 +112 @@
 
         /*
+         * Dump information about possible match ids.
+         */
+        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);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to fetch match ids of the device: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+        dump_match_ids(&match_id_list);
+
+        /*
          * Get device descriptor and dump it.
          */

uspace/app/usbinfo/usbinfo.h

@@ -39 +39 @@
 #include <usb/descriptor.h>
 #include <usb/debug.h>
+#include <ipc/devman.h>
 
 
@@ -44 +45 @@
 
 void dump_buffer(const char *, const uint8_t *, size_t);
+void dump_match_ids(match_id_list_t *matches);
 void dump_standard_device_descriptor(usb_standard_device_descriptor_t *);
 void dump_standard_configuration_descriptor(int, 

uspace/lib/usb/Makefile

@@ -34 +34 @@
 SOURCES = \
         src/addrkeep.c \
+        src/class.c \
         src/debug.c \
         src/drvpsync.c \
@@ -40 +41 @@
         src/hidparser.c \
         src/localdrv.c \
+        src/recognise.c \
         src/remotedrv.c \
         src/usb.c \

uspace/lib/usb/include/usb/classes/classes.h

@@ -60 +60 @@
 } usb_class_t;
 
+const char *usb_str_class(usb_class_t);
 
 #endif

uspace/lib/usb/include/usb/usbdrv.h

@@ -94 +94 @@
 int usb_drv_async_wait_for(usb_handle_t);
 
+int usb_drv_create_device_match_ids(int, match_id_list_t *, usb_address_t);
+int usb_drv_register_child_in_devman(int, device_t *, usb_address_t,
+    devman_handle_t *);
+
 
 #endif