Changeset b4b534ac in mainline for uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/lib/usbdev/include/usb/dev/alternate_ifaces.h (moved) (moved from uspace/lib/usbdev/include/usb/dev/hub.h ) (2 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2013 Jan Vesely
  * All rights reserved.
  *
@@ -31 +32 @@
  */
 /** @file
- * Functions needed by hub drivers.
- *
- * For class specific requests, see usb/classes/hub.h.
+ * USB device driver framework.
  */
 
-#ifndef LIBUSBDEV_HUB_H_
-#define LIBUSBDEV_HUB_H_
+#ifndef LIBUSBDEV_ALTERNATE_IFACES_H_
+#define LIBUSBDEV_ALTERNATE_IFACES_H_
 
-#include <ddf/driver.h>
+#include <usb/descriptor.h>
 #include <sys/types.h>
-#include <errno.h>
-#include <usb/hc.h>
 
-extern int usb_hc_new_device_wrapper(ddf_dev_t *, ddf_fun_t *,
-    usb_hc_connection_t *, usb_speed_t, int (*)(void *), void *,
-    usb_address_t *, ddf_dev_ops_t *);
-
-/** Info about device attached to host controller.
- *
- * This structure exists only to keep the same signature of
- * usb_hc_register_device() when more properties of the device
- * would have to be passed to the host controller.
+/** 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 {
-        /** Device address. */
-        usb_address_t address;
-        /** DDF function (external) of the device. */
-        ddf_fun_t *fun;
-} usb_hub_attached_device_t;
+        /** 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;
 
-extern int usb_hub_register_device(usb_hc_connection_t *,
-    const usb_hub_attached_device_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;
 
-static inline int usb_hub_unregister_device(usb_hc_connection_t *conn,
-    const usb_hub_attached_device_t *attached_device)
-{
-        assert(conn);
-        if (attached_device == NULL)
-                return EBADMEM;
-        
-        return usb_hc_release_address(conn, attached_device->address);
-}
+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 *);
 
 #endif
-
 /**
  * @}