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

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

diff --git a/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
index a502c09..c3a111e 100644 (file)
--- a/LUFA/Drivers/USB/Core/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/Core/DeviceStandardReq.c
@@ -36,14 +36,14 @@
 #define  __INCLUDE_FROM_DEVICESTDREQ_C
 #include "DeviceStandardReq.h"
 
 #define  __INCLUDE_FROM_DEVICESTDREQ_C
 #include "DeviceStandardReq.h"
 

-uint8_t USB_ConfigurationNumber;
+uint8_t USB_Device_ConfigurationNumber;

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

-bool    USB_CurrentlySelfPowered;
+bool    USB_Device_CurrentlySelfPowered;

 #endif
 
 #if !defined(NO_DEVICE_REMOTE_WAKEUP)
 #endif
 
 #if !defined(NO_DEVICE_REMOTE_WAKEUP)

-bool    USB_RemoteWakeupEnabled;
+bool    USB_Device_RemoteWakeupEnabled;

 #endif
 
 void USB_Device_ProcessControlRequest(void)
 #endif
 
 void USB_Device_ProcessControlRequest(void)


@@ -114,9 +114,9 @@ void USB_Device_ProcessControlRequest(void)
 
 static void USB_Device_SetAddress(void)
 {
 
 static void USB_Device_SetAddress(void)
 {

-       uint8_t DeviceAddress       = (USB_ControlRequest.wValue & 0x7F);
-       uint_reg_t CurrentGlobalInt = USB_INT_GetGlobalEnableState();
-       USB_INT_GlobalDisable();
+       uint8_t    DeviceAddress    = (USB_ControlRequest.wValue & 0x7F);
+       uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
+       GlobalInterruptDisable();

                                
        Endpoint_ClearSETUP();
 
                                
        Endpoint_ClearSETUP();
 


@@ -127,7 +127,7 @@ static void USB_Device_SetAddress(void)
        USB_Device_SetDeviceAddress(DeviceAddress);
        USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
        
        USB_Device_SetDeviceAddress(DeviceAddress);
        USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
        

-       USB_INT_SetGlobalEnableState(CurrentGlobalInt);
+       SetGlobalInterruptMask(CurrentGlobalInt);

 }
 
 static void USB_Device_SetConfiguration(void)
 }
 
 static void USB_Device_SetConfiguration(void)


@@ -184,11 +184,11 @@ static void USB_Device_SetConfiguration(void)
 
        Endpoint_ClearSETUP();
 
 
        Endpoint_ClearSETUP();
 

-       USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;
+       USB_Device_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;

 
        Endpoint_ClearStatusStage();
 
 
        Endpoint_ClearStatusStage();
 

-       if (USB_ConfigurationNumber)
+       if (USB_Device_ConfigurationNumber)

          USB_DeviceState = DEVICE_STATE_Configured;
        else
          USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;
          USB_DeviceState = DEVICE_STATE_Configured;
        else
          USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;


@@ -200,7 +200,7 @@ static void USB_Device_GetConfiguration(void)
 {
        Endpoint_ClearSETUP();
 
 {
        Endpoint_ClearSETUP();
 

-       Endpoint_Write_8(USB_ConfigurationNumber);
+       Endpoint_Write_8(USB_Device_ConfigurationNumber);

        Endpoint_ClearIN();
 
        Endpoint_ClearStatusStage();
        Endpoint_ClearIN();
 
        Endpoint_ClearStatusStage();


@@ -285,12 +285,12 @@ static void USB_Device_GetStatus(void)
                #if !defined(NO_DEVICE_SELF_POWER) || !defined(NO_DEVICE_REMOTE_WAKEUP)
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):
                        #if !defined(NO_DEVICE_SELF_POWER)
                #if !defined(NO_DEVICE_SELF_POWER) || !defined(NO_DEVICE_REMOTE_WAKEUP)
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):
                        #if !defined(NO_DEVICE_SELF_POWER)

-                       if (USB_CurrentlySelfPowered)
+                       if (USB_Device_CurrentlySelfPowered)

                          CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;
                        #endif
 
                        #if !defined(NO_DEVICE_REMOTE_WAKEUP)
                          CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;
                        #endif
 
                        #if !defined(NO_DEVICE_REMOTE_WAKEUP)

-                       if (USB_RemoteWakeupEnabled)
+                       if (USB_Device_RemoteWakeupEnabled)

                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;
                        #endif
                        break;
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;
                        #endif
                        break;


@@ -324,7 +324,7 @@ static void USB_Device_ClearSetFeature(void)
                #if !defined(NO_DEVICE_REMOTE_WAKEUP)
                case REQREC_DEVICE:
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_SEL_DeviceRemoteWakeup)
                #if !defined(NO_DEVICE_REMOTE_WAKEUP)
                case REQREC_DEVICE:
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_SEL_DeviceRemoteWakeup)

-                         USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);
+                         USB_Device_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);

                        else
                          return;
 
                        else
                          return;