Changeset b208b3b in mainline

Timestamp:

2013-01-26T18:32:32Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2dc5a9f

Parents:

8e10ef4

Message:

libusbdev: Move alternate interface handling to its own header file.

Fix initialization loop.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/alternate_ifaces.h (added)
• include/usb/dev/driver.h (modified) (2 diffs)
• src/altiface.c (modified) (2 diffs)

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -38 +38 @@
 
 #include <usb/hc.h>
+#include <usb/dev/alternate_ifaces.h>
 #include <usb/dev/usb_device_connection.h>
 #include <usb/dev/pipes.h>
 #include <usb_iface.h>
-
-
-/** Wrapper for data related to alternate interface setting.
- * The pointers will typically point inside configuration descriptor and
- * thus you shall not deallocate them.
- */
-typedef struct {
-        /** Interface descriptor. */
-        const usb_standard_interface_descriptor_t *interface;
-        /** Pointer to start of descriptor tree bound with this interface. */
-        const uint8_t *nested_descriptors;
-        /** Size of data pointed by nested_descriptors in bytes. */
-        size_t nested_descriptors_size;
-} usb_alternate_interface_descriptors_t;
-
-/** Alternate interface settings. */
-typedef struct {
-        /** Array of alternate interfaces descriptions. */
-        const usb_alternate_interface_descriptors_t *alternatives;
-        /** Size of @c alternatives array. */
-        size_t alternative_count;
-        /** Index of currently selected one. */
-        size_t current;
-} usb_alternate_interfaces_t;
-
-size_t usb_interface_count_alternates(const uint8_t *, size_t, uint8_t);
-int usb_alternate_interfaces_init(usb_alternate_interfaces_t *,
-    const uint8_t *, size_t, int);
-void usb_alternate_interfaces_deinit(usb_alternate_interfaces_t *);
 
 /** USB device structure. */
@@ -192 +164 @@
 
 int usb_device_get_iface_number(usb_device_t *);
+
 const usb_standard_device_descriptor_t *
 usb_device_get_device_descriptor(usb_device_t *);

uspace/lib/usbdev/src/altiface.c

@@ -34 +34 @@
  */
 
-#include <usb/dev/driver.h>
-#include <usb/dev/request.h>
-#include <usb/debug.h>
+#include <usb/dev/alternate_ifaces.h>
 #include <usb/dev/dp.h>
+#include <malloc.h>
 #include <errno.h>
-#include <str_error.h>
 #include <assert.h>
 
@@ -154 +152 @@
                     dp_data.data + dp_data.size : iface_ptr;
 
-                iterator->nested_descriptors_size
-                    = next - iterator->nested_descriptors;
-
-                ++iterator;
+                iterator->nested_descriptors_size =
+                    next - iterator->nested_descriptors;
         }