Corrected the name of the misnamed USB_GetDeviceConfigDescriptor() function to USB_Host_GetDeviceConfigDescriptor().

pull/1469/head
Dean Camera 15 years ago
parent 2626ecb261
commit e625fd6df3

@ -116,7 +116,7 @@ void MouseHostTask(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -76,7 +76,7 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -81,7 +81,7 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -76,7 +76,7 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -81,7 +81,7 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -74,7 +74,7 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -74,7 +74,7 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -76,7 +76,7 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -81,7 +81,7 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -73,7 +73,7 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -76,7 +76,7 @@ int main(void)
uint16_t ConfigDescriptorSize; uint16_t ConfigDescriptorSize;
uint8_t ConfigDescriptorData[512]; uint8_t ConfigDescriptorData[512];
if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData, if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful) sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
{ {
printf("Error Retrieving Configuration Descriptor.\r\n"); printf("Error Retrieving Configuration Descriptor.\r\n");

@ -38,7 +38,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint8_t FoundEndpoints = 0; uint8_t FoundEndpoints = 0;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -53,7 +53,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint8_t FoundEndpoints = 0; uint8_t FoundEndpoints = 0;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -53,7 +53,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint8_t FoundEndpoints = 0; uint8_t FoundEndpoints = 0;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -53,7 +53,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint8_t FoundEndpoints = 0; uint8_t FoundEndpoints = 0;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -52,7 +52,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint16_t CurrConfigBytesRem; uint16_t CurrConfigBytesRem;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -52,7 +52,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint16_t CurrConfigBytesRem; uint16_t CurrConfigBytesRem;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -52,7 +52,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint16_t CurrConfigBytesRem; uint16_t CurrConfigBytesRem;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -53,7 +53,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint8_t FoundEndpoints = 0; uint8_t FoundEndpoints = 0;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -53,7 +53,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint8_t FoundEndpoints = 0; uint8_t FoundEndpoints = 0;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -52,7 +52,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint16_t CurrConfigBytesRem; uint16_t CurrConfigBytesRem;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -52,7 +52,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint16_t CurrConfigBytesRem; uint16_t CurrConfigBytesRem;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -52,7 +52,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint8_t FoundEndpoints = 0; uint8_t FoundEndpoints = 0;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -53,7 +53,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint8_t FoundEndpoints = 0; uint8_t FoundEndpoints = 0;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

@ -31,7 +31,7 @@
#include "ConfigDescriptor.h" #include "ConfigDescriptor.h"
#if defined(USB_CAN_BE_HOST) #if defined(USB_CAN_BE_HOST)
uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr, uint8_t USB_Host_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr,
void* BufferPtr, uint16_t BufferSize) void* BufferPtr, uint16_t BufferSize)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;

@ -155,7 +155,7 @@
uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, void** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine); uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, void** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine);
/* Enums: */ /* Enums: */
/** Enum for the possible return codes of the \ref USB_GetDeviceConfigDescriptor() function. */ /** Enum for the possible return codes of the \ref USB_Host_GetDeviceConfigDescriptor() function. */
enum USB_Host_GetConfigDescriptor_ErrorCodes_t enum USB_Host_GetConfigDescriptor_ErrorCodes_t
{ {
HOST_GETCONFIG_Successful = 0, /**< No error occurred while retrieving the configuration descriptor */ HOST_GETCONFIG_Successful = 0, /**< No error occurred while retrieving the configuration descriptor */
@ -202,7 +202,7 @@
* *
* \return A value from the \ref USB_Host_GetConfigDescriptor_ErrorCodes_t enum * \return A value from the \ref USB_Host_GetConfigDescriptor_ErrorCodes_t enum
*/ */
uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr, void* BufferPtr, uint8_t USB_Host_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr, void* BufferPtr,
uint16_t BufferSize) ATTR_NON_NULL_PTR_ARG(2, 3); uint16_t BufferSize) ATTR_NON_NULL_PTR_ARG(2, 3);
/** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value. /** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value.

@ -33,7 +33,4 @@
* -# AVR32 UC3B series microcontrollers * -# AVR32 UC3B series microcontrollers
* -# Atmel ARM7 series microcontrollers * -# Atmel ARM7 series microcontrollers
* -# Other (commercial) C compilers * -# Other (commercial) C compilers
* - Extend AVRISP project
* -# Add alternate USB-to-Serial mode
* -# Add alternate USB-to-TWI mode
*/ */

