X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/381dd0d49079dfc1e356eacbb061853c8f365165..2e76ad721e494f3a14ece73100ea9a2144c6fe8e:/LUFA/Drivers/USB/Core/Device.h

diff --git a/LUFA/Drivers/USB/Core/Device.h b/LUFA/Drivers/USB/Core/Device.h
index fdec1df1c..0e8662417 100644
--- a/LUFA/Drivers/USB/Core/Device.h
+++ b/LUFA/Drivers/USB/Core/Device.h
@@ -51,6 +51,7 @@
 
 	/* Includes: */
 		#include "../../../Common/Common.h"
+		#include "USBMode.h"		
 		#include "StdDescriptors.h"
 		#include "USBInterrupt.h"
 		#include "Endpoint.h"
@@ -62,6 +63,13 @@
 
 	/* Public Interface - May be used in end-application: */
 		/* Enums: */
+			/** Enum for the various states of the USB Device state machine. Only some states are
+			 *  implemented in the LUFA library - other states are left to the user to implement.
+			 *
+			 *  For information on each possible USB device state, refer to the USB 2.0 specification.
+			 *
+			 *  \see \ref USB_DeviceState, which stores the current device state machine state.
+			 */
 			enum USB_Device_States_t
 			{
 				DEVICE_STATE_Unattached                   = 0, /**< Internally implemented by the library. This state indicates
@@ -106,7 +114,8 @@
 			 *                                  the address of the descriptor.
 			 *  \param[out] MemoryAddressSpace  A value from the \ref USB_DescriptorMemorySpaces_t enum to indicate the memory
 			 *                                  space in which the descriptor is stored. This parameter does not exist when one
-			 *                                  of the \c USE_*_DESCRIPTORS compile time options is used.
+			 *                                  of the \c USE_*_DESCRIPTORS compile time options is used, or on architectures which
+			 *                                  use a unified address space.
 			 *
 			 *  \note By default, the library expects all descriptors to be located in flash memory via the \c PROGMEM attribute.
 			 *        If descriptors should be located in RAM or EEPROM instead (to speed up access in the case of RAM, or to
@@ -119,7 +128,8 @@
 			uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 			                                    const uint8_t wIndex,
 			                                    const void** const DescriptorAddress
-			#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
+			#if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)) && \
+			    !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
 			                                    , uint8_t* MemoryAddressSpace
 			#endif
 			                                    ) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
@@ -127,8 +137,8 @@
 	/* Architecture Includes: */
 		#if (ARCH == ARCH_AVR8)
 			#include "AVR8/Device_AVR8.h"
-		#elif (ARCH == ARCH_UC3B)
-			#include "UC3B/Device_UC3B.h"
+		#elif (ARCH == ARCH_UC3)
+			#include "UC3/Device_UC3.h"
 		#endif
 
 #endif