Removed specialized Endpoint_ClearControl* and Pipe_ClearControl* macros in favour...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / Pipe.h

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index c4a58b4..3f512c0 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -420,38 +420,16 @@
                                 */\r
                                static inline bool Pipe_IsSETUPSent(void);\r
                                \r
-                               /** Acknowledges the reception of a setup IN request from the attached device on the currently selected\r
-                                *  CONTROL type pipe, freeing the bank ready for the next packet.\r
-                                *\r
-                                *  \ingroup Group_PipePacketManagement\r
-                                *\r
-                                *  \note For non CONTROL type pipes, use Pipe_ClearIN() instead.                        \r
-                                */\r
-                               static inline void Pipe_ClearControlIN(void);\r
-\r
-                               /** Sends the currently selected pipe's contents to the device as an OUT packet on the selected pipe, freeing\r
-                                *  the bank ready for the next packet.\r
-                                *\r
-                                *  \ingroup Group_PipePacketManagement\r
-                                *\r
-                                *  \note For non CONTROL type pipes, use Pipe_ClearOUT() instead.      \r
-                                */\r
-                               static inline void Pipe_ClearControlOUT(void);\r
-\r
                                /** Sends the currently selected CONTROL type pipe's contents to the device as a SETUP packet.\r
                                 *\r
-                                *  \ingroup Group_PipePacketManagement\r
-                                *\r
-                                *  \note This is not applicable for non CONTROL type pipes.                    \r
+                                *  \ingroup Group_PipePacketManagement         \r
                                 */\r
-                               static inline void Pipe_ClearControlSETUP(void);\r
+                               static inline void Pipe_ClearSETUP(void);\r
 \r
                                /** Acknowledges the reception of a setup IN request from the attached device on the currently selected\r
                                 *  pipe, freeing the bank ready for the next packet.\r
                                 *\r
                                 *  \ingroup Group_PipePacketManagement\r
-                                *\r
-                                *  \note For CONTROL type pipes, use Pipe_ClearControlIN() instead.    \r
                                 */\r
                                static inline void Pipe_ClearIN(void);\r
 \r
@@ -459,8 +437,6 @@
                                 *  the bank ready for the next packet.\r
                                 *\r
                                 *  \ingroup Group_PipePacketManagement\r
-                                *\r
-                                *  \note For CONTROL type pipes, use Pipe_ClearControlOUT() instead.   \r
                                 */\r
                                static inline void Pipe_ClearOUT(void);\r
 \r
@@ -554,16 +530,10 @@
                                #define Pipe_ClearIN()                 MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << RXINI)); \\r
                                                                               UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE\r
 \r
-                               #define Pipe_ClearControlIN()          MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << RXINI)); \\r
-                                                                              UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE\r
-\r
                                #define Pipe_ClearOUT()                MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXOUTI)); \\r
                                                                               UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE\r
                                \r
-                               #define Pipe_ClearControlOUT()         MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXOUTI)); \\r
-                                                                              UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE\r
-\r
-                               #define Pipe_ClearControlSETUP()       MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXSTPI)); \\r
+                               #define Pipe_ClearSETUP()              MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXSTPI)); \\r
                                                                               UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE\r
 \r
                                #define Pipe_IsNAKReceived()           ((UPINTX & (1 << NAKEDI)) ? true : false)\r