Changeset 1614ce3 in mainline for uspace/app/usbinfo/usbinfo.h

Timestamp:

2011-03-18T09:14:22Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b64eac6

Parents:

0fd82c9 (diff), b8e2f93 (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:

Improvements of usbinfo application

Refactored the code, filtering output via command line switches, easier
extensibility.

File:

• uspace/app/usbinfo/usbinfo.h (modified) (3 diffs)

uspace/app/usbinfo/usbinfo.h

@@ -38 +38 @@
 #include <usb/usb.h>
 #include <usb/descriptor.h>
+#include <usb/pipes.h>
 #include <usb/debug.h>
+#include <usb/dp.h>
 #include <ipc/devman.h>
+
+typedef struct {
+        usb_endpoint_pipe_t ctrl_pipe;
+        usb_device_connection_t wire;
+        usb_standard_device_descriptor_t device_descriptor;
+        uint8_t *full_configuration_descriptor;
+        size_t full_configuration_descriptor_size;
+} usbinfo_device_t;
+
+typedef struct {
+        int opt;
+        void (*action)(usbinfo_device_t *dev);
+        bool active;
+} usbinfo_action_t;
 
 
@@ -46 +62 @@
 void dump_buffer(const char *, size_t, const uint8_t *, size_t);
 const char *get_indent(size_t);
-void dump_match_ids(match_id_list_t *matches);
+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);
 
@@ -56 +71 @@
 }
 
+usbinfo_device_t *prepare_device(devman_handle_t, usb_address_t);
+void destroy_device(usbinfo_device_t *);
+
+typedef void (*dump_descriptor_in_tree_t)(uint8_t *, size_t, void *);
+void browse_descriptor_tree(uint8_t *, size_t, usb_dp_descriptor_nesting_t *,
+    dump_descriptor_in_tree_t, size_t, void *);
+
+
+void dump_short_device_identification(usbinfo_device_t *);
+void dump_device_match_ids(usbinfo_device_t *);
+void dump_descriptor_tree_brief(usbinfo_device_t *);
+void dump_strings(usbinfo_device_t *);
+
+
 #endif
 /**