Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / LUFA / Drivers / USB / Core / DeviceStandardReq.h

diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.h b/LUFA/Drivers/USB/Core/DeviceStandardReq.h
index 26a55a4..f47d8f6 100644 (file)
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.h
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.h
@@ -71,8 +71,12 @@
                                 */
                                enum USB_DescriptorMemorySpaces_t
                                {
+                                       #if defined(ARCH_HAS_FLASH_ADDRESS_SPACE) || defined(__DOXYGEN__)
                                        MEMSPACE_FLASH    = 0, /**< Indicates the requested descriptor is located in FLASH memory. */
+                                       #endif
+                                       #if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE) || defined(__DOXYGEN__)
                                        MEMSPACE_EEPROM   = 1, /**< Indicates the requested descriptor is located in EEPROM memory. */
+                                       #endif
                                        MEMSPACE_RAM      = 2, /**< Indicates the requested descriptor is located in RAM memory. */
                                };
                        #endif
@@ -87,7 +91,7 @@
                         *
                         *  \ingroup Group_Device
                         */
-                       extern uint8_t USB_ConfigurationNumber;
+                       extern uint8_t USB_Device_ConfigurationNumber;
 
                        #if !defined(NO_DEVICE_REMOTE_WAKEUP)
                                /** Indicates if the host is currently allowing the device to issue remote wakeup events. If this
@@ -104,7 +108,7 @@
                                 *
                                 *  \ingroup Group_Device
                                 */
-                               extern bool USB_RemoteWakeupEnabled;
+                               extern bool USB_Device_RemoteWakeupEnabled;
                        #endif
 
                        #if !defined(NO_DEVICE_SELF_POWER)
@@ -114,7 +118,7 @@
                                 *
                                 *  \ingroup Group_Device
                                 */
-                               extern bool USB_CurrentlySelfPowered;
+                               extern bool USB_Device_CurrentlySelfPowered;
                        #endif
 
        /* Private Interface - For use in library only: */