X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6a10d6b465be27db090d760dc0fbe722c94e4344..ecaf872177e771b6b7e331b47a5b68832b5dd126:/LUFA/Drivers/USB/HighLevel/StdDescriptors.h diff --git a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h index d9075cc75..d62836321 100644 --- a/LUFA/Drivers/USB/HighLevel/StdDescriptors.h +++ b/LUFA/Drivers/USB/HighLevel/StdDescriptors.h @@ -31,7 +31,7 @@ /** \file * * Standard USB device descriptor defines and retrieval routines, for USB devices. This module contains - * strucutures and macros for the easy creation of standard USB descriptors in USB device projects. + * structures and macros for the easy creation of standard USB descriptors in USB device projects. * * All standard descriptors have their elements named in an identical manner to the official USB specification, * however slightly more verbose alternate (non-standard) names are also supplied if the macro @@ -52,7 +52,7 @@ #include #include "../../../Common/Common.h" - #include "../LowLevel/USBMode.h" + #include "USBMode.h" #include "Events.h" #if defined(USB_CAN_BE_DEVICE) @@ -108,69 +108,69 @@ * descriptor's ConfigAttributes value to indicate that the specified configuration can draw its power * from the host's VBUS line. */ - #define USB_CONFIG_ATTR_BUSPOWERED 0b10000000 + #define USB_CONFIG_ATTR_BUSPOWERED 0x80 /** Can be masked with other configuration descriptor attributes for a USB_Descriptor_Configuration_Header_t * descriptor's ConfigAttributes value to indicate that the specified configuration can draw its power * from the device's own power source. */ - #define USB_CONFIG_ATTR_SELFPOWERED 0b11000000 + #define USB_CONFIG_ATTR_SELFPOWERED 0xC0 /** Can be masked with other configuration descriptor attributes for a USB_Descriptor_Configuration_Header_t * descriptor's ConfigAttributes value to indicate that the specified configuration supports the * remote wakeup feature of the USB standard, allowing a suspended USB device to wake up the host upon * request. */ - #define USB_CONFIG_ATTR_REMOTEWAKEUP 0b10100000 + #define USB_CONFIG_ATTR_REMOTEWAKEUP 0xA0 /** Can be masked with other endpoint descriptor attributes for a USB_Descriptor_Endpoint_t descriptor's * Attributes value to indicate that the specified endpoint is not synchronized. * * \see The USB specification for more details on the possible Endpoint attributes. */ - #define ENDPOINT_ATTR_NO_SYNC (0b00 << 2) + #define ENDPOINT_ATTR_NO_SYNC (0 << 2) /** Can be masked with other endpoint descriptor attributes for a USB_Descriptor_Endpoint_t descriptor's * Attributes value to indicate that the specified endpoint is asynchronous. * * \see The USB specification for more details on the possible Endpoint attributes. */ - #define ENDPOINT_ATTR_ASYNC (0b01 << 2) + #define ENDPOINT_ATTR_ASYNC (1 << 2) /** Can be masked with other endpoint descriptor attributes for a USB_Descriptor_Endpoint_t descriptor's * Attributes value to indicate that the specified endpoint is adaptive. * * \see The USB specification for more details on the possible Endpoint attributes. */ - #define ENDPOINT_ATTR_ADAPTIVE (0b10 << 2) + #define ENDPOINT_ATTR_ADAPTIVE (2 << 2) /** Can be masked with other endpoint descriptor attributes for a USB_Descriptor_Endpoint_t descriptor's * Attributes value to indicate that the specified endpoint is synchronized. * * \see The USB specification for more details on the possible Endpoint attributes. */ - #define ENDPOINT_ATTR_SYNC (0b11 << 2) + #define ENDPOINT_ATTR_SYNC (3 << 2) /** Can be masked with other endpoint descriptor attributes for a USB_Descriptor_Endpoint_t descriptor's * Attributes value to indicate that the specified endpoint is used for data transfers. * * \see The USB specification for more details on the possible Endpoint usage attributes. */ - #define ENDPOINT_USAGE_DATA (0b00 << 4) + #define ENDPOINT_USAGE_DATA (0 << 4) /** Can be masked with other endpoint descriptor attributes for a USB_Descriptor_Endpoint_t descriptor's * Attributes value to indicate that the specified endpoint is used for feedback. * * \see The USB specification for more details on the possible Endpoint usage attributes. */ - #define ENDPOINT_USAGE_FEEDBACK (0b01 << 4) + #define ENDPOINT_USAGE_FEEDBACK (1 << 4) /** Can be masked with other endpoint descriptor attributes for a USB_Descriptor_Endpoint_t descriptor's * Attributes value to indicate that the specified endpoint is used for implicit feedback. * * \see The USB specification for more details on the possible Endpoint usage attributes. */ - #define ENDPOINT_USAGE_IMPLICIT_FEEDBACK (0b10 << 4) + #define ENDPOINT_USAGE_IMPLICIT_FEEDBACK (2 << 4) /** Gives a void pointer to the specified descriptor (of any type). */ #define DESCRIPTOR_ADDRESS(Descriptor) ((void*)&Descriptor) @@ -245,7 +245,7 @@ uint16_t ReleaseNumber; /**< Product release (version) number. */ uint8_t ManufacturerStrIndex; /**< String index for the manufacturer's name. The - * host will request this string via a seperate + * host will request this string via a separate * control request for the string descriptor. * * \note If no string supplied, use NO_DESCRIPTOR. @@ -255,7 +255,7 @@ * \see ManufacturerStrIndex structure entry. */ uint8_t SerialNumStrIndex; /**< String index for the product's globally unique hexadecimal - * serial number, in uppercase Unicoded ASCII. + * serial number, in uppercase Unicode ASCII. * * \see ManufacturerStrIndex structure entry. */ @@ -363,7 +363,7 @@ /** Type define for a standard interface association descriptor. * - * This descriptor has been added as a suppliment to the USB2.0 standard, in the ECN located at + * This descriptor has been added as a supplement to the USB2.0 standard, in the ECN located at * http://www.usb.org/developers/docs/InterfaceAssociationDescriptor_ecn.pdf. It allows compound * devices with multiple interfaces related to the same function to have the multiple interfaces bound * together at the point of enumeration, loading one generic driver for all the interfaces in the single @@ -425,7 +425,7 @@ * maximum packet size that the endpoint can receive at a time. */ - uint8_t PollingIntervalMS; /**< Polling interval in milliseconds for the endpont + uint8_t PollingIntervalMS; /**< Polling interval in milliseconds for the endpoint * if it is an INTERRUPT or ISOCHRONOUS type. */ #else @@ -497,7 +497,7 @@ * * \note By default, the library expects all descriptors to be located in flash memory via the PROGMEM attribute. * If descriptors should be located in RAM or EEPROM instead (to speed up access in the case of RAM, or to - * allow the descriptors to be changed dynamically at runtime) either the USE_SRAM_DESCRIPTORS or the + * allow the descriptors to be changed dynamically at runtime) either the USE_RAM_DESCRIPTORS or the * USE_EEPROM_DESCRIPTORS tokens may be defined in the project makefile and passed to the compiler by the -D * switch. *