Changes in / [0c05496:e7b9541] in mainline

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 (deleted)
• lib/usb/src/recognise.c (deleted)

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>
 
 
@@ -45 +44 @@
 
 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 \
@@ -41 +40 @@
         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