#define NO_DESCRIPTOR 0\r
\r
/** Macro to calculate the power value for the device descriptor, from a given number of milliamps. */\r
- #define USB_CONFIG_POWER_MA(x) (x >> 1)\r
+ #define USB_CONFIG_POWER_MA(mA) (mA >> 1)\r
\r
/** Macro to calculate the Unicode length of a string with a given number of Unicode characters.\r
* Should be used in string descriptor's headers for giving the string descriptor's byte length.\r
*/\r
- #define USB_STRING_LEN(x) (sizeof(USB_Descriptor_Header_t) + (x << 1))\r
+ #define USB_STRING_LEN(str) (sizeof(USB_Descriptor_Header_t) + (str << 1))\r
\r
/** Macro to encode a given four digit floating point version number (e.g. 01.23) into Binary Coded\r
* Decimal format for descriptor fields requiring BCD encoding, such as the USB version number in the\r
*/\r
#define ENDPOINT_USAGE_IMPLICIT_FEEDBACK (2 << 4)\r
\r
- /** Gives a void pointer to the specified descriptor (of any type). */\r
- #define DESCRIPTOR_ADDRESS(Descriptor) ((void*)&Descriptor)\r
-\r
- /* Events: */\r
- #if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)\r
- /** This module raises the Device Error event while in device mode, if the \ref USB_GetDescriptor()\r
- * routine is not hooked in the user application to properly return descriptors to the library.\r
- *\r
- * \see Events.h for more information on this event.\r
- */\r
- RAISES_EVENT(USB_DeviceError);\r
- #endif\r
- \r
/* Enums: */\r
/** Enum for the possible standard descriptor types, as given in each descriptor's header. */\r
enum USB_DescriptorTypes_t\r
/* Type Defines: */\r
/** Type define for all descriptor's header, indicating the descriptor's length and type.\r
*\r
- * \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
- * documentation for more information on the two descriptor naming schemes. If the\r
- * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
- * identical to those listed in the USB standard.\r
+ * \note The non-standard structure element names are documented here. If the\r
+ * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+ * with names identical to those listed in the USB standard.\r
*/\r
typedef struct\r
{\r
\r
/** Type define for a standard device descriptor.\r
*\r
- * \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
- * documentation for more information on the two descriptor naming schemes. If the\r
- * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
- * identical to those listed in the USB standard.\r
+ * \note The non-standard structure element names are documented here. If the\r
+ * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+ * with names identical to those listed in the USB standard.\r
*/\r
typedef struct\r
{\r
\r
/** Type define for a standard configuration descriptor.\r
*\r
- * \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
- * documentation for more information on the two descriptor naming schemes. If the\r
- * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
- * identical to those listed in the USB standard.\r
+ * \note The non-standard structure element names are documented here. If the\r
+ * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+ * with names identical to those listed in the USB standard.\r
*/\r
typedef struct\r
{\r
\r
/** Type define for a standard interface descriptor.\r
*\r
- * \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
- * documentation for more information on the two descriptor naming schemes. If the\r
- * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
- * identical to those listed in the USB standard.\r
+ * \note The non-standard structure element names are documented here. If the\r
+ * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+ * with names identical to those listed in the USB standard.\r
*/\r
typedef struct\r
{\r
* together at the point of enumeration, loading one generic driver for all the interfaces in the single\r
* function. Read the ECN for more information.\r
*\r
- * \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
- * documentation for more information on the two descriptor naming schemes. If the\r
- * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
- * identical to those listed in the USB standard.\r
+ * \note The non-standard structure element names are documented here. If the\r
+ * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+ * with names identical to those listed in the USB standard.\r
*/\r
typedef struct\r
{\r
\r
/** Type define for a standard endpoint descriptor.\r
*\r
- * \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
- * documentation for more information on the two descriptor naming schemes. If the\r
- * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
- * identical to those listed in the USB standard.\r
+ * \note The non-standard structure element names are documented here. If the\r
+ * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+ * with names identical to those listed in the USB standard.\r
*/\r
typedef struct\r
{\r
* This structure should also be used for string index 0, which contains the supported language IDs for\r
* the device as an array.\r
*\r
- * \note The non-standard structure element names are documented here - see the StdDescriptors.h file\r
- * documentation for more information on the two descriptor naming schemes. If the\r
- * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements with names\r
- * identical to those listed in the USB standard.\r
+ * \note The non-standard structure element names are documented here. If the\r
+ * USE_NONSTANDARD_DESCRIPTOR_NAMES token is not set, this structure contains elements \r
+ * with names identical to those listed in the USB standard.\r
*/\r
typedef struct\r
{\r
* otherwise zero for standard descriptors, or as defined in a class-specific\r
* standards.\r
* \param DescriptorAddress Pointer to the descriptor in memory. This should be set by the routine to\r
- * the location of the descriptor, found by the \ref DESCRIPTOR_ADDRESS() macro.\r
+ * the address of the descriptor.\r
*\r
* \note By default, the library expects all descriptors to be located in flash memory via the PROGMEM attribute.\r
* If descriptors should be located in RAM or EEPROM instead (to speed up access in the case of RAM, or to\r
projects / pub / USBasp.git / blobdiff