Changeset eb522e8 in mainline for uspace/app/usbinfo/desctree.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/app/usbinfo/desctree.c (moved) (moved from uspace/srv/net/tl/udp/udp_module.c ) (2 diffs)

uspace/app/usbinfo/desctree.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Lukas Mejdrech
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup udp
+/** @addtogroup usbinfo
  * @{
  */
-
-/** @file
- * UDP standalone module implementation.
- * Contains skeleton module functions mapping.
- * The functions are used by the module skeleton as module specific entry
- * points.
- * @see module.c
+/**
+ * @file
+ * Descriptor tree dump.
  */
 
-#include "udp.h"
-#include "udp_module.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <str_error.h>
+#include <bool.h>
 
-#include <async.h>
-#include <stdio.h>
-#include <errno.h>
-#include <ipc/ipc.h>
-#include <ipc/services.h>
+#include <usb/usb.h>
+#include <usb/descriptor.h>
+#include <usb/debug.h>
+#include <usb/classes/classes.h>
 
-#include <net/modules.h>
-#include <net/packet.h>
+#include "usbinfo.h"
+#include <usb/dev/dp.h>
 
-#include <net_interface.h>
-#include <tl_local.h>
-
-/** UDP module global data. */
-extern udp_globals_t udp_globals;
-
-int tl_module_start_standalone(async_client_conn_t client_connection)
+static void browse_descriptor_tree_internal(usb_dp_parser_t *parser,
+    usb_dp_parser_data_t *data, uint8_t *root, size_t depth,
+    dump_descriptor_in_tree_t callback, void *arg)
 {
-        ipcarg_t phonehash;
-        int rc;
-
-        async_set_client_connection(client_connection);
-        udp_globals.net_phone = net_connect_module();
-        if (udp_globals.net_phone < 0)
-                return udp_globals.net_phone;
-        
-        rc = pm_init();
-        if (rc != EOK)
-                return EOK;
-                
-        rc = udp_initialize(client_connection);
-        if (rc != EOK)
-                goto out;
-        
-        rc = REGISTER_ME(SERVICE_UDP, &phonehash);
-        if (rc != EOK)
-                goto out;
-
-        async_manager();
-
-out:
-        pm_destroy();
-        return rc;
+        if (root == NULL) {
+                return;
+        }
+        callback(root, depth, arg);
+        uint8_t *child = usb_dp_get_nested_descriptor(parser, data, root);
+        do {
+                browse_descriptor_tree_internal(parser, data, child, depth + 1,
+                    callback, arg);
+                child = usb_dp_get_sibling_descriptor(parser, data,
+                    root, child);
+        } while (child != NULL);
 }
 
-int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
+void browse_descriptor_tree(uint8_t *descriptors, size_t descriptors_size,
+    usb_dp_descriptor_nesting_t *descriptor_nesting,
+    dump_descriptor_in_tree_t callback, size_t initial_depth, void *arg)
 {
-        return udp_message_standalone(callid, call, answer, answer_count);
+        usb_dp_parser_data_t data = {
+                .data = descriptors,
+                .size = descriptors_size,
+                .arg = NULL
+        };
+
+        usb_dp_parser_t parser = {
+                .nesting = descriptor_nesting
+        };
+
+        browse_descriptor_tree_internal(&parser, &data, descriptors,
+            initial_depth, callback, arg);
 }