Inline USB management functions in the Class drivers which are standardized but currently unused, to prevent them from using up unneccesary cycles and flash in the user application.

5 files changed, 38 insertions, 38 deletions

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/Audio.c
index 52d299f2a..89115f2db 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -84,11 +84,6 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* AudioInterfac
 	return true;

 }

 

-void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)

-{

-	(void)AudioInterfaceInfo;

-}

-

 bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)

 {

 	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h
index e516b7101..c6b68b0cb 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/LUFA/Drivers/USB/Class/Device/Audio.h
@@ -112,13 +112,6 @@
 			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state

 			 */

 			void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);

-

-			/** General management task for a given Audio class interface, required for the correct operation of the interface. This should

-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().

-			 *

-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state

-			 */

-			void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);

 			

 			/** Determines if the given audio interface is ready for a sample to be read from it, and selects the streaming

 			 *  OUT endpoint ready for reading.

@@ -145,6 +138,17 @@
 			bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);

 

 		/* Inline Functions: */

+			/** General management task for a given Audio class interface, required for the correct operation of the interface. This should

+			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().

+			 *

+			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state

+			 */

+			static inline void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);

+			static inline void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)

+			{

+				(void)AudioInterfaceInfo;

+			}

+

 			/** Reads the next 8-bit audio sample from the current audio interface.

 			 *

 			 *  \note This should be preceded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that

diff --git a/LUFA/Drivers/USB/Class/Device/HID.h b/LUFA/Drivers/USB/Class/Device/HID.h
index 14a5ff601..f62c08c39 100644
--- a/LUFA/Drivers/USB/Class/Device/HID.h
+++ b/LUFA/Drivers/USB/Class/Device/HID.h
@@ -131,20 +131,6 @@
 			 */

 			void HID_Device_USBTask(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);

 			

-			/** Indicates that a millisecond of idle time has elapsed on the given HID interface, and the interface's idle count should be

-			 *  decremented. This should be called once per millisecond so that hardware key-repeats function correctly. It is recommended

-			 *  that this be called by the \ref EVENT_USB_Device_StartOfFrame() event, once SOF events have been enabled via

-			 *  \ref USB_Device_EnableSOFEvents();.

-			 *

-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class configuration and state

-			 */

-			static inline void HID_Device_MillisecondElapsed(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo);

-			static inline void HID_Device_MillisecondElapsed(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo)

-			{

-				if (HIDInterfaceInfo->State.IdleMSRemaining)

-				  HIDInterfaceInfo->State.IdleMSRemaining--;

-			}

-			

 			/** HID class driver callback for the user creation of a HID IN report. This callback may fire in response to either

 			 *  HID class control requests from the host, or by the normal HID endpoint polling procedure. Inside this callback the

 			 *  user is responsible for the creation of the next HID input report to be sent to the host.

@@ -178,6 +164,21 @@
 			                                          const void* ReportData, const uint16_t ReportSize) ATTR_NON_NULL_PTR_ARG(1)

 			                                          ATTR_NON_NULL_PTR_ARG(3);

 

+		/* Inline Functions: */

+			/** Indicates that a millisecond of idle time has elapsed on the given HID interface, and the interface's idle count should be

+			 *  decremented. This should be called once per millisecond so that hardware key-repeats function correctly. It is recommended

+			 *  that this be called by the \ref EVENT_USB_Device_StartOfFrame() event, once SOF events have been enabled via

+			 *  \ref USB_Device_EnableSOFEvents();.

+			 *

+			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class configuration and state

+			 */

+			static inline void HID_Device_MillisecondElapsed(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo);

+			static inline void HID_Device_MillisecondElapsed(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo)

+			{

+				if (HIDInterfaceInfo->State.IdleMSRemaining)

+				  HIDInterfaceInfo->State.IdleMSRemaining--;

+			}

+			

 	/* Disable C linkage for C++ Compilers: */

 		#if defined(__cplusplus)

 			}

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
index a01d19639..bc191d77a 100644
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -65,11 +65,6 @@ bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInter
 	return true;

 }

 

-void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)

-{

-	(void)MIDIInterfaceInfo;

-}

-

 uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo, MIDI_EventPacket_t* const Event)

 {

 	if (USB_DeviceState != DEVICE_STATE_Configured)

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h
index 3899f6e71..fef789024 100644
--- a/LUFA/Drivers/USB/Class/Device/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -104,13 +104,6 @@
 			 */		

 			void MIDI_Device_ProcessControlRequest(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);

 

-			/** General management task for a given MIDI class interface, required for the correct operation of the interface. This should

-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().

-			 *

-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state

-			 */

-			void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);

-

 			/** Sends a MIDI event packet to the host. If no host is connected, the event packet is discarded.

 			 *

 			 *  \note This function must only be called when the Device state machine is in the DEVICE_STATE_Configured state or

@@ -137,6 +130,18 @@
 			bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo,

 			                                    MIDI_EventPacket_t* const Event) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);

 

+		/* Inline Functions: */

+			/** General management task for a given MIDI class interface, required for the correct operation of the interface. This should

+			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().

+			 *

+			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state

+			 */

+			static inline void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo);

+			static inline void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)

+			{

+				(void)MIDIInterfaceInfo;

+			}		

+

 	/* Disable C linkage for C++ Compilers: */

 		#if defined(__cplusplus)

 			}