Changeset deece2f in mainline for uspace/lib/usb/include

Timestamp:

2011-02-21T22:25:58Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

233e68d

Parents:

fb78ae72 (diff), dbe25f1 (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:

Development branch merge

Location:

uspace/lib/usb/include/usb

Files:

• classes/hub.h (modified) (2 diffs)
• ddfiface.h (added)
• devreq.h (deleted)
• dp.h (modified) (1 diff)
• pipes.h (modified) (2 diffs)
• recognise.h (modified) (1 diff)
• request.h (modified) (1 diff)
• usbdrv.h (deleted)

uspace/lib/usb/include/usb/classes/hub.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2010 Matus Dekanek
  * All rights reserved.
  *
@@ -33 +33 @@
  * @brief USB hub related structures.
  */
-#ifndef LIBUSB_HUB_H_
-#define LIBUSB_HUB_H_
+#ifndef LIBUSB_CLASS_HUB_H_
+#define LIBUSB_CLASS_HUB_H_
 
 #include <sys/types.h>

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

@@ -45 +45 @@
 } usb_dp_descriptor_nesting_t;
 
+extern usb_dp_descriptor_nesting_t usb_dp_standard_descriptor_nesting[];
+
 typedef struct {
         usb_dp_descriptor_nesting_t *nesting;

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

@@ -107 +107 @@
         /** Endpoint description. */
         const usb_endpoint_description_t *description;
+        /** Interface number the endpoint must belong to (-1 for any). */
+        const int interface_no;
         /** Found descriptor fitting the description. */
         usb_standard_endpoint_descriptor_t *descriptor;
@@ -121 +123 @@
 int usb_device_connection_initialize(usb_device_connection_t *,
     devman_handle_t, usb_address_t);
+
+int usb_device_get_assigned_interface(device_t *);
 
 int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,

uspace/lib/usb/include/usb/recognise.h

@@ -41 +41 @@
 #include <ipc/devman.h>
 
+int usb_device_create_match_ids_from_device_descriptor(
+    const usb_standard_device_descriptor_t *, match_id_list_t *);
+
+int usb_device_create_match_ids_from_interface(
+    const usb_standard_device_descriptor_t *,
+    const usb_standard_interface_descriptor_t *, match_id_list_t *);
+
 int usb_device_create_match_ids(usb_endpoint_pipe_t *, match_id_list_t *);
 

uspace/lib/usb/include/usb/request.h

@@ -41 +41 @@
 #include <usb/descriptor.h>
 
+/** Standard device request. */
+typedef enum {
+        USB_DEVREQ_GET_STATUS = 0,
+        USB_DEVREQ_CLEAR_FEATURE = 1,
+        USB_DEVREQ_SET_FEATURE = 3,
+        USB_DEVREQ_SET_ADDRESS = 5,
+        USB_DEVREQ_GET_DESCRIPTOR = 6,
+        USB_DEVREQ_SET_DESCRIPTOR = 7,
+        USB_DEVREQ_GET_CONFIGURATION = 8,
+        USB_DEVREQ_SET_CONFIGURATION = 9,
+        USB_DEVREQ_GET_INTERFACE = 10,
+        USB_DEVREQ_SET_INTERFACE = 11,
+        USB_DEVREQ_SYNCH_FRAME = 12,
+        USB_DEVREQ_LAST_STD
+} usb_stddevreq_t;
+
+/** Device request setup packet.
+ * The setup packet describes the request.
+ */
+typedef struct {
+        /** Request type.
+         * The type combines transfer direction, request type and
+         * intended recipient.
+         */
+        uint8_t request_type;
+        /** Request identification. */
+        uint8_t request;
+        /** Main parameter to the request. */
+        union {
+                uint16_t value;
+                /* FIXME: add #ifdefs according to host endianess */
+                struct {
+                        uint8_t value_low;
+                        uint8_t value_high;
+                };
+        };
+        /** Auxiliary parameter to the request.
+         * Typically, it is offset to something.
+         */
+        uint16_t index;
+        /** Length of extra data. */
+        uint16_t length;
+} __attribute__ ((packed)) usb_device_request_setup_packet_t;
+
 int usb_control_request_set(usb_endpoint_pipe_t *,
     usb_request_type_t, usb_request_recipient_t, uint8_t,