Changeset 73751c0 in mainline for uspace/lib

Timestamp:

2011-03-18T12:16:36Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

b495a93

Parents:

42a3a57 (diff), b64eac6 (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 with usb/development

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/l18n/langs.c (added)
• c/include/l18n/langs.h (modified) (1 diff)
• usb/include/usb/dp.h (modified) (1 diff)
• usb/include/usb/pipes.h (modified) (1 diff)
• usb/src/dp.c (modified) (1 diff)
• usb/src/pipes.c (modified) (2 diffs)

uspace/lib/c/Makefile

@@ -65 +65 @@
         generic/str.c \
         generic/str_error.c \
+        generic/l18n/langs.c \
         generic/fibril.c \
         generic/fibril_synch.c \

uspace/lib/c/include/l18n/langs.h

@@ -57 +57 @@
 } l18_win_locales_t;
 
+const char *str_l18_win_locale(l18_win_locales_t);
+
 #endif
 

uspace/lib/usb/include/usb/dp.h

@@ -77 +77 @@
     usb_dp_parser_data_t *, uint8_t *, uint8_t *);
 
+void usb_dp_walk_simple(uint8_t *, size_t, usb_dp_descriptor_nesting_t *,
+    void (*)(uint8_t *, size_t, void *), void *);
+
 #endif
 /**

uspace/lib/usb/include/usb/pipes.h

@@ -123 +123 @@
 
 int usb_device_get_assigned_interface(ddf_dev_t *);
+usb_address_t usb_device_get_assigned_address(devman_handle_t);
 
 int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,

uspace/lib/usb/src/dp.c

@@ -258 +258 @@
 }
 
+/** Browser of the descriptor tree.
+ *
+ * @see usb_dp_walk_simple
+ *
+ * @param parser Descriptor parser.
+ * @param data Data for descriptor parser.
+ * @param root Pointer to current root of the tree.
+ * @param depth Current nesting depth.
+ * @param callback Callback for each found descriptor.
+ * @param arg Custom (user) argument.
+ */
+static void usb_dp_browse_simple_internal(usb_dp_parser_t *parser,
+    usb_dp_parser_data_t *data, uint8_t *root, size_t depth,
+    void (*callback)(uint8_t *, size_t, void *), void *arg)
+{
+        if (root == NULL) {
+                return;
+        }
+        callback(root, depth, arg);
+        uint8_t *child = usb_dp_get_nested_descriptor(parser, data, root);
+        do {
+                usb_dp_browse_simple_internal(parser, data, child, depth + 1,
+                    callback, arg);
+                child = usb_dp_get_sibling_descriptor(parser, data,
+                    root, child);
+        } while (child != NULL);
+}
+
+/** Browse flatten descriptor tree.
+ *
+ * The callback is called with following arguments: pointer to the start
+ * of the descriptor (somewhere inside @p descriptors), depth of the nesting
+ * (starting from 0 for the first descriptor) and the custom argument.
+ * Note that the size of the descriptor is not passed because it can
+ * be read from the first byte of the descriptor.
+ *
+ * @param descriptors Descriptor data.
+ * @param descriptors_size Size of descriptor data (in bytes).
+ * @param descriptor_nesting Possible descriptor nesting.
+ * @param callback Callback for each found descriptor.
+ * @param arg Custom (user) argument.
+ */
+void usb_dp_walk_simple(uint8_t *descriptors, size_t descriptors_size,
+    usb_dp_descriptor_nesting_t *descriptor_nesting,
+    void (*callback)(uint8_t *, size_t, void *), void *arg)
+{
+        if ((descriptors == NULL) || (descriptors_size == 0)
+            || (descriptor_nesting == NULL) || (callback == NULL)) {
+                return;
+        }
+
+        usb_dp_parser_data_t data = {
+                .data = descriptors,
+                .size = descriptors_size,
+                .arg = NULL
+        };
+
+        usb_dp_parser_t parser = {
+                .nesting = descriptor_nesting
+        };
+
+        usb_dp_browse_simple_internal(&parser, &data, descriptors,
+            0, callback, arg);
+}
 
 /** @}

uspace/lib/usb/src/pipes.c

@@ -52 +52 @@
         sysarg_t address;
 
-
         /*
          * We are sending special value as a handle - zero - to get
@@ -94 +93 @@
 
         return (int) iface_no;
+}
+
+/** Tell USB address assigned to given device.
+ *
+ * @param dev_handle Devman handle of the USB device in question.
+ * @return USB address or negative error code.
+ */
+usb_address_t usb_device_get_assigned_address(devman_handle_t dev_handle)
+{
+        int parent_phone = devman_parent_device_connect(dev_handle,
+            IPC_FLAG_BLOCKING);
+        if (parent_phone < 0) {
+                return parent_phone;
+        }
+
+        sysarg_t address;
+
+        int rc = async_req_2_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_ADDRESS,
+            dev_handle, &address);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        async_hangup(parent_phone);
+
+        return (usb_address_t) address;
 }