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

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

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index 90375b0..816e763 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -309,41 +309,19 @@
                                 *\r
                                 *  \note This is not applicable for non CONTROL type endpoints.                         \r
                                 */\r
                                 *\r
                                 *  \note This is not applicable for non CONTROL type endpoints.                         \r
                                 */\r

-                               static inline void Endpoint_ClearControlSETUP(void);\r
+                               static inline void Endpoint_ClearSETUP(void);\r

                                \r
                                \r

-                               /** Sends an IN packet to the host on the currently selected CONTROL type endpoint, freeing up the\r
-                                *  endpoint for the next packet.\r
-                                *\r
-                                *  \ingroup Group_EndpointPacketManagement\r
-                                *\r
-                                *  \note For non CONTROL type endpoints, use Endpoint_ClearIN() instead.                        \r
-                                */\r
-                               static inline void Endpoint_ClearControlIN(void);\r
-                               \r
-                               /** Acknowledges an OUT packet to the host on the currently selected CONTROL type endpoint, freeing\r
-                                *  up the endpoint for the next packet.\r
+                               /** Sends an IN packet to the host on the currently selected endpoint, freeing up the endpoint for the\r
+                                *  next packet and switching to the alternative endpoint bank if double banked.\r

                                 *\r
                                 *  \ingroup Group_EndpointPacketManagement\r
                                 *\r
                                 *  \ingroup Group_EndpointPacketManagement\r

-                                *\r
-                                *  \note For non CONTROL type endpoints, use Endpoint_ClearOUT() instead.\r
-                                */\r
-                               static inline void Endpoint_ClearControlOUT(void);\r
-                               \r
-                               /** Sends an IN packet to the host on the currently selected non CONTROL type endpoint, freeing\r
-                                *  up the endpoint for the next packet and switching to the alternative endpoint bank if double banked.\r
-                                *\r
-                                *  \ingroup Group_EndpointPacketManagement\r
-                                *\r
-                                *  \note For CONTROL type endpoints, use Endpoint_ClearControlIN() instead.\r

                                 */\r
                                static inline void Endpoint_ClearIN(void);\r
                                \r
                                 */\r
                                static inline void Endpoint_ClearIN(void);\r
                                \r

-                               /** Acknowledges an OUT packet to the host on the currently selected non CONTROL type endpoint, freeing\r
-                                *  up the endpoint for the next packet and switching to the alternative endpoint bank if double banked.\r
+                               /** Acknowledges an OUT packet to the host on the currently selected endpoint, freeing up the endpoint\r
+                                *  for the next packet and switching to the alternative endpoint bank if double banked.\r

                                 *\r
                                 *  \ingroup Group_EndpointPacketManagement\r
                                 *\r
                                 *  \ingroup Group_EndpointPacketManagement\r

-                                *\r
-                                *  \note For CONTROL type endpoints, use Endpoint_ClearControlOUT() instead.\r

                                 */\r
                                static inline void Endpoint_ClearOUT(void);\r
                                \r
                                 */\r
                                static inline void Endpoint_ClearOUT(void);\r
                                \r


@@ -417,11 +395,7 @@
 \r
                                #define Endpoint_IsSETUPReceived()            ((UEINTX & (1 << RXSTPI)) ? true : false)\r
 \r
 \r
                                #define Endpoint_IsSETUPReceived()            ((UEINTX & (1 << RXSTPI)) ? true : false)\r
 \r

