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

4 files changed, 8 insertions, 10 deletions

diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
index 5857fba19..67e72e6bc 100644
--- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
+++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
@@ -31,8 +31,8 @@
 #include "ConfigDescriptor.h"

 

 #if defined(USB_CAN_BE_HOST)

-uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr,

-                                      void* BufferPtr, uint16_t BufferSize)

+uint8_t USB_Host_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr,

+                                           void* BufferPtr, uint16_t BufferSize)

 {

 	uint8_t ErrorCode;

 	uint8_t ConfigHeader[sizeof(USB_Descriptor_Configuration_Header_t)];

diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
index c2dc5038a..76039c785 100644
--- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
+++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
@@ -155,7 +155,7 @@
 			uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, void** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine);

 			

 		/* 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

 			{

 				HOST_GETCONFIG_Successful       = 0, /**< No error occurred while retrieving the configuration descriptor */

@@ -202,8 +202,8 @@
 			 *

 			 *  \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,

-			                                      uint16_t BufferSize) ATTR_NON_NULL_PTR_ARG(2, 3);

+			uint8_t USB_Host_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr, void* BufferPtr,

+			                                           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.

 			 *  The bytes remaining value is automatically decremented.

diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 93a9a51dd..5598473ff 100644
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -33,7 +33,4 @@
   *      -# AVR32 UC3B series microcontrollers

   *      -# Atmel ARM7 series microcontrollers

   *      -# Other (commercial) C compilers

-  *  - Extend AVRISP project

-  *      -# Add alternate USB-to-Serial mode

-  *      -# Add alternate USB-to-TWI mode

   */

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index e430e2d26..fe58efa1f 100644
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -16,6 +16,7 @@
  *    - 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

  *      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>

  *

@@ -29,7 +30,7 @@
  *      call to SPI_Init() before using the Dataflash driver

  *

  *  <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

  *      call to the function to retrieve, size check and validate the Configuration Descriptor rather than having the user

  *      application perform these intermediatary steps.

@@ -67,7 +68,7 @@
  *

  *  <b>Host Mode</b>

  *    - 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

  *      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