X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/38039765346c7441208dbcb3fd3cf8f13b7ced58..ecaf872177e771b6b7e331b47a5b68832b5dd126:/LUFA/Drivers/USB/LowLevel/LowLevel.h

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.h b/LUFA/Drivers/USB/LowLevel/LowLevel.h
index 98deaaca1..07be4396d 100644
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.h
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.h
@@ -42,8 +42,10 @@
 		#include <avr/interrupt.h>
 		#include <stdbool.h>
 		
-		#include "USBMode.h"
+		#include "../HighLevel/USBMode.h"
+
 		#include "../../../Common/Common.h"
+		#include "../HighLevel/USBMode.h"
 		#include "../HighLevel/Events.h"
 		#include "../HighLevel/USBTask.h"
 		#include "../HighLevel/USBInterrupt.h"
@@ -109,20 +111,24 @@
 			 */
 			#define USB_MODE_DEVICE                    1
 
-			/** Mode mask for the USB_CurrentMode global and the USB_Init() function. This indicates that the
-			 *  USB interface is or should be initialized in the USB host mode.
-			 *
-			 *  \note Not all USB AVRs support host mode.
-			 */
-			#define USB_MODE_HOST                      2
-
-			/** Mode mask for the the USB_Init() function. This indicates that the USB interface should be
-			 *  initialized into whatever mode the UID pin of the USB AVR indicates, and that the device
-			 *  should swap over its mode when the level of the UID pin changes during operation.
-			 *
-			 *  \note Not all USB AVRs support host mode, and thus UID mode.
-			 */
-			#define USB_MODE_UID                       3
+			#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
+				/** Mode mask for the USB_CurrentMode global and the USB_Init() function. This indicates that the
+				 *  USB interface is or should be initialized in the USB host mode.
+				 *
+				 *  \note This token is not available on AVR models which do not support host mode.
+				 */
+				#define USB_MODE_HOST                      2
+			#endif
+			
+			#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
+				/** Mode mask for the the USB_Init() function. This indicates that the USB interface should be
+				 *  initialized into whatever mode the UID pin of the USB AVR indicates, and that the device
+				 *  should swap over its mode when the level of the UID pin changes during operation.
+				 *
+				 *  \note This token is not available on AVR models which do not support both host and device modes.
+				 */
+				#define USB_MODE_UID                       3
+			#endif
 			
 			/** Regulator disable option mask for USB_Init(). This indicates that the internal 3.3V USB data pad
 			 *  regulator should be enabled to regulate the data pin voltages to within the USB standard.
@@ -154,37 +160,34 @@
 			 *
 			 *  \note See Endpoint.h and Pipe.h headers for endpoint/pipe functions.
 			 */
-			#define EP_TYPE_CONTROL                    0b00
+			#define EP_TYPE_CONTROL                    0x00
 
 			/** Mask for an ISOCHRONOUS type endpoint or pipe.
 			 *
 			 *  \note See Endpoint.h and Pipe.h headers for endpoint/pipe functions.
 			 */
-			#define EP_TYPE_ISOCHRONOUS                0b01
+			#define EP_TYPE_ISOCHRONOUS                0x01
 
 			/** Mask for a BULK type endpoint or pipe.
 			 *
 			 *  \note See Endpoint.h and Pipe.h headers for endpoint/pipe functions.
 			 */
-			#define EP_TYPE_BULK                       0b10
+			#define EP_TYPE_BULK                       0x02
 
 			/** Mask for an INTERRUPT type endpoint or pipe.
 			 *
 			 *  \note See Endpoint.h and Pipe.h headers for endpoint/pipe functions.
 			 */
-			#define EP_TYPE_INTERRUPT                  0b11
-
-			/** Mask for determining the type of an endpoint or pipe. This should then be compared with the
-			 *  EP_TYPE_* macros elsewhere in this module to determine the exact type of the endpoint or pipe.
-			 *
-			 *  \note See Endpoint.h and Pipe.h headers for endpoint/pipe functions.
-			 */
-			#define EP_TYPE_MASK                       0b11
+			#define EP_TYPE_INTERRUPT                  0x03
 
-			/** Returns boolean true if the VBUS line is currently high (i.e. the USB host is supplying power),
-			 *  otherwise returns false.
-			 */
-			#define USB_VBUS_GetStatus()             ((USBSTA & (1 << VBUS)) ? true : false)
+			#if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER) || defined(__DOXYGEN__)
+				/** Returns boolean true if the VBUS line is currently high (i.e. the USB host is supplying power),
+				 *  otherwise returns false.
+				 *
+				 *  \note This token is not available on some AVR models which do not support hardware VBUS monitoring.
+				 */
+				#define USB_VBUS_GetStatus()             ((USBSTA & (1 << VBUS)) ? true : false)
+			#endif
 
 			/** Detaches the device from the USB bus. This has the effect of removing the device from any
 			 *  host if, ceasing USB communications. If no host is present, this prevents any host from
@@ -353,19 +356,18 @@
 			#define USB_Interface_Reset()      MACROS{ uint8_t Temp = USBCON; USBCON = (Temp & ~(1 << USBE)); \
 			                                           USBCON = (Temp | (1 << USBE));           }MACROE
 	
-		/* Inline Functions: */		
+		/* Inline Functions: */
+			#if defined(USB_CAN_BE_BOTH)
 			static inline uint8_t USB_GetUSBModeFromUID(void) ATTR_WARN_UNUSED_RESULT;
 			static inline uint8_t USB_GetUSBModeFromUID(void)
 			{
-				#if (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__))
 				if (USBSTA & (1 << ID))
 				  return USB_MODE_DEVICE;
 				else
 				  return USB_MODE_HOST;
-				#else
-				return USB_MODE_DEVICE;
-				#endif
 			}
+			#endif
+			
 	#endif
 	
 	/* Disable C linkage for C++ Compilers: */