uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
uint8_t FoundEndpoints = 0;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint8_t FoundEndpoints = 0;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint8_t FoundEndpoints = 0;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint8_t FoundEndpoints = 0;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint16_t CurrConfigBytesRem;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint16_t CurrConfigBytesRem;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint16_t CurrConfigBytesRem;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint8_t FoundEndpoints = 0;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint8_t FoundEndpoints = 0;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint16_t CurrConfigBytesRem;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint16_t CurrConfigBytesRem;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint8_t FoundEndpoints = 0;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
uint8_t FoundEndpoints = 0;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r
#include "ConfigDescriptor.h"\r
\r
#if defined(USB_CAN_BE_HOST)\r
-uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr,\r
- void* BufferPtr, uint16_t BufferSize)\r
+uint8_t USB_Host_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr,\r
+ void* BufferPtr, uint16_t BufferSize)\r
{\r
uint8_t ErrorCode;\r
uint8_t ConfigHeader[sizeof(USB_Descriptor_Configuration_Header_t)];\r
uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, void** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine);\r
\r
/* Enums: */\r
- /** Enum for the possible return codes of the \ref USB_GetDeviceConfigDescriptor() function. */\r
+ /** Enum for the possible return codes of the \ref USB_Host_GetDeviceConfigDescriptor() function. */\r
enum USB_Host_GetConfigDescriptor_ErrorCodes_t\r
{\r
HOST_GETCONFIG_Successful = 0, /**< No error occurred while retrieving the configuration descriptor */\r
*\r
* \return A value from the \ref USB_Host_GetConfigDescriptor_ErrorCodes_t enum\r
*/\r
- uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr, void* BufferPtr,\r
- uint16_t BufferSize) ATTR_NON_NULL_PTR_ARG(2, 3);\r
+ uint8_t USB_Host_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr, void* BufferPtr,\r
+ uint16_t BufferSize) ATTR_NON_NULL_PTR_ARG(2, 3);\r
\r
/** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value.\r
* The bytes remaining value is automatically decremented.\r
* -# AVR32 UC3B series microcontrollers\r
* -# Atmel ARM7 series microcontrollers\r
* -# Other (commercial) C compilers\r
- * - Extend AVRISP project\r
- * -# Add alternate USB-to-Serial mode\r
- * -# Add alternate USB-to-TWI mode\r
*/\r
* - The HID_PARSE_UsageStackOverflow HID parser error constant is now named \ref HID_PARSE_UsageListOverflow\r
* - The \ref CALLBACK_HIDParser_FilterHIDReportItem() HID Parser callback now passes a complete HID_ReportItem_t to the\r
* user application, instead of just its attributes.\r
+ * - The USB_GetDeviceConfigDescriptor() function was incorrectly named and is now called \ref USB_Host_GetDeviceConfigDescriptor().\r
*\r
<b>No Migration information for this release - all library elements are backwards-compatible with 090924.</b>\r
*\r
* call to SPI_Init() before using the Dataflash driver\r
*\r
* <b>Host Mode</b>\r
- * - The \ref USB_GetDeviceConfigDescriptor() function's parameters and behaviour has changed; the user is required to\r
+ * - The USB_GetDeviceConfigDescriptor() function's parameters and behaviour has changed; the user is required to\r
* preallocate the largest allowable buffer, and pass the size of the buffer to the function. This allows for a single\r
* call to the function to retrieve, size check and validate the Configuration Descriptor rather than having the user\r
* application perform these intermediatary steps.\r
*\r
* <b>Host Mode</b>\r
* - The HIDParser.c module has moved from LUFA/Drivers/USB/Class/ to LUFA/Drivers/USB/Class/Host/.\r
- * - The \ref USB_GetDeviceConfigDescriptor() function now requires the desired configuration index within the device as its first\r
+ * - The USB_GetDeviceConfigDescriptor() function now requires the desired configuration index within the device as its first\r
* parameter, to add support for multi-configuration devices. Existing code should use a configuration index of 1 to indicate the\r
* first configuration descriptor within the device.\r
* - The non-standard "Ready" host state has been removed. Existing \ref HOST_STATE_Configured code should be moved to the end of\r
uint8_t FoundEndpoints = 0;\r
\r
/* Retrieve the entire configuration descriptor into the allocated buffer */\r
- switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
+ switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))\r
{\r
case HOST_GETCONFIG_Successful:\r
break;\r