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 0ab297d..f47d8f6 100644 (file)
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.h
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.h
@@ -43,6 +43,7 @@
 
        /* Includes: */
                #include "../../../Common/Common.h"
 
        /* Includes: */
                #include "../../../Common/Common.h"

+               #include "USBMode.h"            

                #include "StdDescriptors.h"
                #include "Events.h"
                #include "StdRequestType.h"
                #include "StdDescriptors.h"
                #include "Events.h"
                #include "StdRequestType.h"


@@ -60,13 +61,8 @@
                #endif
 
        /* Public Interface - May be used in end-application: */
                #endif
 
        /* Public Interface - May be used in end-application: */

-               /* Macros: */
-                       #if defined(USE_SINGLE_DEVICE_CONFIGURATION)
-                               #define FIXED_NUM_CONFIGURATIONS           1
-                       #endif
-

                /* Enums: */
                /* Enums: */

-                       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
+                       #if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)

                                /** Enum for the possible descriptor memory spaces, for the \c MemoryAddressSpace parameter of the
                                 *  \ref CALLBACK_USB_GetDescriptor() function. This can be used when none of the \c USE_*_DESCRIPTORS
                                 *  compile time options are used, to indicate in which memory space the descriptor is stored.
                                /** Enum for the possible descriptor memory spaces, for the \c MemoryAddressSpace parameter of the
                                 *  \ref CALLBACK_USB_GetDescriptor() function. This can be used when none of the \c USE_*_DESCRIPTORS
                                 *  compile time options are used, to indicate in which memory space the descriptor is stored.


@@ -75,8 +71,12 @@
                                 */
                                enum USB_DescriptorMemorySpaces_t
                                {
                                 */
                                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. */
                                        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. */
                                        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
                                        MEMSPACE_RAM      = 2, /**< Indicates the requested descriptor is located in RAM memory. */
                                };
                        #endif


@@ -91,7 +91,7 @@
                         *
                         *  \ingroup Group_Device
                         */
                         *
                         *  \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
 
                        #if !defined(NO_DEVICE_REMOTE_WAKEUP)
                                /** Indicates if the host is currently allowing the device to issue remote wakeup events. If this


@@ -108,7 +108,7 @@
                                 *
                                 *  \ingroup Group_Device
                                 */
                                 *
                                 *  \ingroup Group_Device
                                 */

-                               extern bool USB_RemoteWakeupEnabled;
+                               extern bool USB_Device_RemoteWakeupEnabled;

                        #endif
 
                        #if !defined(NO_DEVICE_SELF_POWER)
                        #endif
 
                        #if !defined(NO_DEVICE_SELF_POWER)


@@ -118,7 +118,7 @@
                                 *
                                 *  \ingroup Group_Device
                                 */
                                 *
                                 *  \ingroup Group_Device
                                 */

-                               extern bool USB_CurrentlySelfPowered;
+                               extern bool USB_Device_CurrentlySelfPowered;

                        #endif
 
        /* Private Interface - For use in library only: */
                        #endif
 
        /* Private Interface - For use in library only: */