-                               #define Endpoint_ClearControlSETUP()          MACROS{ UEINTX &= ~(1 << RXSTPI); }MACROE\r
-\r
-                               #define Endpoint_ClearControlIN()             MACROS{ UEINTX &= ~(1 << TXINI); }MACROE\r
-\r
-                               #define Endpoint_ClearControlOUT()            MACROS{ UEINTX &= ~(1 << RXOUTI); }MACROE\r
+                               #define Endpoint_ClearSETUP()                 MACROS{ UEINTX &= ~(1 << RXSTPI); }MACROE\r

 \r
                                #define Endpoint_ClearIN()                    MACROS{ uint8_t Temp = UEINTX; UEINTX = (Temp & ~(1 << TXINI)); \\r
                                                                                      UEINTX = (Temp & ~(1 << FIFOCON)); }MACROE\r
 \r
                                #define Endpoint_ClearIN()                    MACROS{ uint8_t Temp = UEINTX; UEINTX = (Temp & ~(1 << TXINI)); \\r
                                                                                      UEINTX = (Temp & ~(1 << FIFOCON)); }MACROE\r


@@ -900,7 +874,7 @@
                        /** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in little endian,\r
                         *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared\r
                         *  in both failure and success states; the user is responsible for manually clearing the setup OUT to\r
                        /** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in little endian,\r
                         *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared\r
                         *  in both failure and success states; the user is responsible for manually clearing the setup OUT to\r

-                        *  finalize the transfer via the Endpoint_ClearControlOUT() macro.\r
+                        *  finalize the transfer via the Endpoint_ClearOUT() macro.\r

                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r


@@ -919,7 +893,7 @@
                        /** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,\r
                         *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared\r
                         *  in both failure and success states; the user is responsible for manually clearing the setup OUT to\r
                        /** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,\r
                         *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared\r
                         *  in both failure and success states; the user is responsible for manually clearing the setup OUT to\r

-                        *  finalize the transfer via the Endpoint_ClearControlOUT() macro.\r
+                        *  finalize the transfer via the Endpoint_ClearOUT() macro.\r

                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r


@@ -938,7 +912,7 @@
                        /** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,\r
                         *  discarding fully read packets from the host as needed. The device IN acknowledgement is not\r
                         *  automatically sent after success or failure states; the user is responsible for manually sending the\r
                        /** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,\r
                         *  discarding fully read packets from the host as needed. The device IN acknowledgement is not\r
                         *  automatically sent after success or failure states; the user is responsible for manually sending the\r

-                        *  setup IN to finalize the transfer via the Endpoint_ClearControlIN() macro.\r
+                        *  setup IN to finalize the transfer via the Endpoint_ClearIN() macro.\r

                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r


@@ -952,12 +926,12 @@
                         *\r
                         *  \return A value from the Endpoint_ControlStream_RW_ErrorCodes_t enum.\r
                         */\r
                         *\r
                         *  \return A value from the Endpoint_ControlStream_RW_ErrorCodes_t enum.\r
                         */\r

-                       uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)  ATTR_NON_NULL_PTR_ARG(1);\r
+                       uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);\r

 \r
                        /** Reads the given number of bytes from the CONTROL endpoint from the given buffer in big endian,\r
                         *  discarding fully read packets from the host as needed. The device IN acknowledgement is not\r
                         *  automatically sent after success or failure states; the user is responsible for manually sending the\r
 \r
                        /** Reads the given number of bytes from the CONTROL endpoint from the given buffer in big endian,\r
                         *  discarding fully read packets from the host as needed. The device IN acknowledgement is not\r
                         *  automatically sent after success or failure states; the user is responsible for manually sending the\r

-                        *  setup IN to finalize the transfer via the Endpoint_ClearControlIN() macro.\r
+                        *  setup IN to finalize the transfer via the Endpoint_ClearIN() macro.\r

                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r
                         *\r
                         *  \note This routine should only be used on CONTROL type endpoints.\r
                         *\r


@@ -971,7 +945,7 @@
                         *\r
                         *  \return A value from the Endpoint_ControlStream_RW_ErrorCodes_t enum.\r
                         */\r
                         *\r
                         *  \return A value from the Endpoint_ControlStream_RW_ErrorCodes_t enum.\r
                         */\r

-                       uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)  ATTR_NON_NULL_PTR_ARG(1);               \r
+                       uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);                \r

                        \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                        \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r