The Audio_Device_IsSampleReceived() and Audio_Device_IsReadyForNextSa…

…mple() functions are now inline, to reduce overhead. git-svn-id: http://lufa-lib.googlecode.com/svn@1224 d5102386-fcda-11dd-9fdb-3debd5008f28
hanshuebner · Apr 29, 2010 · bf6066c · bf6066c
1 parent c771b4c
commit bf6066c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 32 deletions.
diff --git a/trunk/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c b/trunk/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
@@ -197,7 +197,7 @@ int main(void)
 					break;
 				}
 
-				puts_P(PSTR("\r\nContents of first block:"));
+				puts_P(PSTR("\r\nContents of first block:\r\n"));
 
 				for (uint16_t Chunk = 0; Chunk < (DiskCapacity.BlockSize >> 4); Chunk++)
 				{

diff --git a/trunk/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c b/trunk/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c
@@ -28,6 +28,10 @@
   this software.
 */
 
+/*
+	TODO: Add local to remote device connections
+ */
+
 #define  INCLUDE_FROM_BLUETOOTHHCICOMMANDS_C
 #include "BluetoothHCICommands.h"
 

diff --git a/trunk/LUFA/Drivers/USB/Class/Device/Audio.c b/trunk/LUFA/Drivers/USB/Class/Device/Audio.c
@@ -86,22 +86,4 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* AudioInterfac
 	return true;
 }
 
-bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
-	  return false;
-
-	Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataOUTEndpointNumber);	
-	return Endpoint_IsOUTReceived();
-}
-
-bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
-	  return false;
-
-	Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber);
-	return Endpoint_IsINReady();
-}
-
 #endif
diff --git a/trunk/LUFA/Drivers/USB/Class/Device/Audio.h b/trunk/LUFA/Drivers/USB/Class/Device/Audio.h
@@ -129,6 +129,18 @@
 			 */
 			void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
 
+		/* 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;
+			}
+
 			/** 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.
 			 *
@@ -138,8 +150,15 @@
 			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state
 			 *
 			 *  \return Boolean true if the given Audio interface has a sample to be read, false otherwise
-			 */
-			bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);
+			 */		
+			static inline bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
+			{
+				if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
+				  return false;
+
+				Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataOUTEndpointNumber);	
+				return Endpoint_IsOUTReceived();
+			}
 
 			/** Determines if the given audio interface is ready to accept the next sample to be written to it, and selects
 			 *  the streaming IN endpoint ready for writing.
@@ -151,18 +170,13 @@
 			 *
 			 *  \return Boolean true if the given Audio interface is ready to accept the next sample, false otherwise
 			 */
-			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)
+			static inline bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 			{
-				(void)AudioInterfaceInfo;
+				if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
+				  return false;
+
+				Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataINEndpointNumber);
+				return Endpoint_IsINReady();
 			}
 
 			/** Reads the next 8-bit audio sample from the current audio interface.

diff --git a/trunk/LUFA/ManPages/ChangeLog.txt b/trunk/LUFA/ManPages/ChangeLog.txt
@@ -30,6 +30,7 @@
   *  - Removed two-step endpoint/pipe bank clear and switch sequence for smaller, faster endpoint/pipe code
   *  - The USB_Init() function no longer calls sei() - the user is now responsible for enabling interrupts when they are ready
   *    for them to be enabled (thanks to Andrei Krainev)
+  *  - The Audio_Device_IsSampleReceived() and Audio_Device_IsReadyForNextSample() functions are now inline, to reduce overhead
   *
   *  <b>Fixed:</b>
   *  - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin