X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7f9f97c792dee6875fbca9806422bdd7d6c5a657..d03d6513d0d24cf63225c8d3dfa07675d9107f40:/LUFA/Drivers/USB/LowLevel/Endpoint.h

diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index ff0b640a4..b18ff456d 100644
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -28,6 +28,16 @@
   this software.
 */
 
+/** \file
+ *  \brief USB device endpoint management definitions.
+ *
+ *  This file contains structures, function prototypes and macros related to the management of the device's
+ *  data endpoints when the library is initialized in USB device mode.
+ *
+ *  \note This file should not be included directly. It is automatically included as needed by the USB driver
+ *        dispatch header located in LUFA/Drivers/USB/USB.h.
+ */
+
 /** \ingroup Group_USB
  *  @defgroup Group_EndpointManagement Endpoint Management
  *
@@ -83,6 +93,11 @@
 			extern "C" {
 		#endif
 
+	/* Preprocessor Checks: */
+		#if !defined(__INCLUDE_FROM_USB_DRIVER)
+			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
+		#endif
+		
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** Endpoint data direction mask for \ref Endpoint_ConfigureEndpoint(). This indicates that the endpoint
@@ -126,6 +141,11 @@
 			 */
 			#define ENDPOINT_EPNUM_MASK                   0x07
 
+			/** Endpoint direction mask, for masking against endpoint addresses to retrieve the endpoint's
+			 *  direction for comparing with the ENDPOINT_DESCRIPTOR_DIR_* masks.
+			 */
+			#define ENDPOINT_EPDIR_MASK                   0x80
+
 			/** Endpoint bank size mask, for masking against endpoint addresses to retrieve the endpoint's
 			 *  bank size in the device.
 			 */
@@ -385,15 +405,13 @@
 				#define Endpoint_ClearSETUP()                 MACROS{ UEINTX &= ~(1 << RXSTPI); }MACROE
 
 				#if !defined(CONTROL_ONLY_DEVICE)
-					#define Endpoint_ClearIN()                MACROS{ uint8_t Temp = UEINTX; UEINTX = (Temp & ~(1 << TXINI)); \
-					                                                  UEINTX = (Temp & ~(1 << FIFOCON)); }MACROE
+					#define Endpoint_ClearIN()                MACROS{ UEINTX &= ~((1 << TXINI) | (1 << FIFOCON)); }MACROE
 				#else
 					#define Endpoint_ClearIN()                MACROS{ UEINTX &= ~(1 << TXINI); }MACROE
 				#endif
 
 				#if !defined(CONTROL_ONLY_DEVICE)
-					#define Endpoint_ClearOUT()               MACROS{ uint8_t Temp = UEINTX; UEINTX = (Temp & ~(1 << RXOUTI)); \
-					                                                  UEINTX = (Temp & ~(1 << FIFOCON)); }MACROE
+					#define Endpoint_ClearOUT()               MACROS{ UEINTX &= ~((1 << RXOUTI) | (1 << FIFOCON)); }MACROE
 				#else
 					#define Endpoint_ClearOUT()               MACROS{ UEINTX &= ~(1 << RXOUTI); }MACROE			
 				#endif
@@ -727,7 +745,8 @@
 			 *  The banking mode may be either \ref ENDPOINT_BANK_SINGLE or \ref ENDPOINT_BANK_DOUBLE.
 			 *
 			 *  \note The default control endpoint does not have to be manually configured, as it is automatically
-			 *  configured by the library internally.
+			 *        configured by the library internally.
+			 *        \n\n
 			 *
 			 *  \note This routine will select the specified endpoint, and the endpoint will remain selected
 			 *        once the routine completes regardless of if the endpoint configuration succeeds.
@@ -951,6 +970,7 @@
 			 *
 			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
 			 *        to clear the status stage when using this routine in a control transaction.
+			 *        \n\n
 			 *
 			 *  \note This routine should only be used on CONTROL type endpoints.
 			 *
@@ -970,6 +990,7 @@
 			 *
 			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
 			 *        to clear the status stage when using this routine in a control transaction.
+			 *        \n\n
 			 *
 			 *  \note This routine should only be used on CONTROL type endpoints.
 			 *
@@ -989,8 +1010,10 @@
 			 *
 			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
 			 *        to clear the status stage when using this routine in a control transaction.
+			 *        \n\n
 			 *
 			 *  \note The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
+			 *        \n\n
 			 *
 			 *  \note This routine should only be used on CONTROL type endpoints.
 			 *
@@ -1013,6 +1036,7 @@
 			 *
 			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
 			 *        to clear the status stage when using this routine in a control transaction.
+			 *        \n\n
 			 *
 			 *  \note This routine should only be used on CONTROL type endpoints.
 			 *
@@ -1032,6 +1056,7 @@
 			 *
 			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
 			 *        to clear the status stage when using this routine in a control transaction.
+			 *        \n\n
 			 *
 			 *  \note This routine should only be used on CONTROL type endpoints.
 			 *
@@ -1051,8 +1076,10 @@
 			 *
 			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
 			 *        to clear the status stage when using this routine in a control transaction.
+			 *        \n\n
 			 *
 			 *  \note The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
+			 *        \n\n
 			 *
 			 *  \note This routine should only be used on CONTROL type endpoints.
 			 *
@@ -1075,6 +1102,7 @@
 			 *
 			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
 			 *        to clear the status stage when using this routine in a control transaction.
+			 *        \n\n
 			 *
 			 *  \note This routine should only be used on CONTROL type endpoints.
 			 *
@@ -1094,6 +1122,7 @@
 			 *
 			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
 			 *        to clear the status stage when using this routine in a control transaction.
+			 *        \n\n
 			 *
 			 *  \note This routine should only be used on CONTROL type endpoints.
 			 *
@@ -1116,6 +1145,7 @@
 			 *
 			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
 			 *        to clear the status stage when using this routine in a control transaction.
+			 *        \n\n
 			 *
 			 *  \note This routine should only be used on CONTROL type endpoints.
 			 *
@@ -1135,6 +1165,7 @@
 			 *
 			 *  \note This function automatically clears the control transfer's status stage. Do not manually attempt
 			 *        to clear the status stage when using this routine in a control transaction.
+			 *        \n\n
 			 *
 			 *  \note This routine should only be used on CONTROL type endpoints.
 			 *