Changed Audio Class driver sample read/write functions to be inline, to reduce the...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Device / Audio.h

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/Audio.h
index 12a8acd..67699fd 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/LUFA/Drivers/USB/Class/Device/Audio.h
@@ -120,6 +120,25 @@
                         */\r
                        void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
                        \r
+                       /** Determines if the given audio interface is ready for a sample to be read from it, and selects the streaming\r
+                        *  OUT endpoint ready for reading.\r
+                        *\r
+                        *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                        *\r
+                        *  \return Boolean true if the given Audio interface has a sample to be read, false otherwise\r
+                        */\r
+                       bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);\r
+\r
+                       /** Determines if the given audio interface is ready to accept the next sample to be written to it, and selects\r
+                        *  the streaming IN endpoint ready for writing.\r
+                        *\r
+                        *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                        *\r
+                        *  \return Boolean true if the given Audio interface is ready to accept the next sample, false otherwise\r
+                        */\r
+                       bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);\r
+\r
+               /* Inline Functions: */\r
                        /** Reads the next 8-bit audio sample from the current audio interface.\r
                         *\r
                         *  \note This should be preceeded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that\r
@@ -129,7 +148,18 @@
                         *\r
                         *  \return  Signed 8-bit audio sample from the audio interface\r
                         */\r
-                       int8_t Audio_Device_ReadSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
+                       static inline int8_t Audio_Device_ReadSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_ALWAYS_INLINE;\r
+                       static inline int8_t Audio_Device_ReadSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r
+                       {\r
+                               int8_t Sample;\r
+\r
+                               Sample = Endpoint_Read_Byte();\r
+\r
+                               if (!(Endpoint_BytesInEndpoint()))\r
+                                 Endpoint_ClearOUT();\r
+                               \r
+                               return Sample;\r
+                       }\r
 \r
                        /** Reads the next 16-bit audio sample from the current audio interface.\r
                         *\r
@@ -140,7 +170,18 @@
                         *\r
                         *  \return  Signed 16-bit audio sample from the audio interface\r
                         */\r
-                       int16_t Audio_Device_ReadSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
+                       static inline int16_t Audio_Device_ReadSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_ALWAYS_INLINE;\r
+                       static inline int16_t Audio_Device_ReadSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r
+                       {\r
+                               int16_t Sample;\r
+\r
+                               Sample = (int16_t)Endpoint_Read_Word_LE();\r
+                                         \r
+                               if (!(Endpoint_BytesInEndpoint()))\r
+                                 Endpoint_ClearOUT();\r
+\r
+                               return Sample;\r
+                       }\r
 \r
                        /** Reads the next 24-bit audio sample from the current audio interface.\r
                         *\r
@@ -150,7 +191,18 @@
                         *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
                         *  \return  Signed 24-bit audio sample from the audio interface\r
                         */\r
-                       int32_t Audio_Device_ReadSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
+                       static inline int32_t Audio_Device_ReadSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_ALWAYS_INLINE;\r
+                       static inline int32_t Audio_Device_ReadSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)\r
+                       {\r
+                               int32_t Sample;\r
+\r
+                               Sample = (((uint32_t)Endpoint_Read_Byte() << 16) | Endpoint_Read_Word_LE());\r
+                                         \r
+                               if (!(Endpoint_BytesInEndpoint()))\r
+                                 Endpoint_ClearOUT();\r
+\r
+                               return Sample;\r
+                       }\r
 \r
                        /** Writes the next 8-bit audio sample to the current audio interface.\r
                         *\r
@@ -160,7 +212,16 @@
                         *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
                         *  \param[in] Sample  Signed 8-bit audio sample\r
                         */\r
-                       void Audio_Device_WriteSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int8_t Sample) ATTR_NON_NULL_PTR_ARG(1);\r
+                       static inline void Audio_Device_WriteSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,\r
+                                                                    const int8_t Sample) ATTR_ALWAYS_INLINE;\r
+                       static inline void Audio_Device_WriteSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,\r
+                                                                    const int8_t Sample)\r
+                       {\r
+                               Endpoint_Write_Byte(Sample);\r
+\r
+                               if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)\r
+                                 Endpoint_ClearIN();\r
+                       }\r
 \r
                        /** Writes the next 16-bit audio sample to the current audio interface.\r
                         *\r
@@ -170,7 +231,16 @@
                         *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
                         *  \param[in] Sample  Signed 16-bit audio sample\r
                         */\r
-                       void Audio_Device_WriteSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int16_t Sample) ATTR_NON_NULL_PTR_ARG(1);\r
+                       static inline void Audio_Device_WriteSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,\r
+                                                                     const int16_t Sample) ATTR_ALWAYS_INLINE;\r
+                       static inline void Audio_Device_WriteSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,\r
+                                                                     const int16_t Sample)\r
+                       {\r
+                               Endpoint_Write_Word_LE(Sample);\r
+\r
+                               if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)\r
+                                 Endpoint_ClearIN();\r
+                       }\r
 \r
                        /** Writes the next 24-bit audio sample to the current audio interface.\r
                         *\r
@@ -180,23 +250,17 @@
                         *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
                         *  \param[in] Sample  Signed 24-bit audio sample\r
                         */\r
-                       void Audio_Device_WriteSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const int32_t Sample) ATTR_NON_NULL_PTR_ARG(1);\r
-\r
-                       /** Determines if the given audio interface is ready for a sample to be read from it.\r
-                        *\r
-                        *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
-                        *\r
-                        *  \return Boolean true if the given Audio interface has a sample to be read, false otherwise\r
-                        */\r
-                       bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
+                       static inline void Audio_Device_WriteSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,\r
+                                                                     const int32_t Sample) ATTR_ALWAYS_INLINE;\r
+                       static inline void Audio_Device_WriteSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,\r
+                                                                     const int32_t Sample)\r
+                       {\r
+                               Endpoint_Write_Byte(Sample >> 16);\r
+                               Endpoint_Write_Word_LE(Sample);\r
 \r
-                       /** Determines if the given audio interface is ready to accept the next sample to be written to it.\r
-                        *\r
-                        *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
-                        *\r
-                        *  \return Boolean true if the given Audio interface is ready to accept the next sample, false otherwise\r
-                        */\r
-                       bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
+                               if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)\r
+                                 Endpoint_ClearIN();\r
+                       }\r
 \r
        /* Disable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r