Changes in uspace/lib/usb/include/usb/descriptor.h [4e732f1a:9d58539] in mainline

File:

• uspace/lib/usb/include/usb/descriptor.h (modified) (5 diffs)

uspace/lib/usb/include/usb/descriptor.h

@@ -36 +36 @@
 #define LIBUSB_DESCRIPTOR_H_
 
-#include <sys/types.h>
+#include <async.h>
 
 /** Descriptor type. */
@@ -45 +45 @@
         USB_DESCTYPE_INTERFACE = 4,
         USB_DESCTYPE_ENDPOINT = 5,
-        /* New in USB2.0 */
-        USB_DESCTYPE_DEVICE_QUALIFIER = 6,
-        USB_DESCTYPE_OTHER_SPEED_CONFIGURATION = 7,
-        USB_DESCTYPE_INTERFACE_POWER = 8,
-        /* Class specific */
         USB_DESCTYPE_HID = 0x21,
         USB_DESCTYPE_HID_REPORT = 0x22,
@@ -94 +89 @@
 } __attribute__ ((packed)) usb_standard_device_descriptor_t;
 
-/** USB device qualifier decriptor is basically a cut down version of the device
- * descriptor with values that would be valid if the device operated on the
- * other speed (HIGH vs. FULL)
- */
-typedef struct {
-        /** Size of this descriptor in bytes */
-        uint8_t length;
-        /** Descriptor type (USB_DESCTYPE_DEVICE_QUALIFIER) */
-        uint8_t descriptor_type;
-        /** USB specification release number.
-         * The number shall be coded as binary-coded decimal (BCD).
-         */
-        uint16_t usb_spec_version;
-        /** Device class. */
-        uint8_t device_class;
-        /** Device sub-class. */
-        uint8_t device_subclass;
-        /** Device protocol. */
-        uint8_t device_protocol;
-        /** Maximum packet size for endpoint zero.
-         * Valid values are only 8, 16, 32, 64).
-         */
-        uint8_t max_packet_size;
-        /** Number of possible configurations. */
-        uint8_t configuration_count;
-        uint8_t reserved;
-} __attribute__ ((packed)) usb_standard_device_qualifier_descriptor_t;
-
 /** Standard USB configuration descriptor.
  */
@@ -149 +116 @@
 } __attribute__ ((packed)) usb_standard_configuration_descriptor_t;
 
-/** USB Other Speed Configuration descriptor shows values that would change
- * in the configuration descriptor if the device operated at its other
- * possible speed (HIGH vs. FULL)
- */
-typedef usb_standard_configuration_descriptor_t
-    usb_other_speed_configuration_descriptor_t;
-
 /** Standard USB interface descriptor.
  */
@@ -197 +157 @@
          */
         uint8_t attributes;
-        /** Maximum packet size.
-         * Lower 10 bits represent the actuall size
-         * Bits 11,12 specify addtional transfer opportunitities for
-         * HS INT and ISO transfers. */
+        /** Maximum packet size. */
         uint16_t max_packet_size;
-#define ED_MPS_PACKET_SIZE_MASK  0x3ff
-#define ED_MPS_PACKET_SIZE_GET(value) \
-        ((value) & ED_MPS_PACKET_SIZE_MASK)
-#define ED_MPS_TRANS_OPPORTUNITIES_GET(value) \
-        ((((value) >> 10) & 0x3) + 1)
         /** Polling interval in milliseconds.
          * Ignored for bulk and control endpoints.