@ -16,6 +16,7 @@
* - The HID_PARSE_UsageStackOverflow HID parser error constant is now named \ref HID_PARSE_UsageListOverflow * - The HID_PARSE_UsageStackOverflow HID parser error constant is now named \ref HID_PARSE_UsageListOverflow
* - The \ref CALLBACK_HIDParser_FilterHIDReportItem() HID Parser callback now passes a complete HID_ReportItem_t to the * - The \ref CALLBACK_HIDParser_FilterHIDReportItem() HID Parser callback now passes a complete HID_ReportItem_t to the
* user application, instead of just its attributes. * user application, instead of just its attributes.
* - The USB_GetDeviceConfigDescriptor() function was incorrectly named and is now called \ref USB_Host_GetDeviceConfigDescriptor().
* *
<b>No Migration information for this release - all library elements are backwards-compatible with 090924.</b> <b>No Migration information for this release - all library elements are backwards-compatible with 090924.</b>
* *
@ -29,7 +30,7 @@
* call to SPI_Init() before using the Dataflash driver * call to SPI_Init() before using the Dataflash driver
* *
* <b>Host Mode</b> * <b>Host Mode</b>
* - The \ref USB_GetDeviceConfigDescriptor() function's parameters and behaviour has changed; the user is required to * - The USB_GetDeviceConfigDescriptor() function's parameters and behaviour has changed; the user is required to
* preallocate the largest allowable buffer, and pass the size of the buffer to the function. This allows for a single * preallocate the largest allowable buffer, and pass the size of the buffer to the function. This allows for a single
* call to the function to retrieve, size check and validate the Configuration Descriptor rather than having the user * call to the function to retrieve, size check and validate the Configuration Descriptor rather than having the user
* application perform these intermediatary steps. * application perform these intermediatary steps.
@ -67,7 +68,7 @@
* *
* <b>Host Mode</b> * <b>Host Mode</b>
* - The HIDParser.c module has moved from LUFA/Drivers/USB/Class/ to LUFA/Drivers/USB/Class/Host/. * - The HIDParser.c module has moved from LUFA/Drivers/USB/Class/ to LUFA/Drivers/USB/Class/Host/.
* - The \ref USB_GetDeviceConfigDescriptor() function now requires the desired configuration index within the device as its first * - The USB_GetDeviceConfigDescriptor() function now requires the desired configuration index within the device as its first
* parameter, to add support for multi-configuration devices. Existing code should use a configuration index of 1 to indicate the * parameter, to add support for multi-configuration devices. Existing code should use a configuration index of 1 to indicate the
* first configuration descriptor within the device. * first configuration descriptor within the device.
* - The non-standard "Ready" host state has been removed. Existing \ref HOST_STATE_Configured code should be moved to the end of * - The non-standard "Ready" host state has been removed. Existing \ref HOST_STATE_Configured code should be moved to the end of

@ -53,7 +53,7 @@ uint8_t ProcessConfigurationDescriptor(void)
uint8_t FoundEndpoints = 0; uint8_t FoundEndpoints = 0;
/* Retrieve the entire configuration descriptor into the allocated buffer */ /* Retrieve the entire configuration descriptor into the allocated buffer */
switch (USB_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData))) switch (USB_Host_GetDeviceConfigDescriptor(1, &CurrConfigBytesRem, ConfigDescriptorData, sizeof(ConfigDescriptorData)))
{ {
case HOST_GETCONFIG_Successful: case HOST_GETCONFIG_Successful:
break; break;

Loading…
Cancel
Save