Fix a bug in the Still Image Host Class driver where the returned block status code...

[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 2c91dae..cf79e15 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/LUFA/Drivers/USB/Class/Device/Audio.h
@@ -66,21 +66,21 @@
                                const struct\r
                                {\r
                                        uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this\r
                                const struct\r
                                {\r
                                        uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this\r

-                                                                                                               *   structure controls.\r
+                                                                                                               *   structure controls\r

                                                                                                                */\r
 \r
                                                                                                                */\r
 \r

-                                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the incomming Audio Streaming data, if available\r
-                                                                                                       *   (zero if unused).\r
+                                       uint8_t  DataINEndpointNumber; /**< Endpoint number of the incoming Audio Streaming data, if available\r
+                                                                                                       *   (zero if unused)\r

                                                                                                        */\r
                                                                                                        */\r

-                                       uint16_t DataINEndpointSize; /**< Size in bytes of the incomming Audio Streaming data endpoint, if available\r
-                                                                                                 *   (zero if unused).\r
+                                       uint16_t DataINEndpointSize; /**< Size in bytes of the incoming Audio Streaming data endpoint, if available\r
+                                                                                                 *   (zero if unused)\r

                                                                                                  */\r
 \r
                                        uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the outgoing Audio Streaming data, if available\r
                                                                                                  */\r
 \r
                                        uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the outgoing Audio Streaming data, if available\r

-                                                                                                        *   (zero if unused).\r
+                                                                                                        *   (zero if unused)\r

                                                                                                         */\r
                                        uint16_t DataOUTEndpointSize; /**< Size in bytes of the outgoing Audio Streaming data endpoint, if available\r
                                                                                                         */\r
                                        uint16_t DataOUTEndpointSize; /**< Size in bytes of the outgoing Audio Streaming data endpoint, if available\r

-                                                                                                  *   (zero if unused).\r
+                                                                                                  *   (zero if unused)\r

                                                                                                   */                   \r
                                } Config; /**< Config data for the USB class interface within the device. All elements in this section\r
                                           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.\r
                                                                                                   */                   \r
                                } Config; /**< Config data for the USB class interface within the device. All elements in this section\r
                                           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.\r


@@ -97,106 +97,176 @@
                \r
                /* Function Prototypes: */\r
                        /** Configures the endpoints of a given Audio interface, ready for use. This should be linked to the library\r
                \r
                /* Function Prototypes: */\r
                        /** Configures the endpoints of a given Audio interface, ready for use. This should be linked to the library\r

-                        *  \ref EVENT_USB_ConfigurationChanged() event so that the endpoints are configured when the configuration containing the\r
+                        *  \ref EVENT_USB_Device_ConfigurationChanged() event so that the endpoints are configured when the configuration containing the\r

                         *  given Audio interface is selected.\r
                         *\r
                         *  given Audio interface is selected.\r
                         *\r

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

                         *\r
                         *\r

-                        *  \return Boolean true if the endpoints were sucessfully configured, false otherwise\r
+                        *  \return Boolean true if the endpoints were successfully configured, false otherwise\r

                         */\r
                         */\r

-                       bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);\r
+                       bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r

 \r
 \r

-                       /** Processes incomming control requests from the host, that are directed to the given Audio class interface. This should be\r
-                        *  linked to the library \ref EVENT_USB_UnhandledControlPacket() event.\r
+                       /** Processes incoming control requests from the host, that are directed to the given Audio class interface. This should be\r
+                        *  linked to the library \ref EVENT_USB_Device_UnhandledControlRequest() event.\r

                         *\r
                         *\r

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

                         */\r
                         */\r

-                       void Audio_Device_ProcessControlPacket(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);\r
+                       void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r

 \r
                        /** General management task for a given Audio class interface, required for the correct operation of the interface. This should\r
                         *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().\r
                         *\r
 \r
                        /** General management task for a given Audio class interface, required for the correct operation of the interface. This should\r
                         *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().\r
                         *\r

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

                         */\r
                         */\r

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

                        \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
                        /** 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
+                        *  \note This should be preceded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that\r

                         *        the correct endpoint is selected and ready for data.\r
                         *\r
                         *        the correct endpoint is selected and ready for data.\r
                         *\r

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

                         *\r
                         *  \return  Signed 8-bit audio sample from the audio interface\r
                         */\r
                         *\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);\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
+                               (void)AudioInterfaceInfo;\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
 \r
                        /** Reads the next 16-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
+                        *  \note This should be preceded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that\r

                         *        the correct endpoint is selected and ready for data.\r
                         *\r
                         *        the correct endpoint is selected and ready for data.\r
                         *\r

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

                         *\r
                         *  \return  Signed 16-bit audio sample from the audio interface\r
                         */\r
                         *\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);\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
+                               (void)AudioInterfaceInfo;\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
 \r
                        /** Reads the next 24-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
+                        *  \note This should be preceded immediately by a call to the USB_Audio_IsSampleReceived() function to ensure that\r

                         *        the correct endpoint is selected and ready for data.\r
                         *\r
                         *        the correct endpoint is selected and ready for data.\r
                         *\r

-                        *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                        *  \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
                         *  \return  Signed 24-bit audio sample from the audio interface\r
                         */\r

-                       int32_t Audio_Device_ReadSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);\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
+                               (void)AudioInterfaceInfo;\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
 \r
                        /** Writes the next 8-bit audio sample to the current audio interface.\r
                         *\r

-                        *  \note This should be preceeded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that\r
+                        *  \note This should be preceded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that\r

                         *        the correct endpoint is selected and ready for data.\r
                         *\r
                         *        the correct endpoint is selected and ready for data.\r
                         *\r

-                        *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                        *  \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
                         *  \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);\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
 \r
                        /** Writes the next 16-bit audio sample to the current audio interface.\r
                         *\r

-                        *  \note This should be preceeded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that\r
+                        *  \note This should be preceded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that\r

                         *        the correct endpoint is selected and ready for data.\r
                         *\r
                         *        the correct endpoint is selected and ready for data.\r
                         *\r

-                        *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                        *  \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
                         *  \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);\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
 \r
                        /** Writes the next 24-bit audio sample to the current audio interface.\r
                         *\r

-                        *  \note This should be preceeded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that\r
+                        *  \note This should be preceded immediately by a call to the USB_Audio_IsReadyForNextSample() function to ensure that\r

                         *        the correct endpoint is selected and ready for data.\r
                         *\r
                         *        the correct endpoint is selected and ready for data.\r
                         *\r

-                        *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.\r
+                        *  \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
                         *  \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);\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);\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
 \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);\r
+                               if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpointSize)\r
+                                 Endpoint_ClearIN();\r
+                       }\r

 \r
        /* Disable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
 \r
        /* Disable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r