Deleted StdDescriptors.c, renamed USB_GetDescriptor() to CALLBACK_USB_GetDescriptor, moved ConfigDescriptor.c/.h from the LUFA/Drivers/USB/Class/ directory to LUFA/Drivers/USB/HighLevel/ in preperation for the new USB class APIs.

9 files changed, 15 insertions, 15 deletions

diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index 590b04130..0e2b3c79e 100644
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -209,7 +209,7 @@ USB_Descriptor_String_t ProductString =
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the

  *  USB host.

  */

-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

 {

 	const uint8_t  DescriptorType   = (wValue >> 8);

 	const uint8_t  DescriptorNumber = (wValue & 0xFF);

diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h
index 8bd6bdf85..d913f45c0 100644
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/Descriptors.h
@@ -89,7 +89,7 @@
 		} USB_Descriptor_Configuration_t;

 

 	/* Function Prototypes: */

-		uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

-		                           ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

+											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

 

 #endif

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index 3caec538d..bc8e2ca1a 100644
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -113,6 +113,7 @@ LUFA_PATH = ../..
 # List C source files here. (C dependencies are automatically generated.)

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \

@@ -120,10 +121,9 @@ SRC = $(TARGET).c                                                 \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \

  	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \

-	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \

-	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \

+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \

 

 

diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c
index cff3cd523..d8b734b12 100644
--- a/Bootloaders/DFU/Descriptors.c
+++ b/Bootloaders/DFU/Descriptors.c
@@ -143,7 +143,7 @@ USB_Descriptor_String_t ProductString =
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the

  *  USB host.

  */

-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

 {

 	const uint8_t  DescriptorType   = (wValue >> 8);

 	const uint8_t  DescriptorNumber = (wValue & 0xFF);

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index 527fc50fd..570bb6e08 100644
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -124,7 +124,7 @@
 		} USB_Descriptor_Configuration_t;

 		

 	/* Function Prototypes: */

-		uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

-		                           ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

+											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

 

 #endif

diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index 94525c10b..4e51e299c 100644
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -113,6 +113,7 @@ LUFA_PATH = ../..
 # List C source files here. (C dependencies are automatically generated.)

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \

@@ -120,10 +121,9 @@ SRC = $(TARGET).c                                                 \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \

  	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \

-	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \

-	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \

+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \

 

  

diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index 62e2d2111..99db8cac5 100644
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -172,7 +172,7 @@ USB_Descriptor_String_t ProductString =
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the

  *  USB host.

  */

-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

 {

 	const uint8_t  DescriptorType   = (wValue >> 8);

 	const uint8_t  DescriptorNumber = (wValue & 0xFF);

diff --git a/Bootloaders/TeensyHID/Descriptors.h b/Bootloaders/TeensyHID/Descriptors.h
index 2b84734ca..11c6f0f46 100644
--- a/Bootloaders/TeensyHID/Descriptors.h
+++ b/Bootloaders/TeensyHID/Descriptors.h
@@ -85,7 +85,7 @@
 		#define DTYPE_Report              0x22

 

 	/* Function Prototypes: */

-		uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

-		                           ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

+		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)

+											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

 

 #endif

diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index d022c9315..de929edfb 100644
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -113,6 +113,7 @@ LUFA_PATH = ../..
 # List C source files here. (C dependencies are automatically generated.)

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

+	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \

@@ -120,10 +121,9 @@ SRC = $(TARGET).c                                                 \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \

  	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \

-	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \

-	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c      \

+	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \