Update copyrights for 2014.

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

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

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

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2014  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


@@ -117,16 +117,16 @@ void USB_Device_ProcessControlRequest(void)
 
        if (Endpoint_IsSETUPReceived())
        {
 
        if (Endpoint_IsSETUPReceived())
        {

-               Endpoint_StallTransaction();

                Endpoint_ClearSETUP();
                Endpoint_ClearSETUP();

+               Endpoint_StallTransaction();

        }
 }
 
 static void USB_Device_SetAddress(void)
 {
        }
 }
 
 static void USB_Device_SetAddress(void)
 {

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

 
        Endpoint_ClearSETUP();
 
 
        Endpoint_ClearSETUP();
 


@@ -134,10 +134,9 @@ static void USB_Device_SetAddress(void)
 
        while (!(Endpoint_IsINReady()));
 
 
        while (!(Endpoint_IsINReady()));
 

-       USB_Device_SetDeviceAddress(DeviceAddress);
-       USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
+       USB_Device_EnableDeviceAddress(DeviceAddress);

 
 

-       SetGlobalInterruptMask(CurrentGlobalInt);
+       USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;

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