Mark build test makefiles as being incompatible with parallel make builds, as they...

[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 dbf1ca4..d43db66 100644 (file)
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.h
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -43,7 +43,7 @@
 
        /* Includes: */
                #include "../../../Common/Common.h"
 
        /* Includes: */
                #include "../../../Common/Common.h"

-               #include "USBMode.h"            
+               #include "USBMode.h"

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


@@ -61,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.


@@ -76,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


@@ -87,20 +86,19 @@
                         *  different configurations which the host can select between; this indicates the currently selected
                         *  value, or 0 if no configuration has been selected.
                         *
                         *  different configurations which the host can select between; this indicates the currently selected
                         *  value, or 0 if no configuration has been selected.
                         *

-                        *  \note This variable should be treated as read-only in the user application, and never manually
-                        *        changed in value.
+                        *  \attention This variable should be treated as read-only in the user application, and never manually
+                        *             changed in value.

                         *
                         *  \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
                                 *  flag is cleared, the device should not issue remote wakeup events to the host.
                                 *
 
                        #if !defined(NO_DEVICE_REMOTE_WAKEUP)
                                /** Indicates if the host is currently allowing the device to issue remote wakeup events. If this
                                 *  flag is cleared, the device should not issue remote wakeup events to the host.
                                 *

-                                *  \note This variable should be treated as read-only in the user application, and never manually
-                                *        changed in value.
-                                *        \n\n
+                                *  \attention This variable should be treated as read-only in the user application, and never manually
+                                *             changed in value.

                                 *
                                 *  \note To reduce FLASH usage of the compiled applications where Remote Wakeup is not supported,
                                 *        this global and the underlying management code can be disabled by defining the
                                 *
                                 *  \note To reduce FLASH usage of the compiled applications where Remote Wakeup is not supported,
                                 *        this global and the underlying management code can be disabled by defining the


@@ -109,7 +107,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)


@@ -119,7 +117,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: */