Oops - fix broken SPI driver due to missing bit inversion on a port mask.

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

diff --git a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
index 1832d15..960e243 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */


@@ -9,13 +9,13 @@
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -50,12 +50,12 @@ void USB_Device_ProcessControlRequest(void)
 {
        bool     RequestHandled = false;
        uint8_t* RequestHeader  = (uint8_t*)&USB_ControlRequest;
 {
        bool     RequestHandled = false;
        uint8_t* RequestHeader  = (uint8_t*)&USB_ControlRequest;

-       
+

        for (uint8_t RequestHeaderByte = 0; RequestHeaderByte < sizeof(USB_Request_Header_t); RequestHeaderByte++)
          *(RequestHeader++) = Endpoint_Read_Byte();
        for (uint8_t RequestHeaderByte = 0; RequestHeaderByte < sizeof(USB_Request_Header_t); RequestHeaderByte++)
          *(RequestHeader++) = Endpoint_Read_Byte();

-         
+

        uint8_t bmRequestType = USB_ControlRequest.bmRequestType;
        uint8_t bmRequestType = USB_ControlRequest.bmRequestType;

-       
+

        switch (USB_ControlRequest.bRequest)
        {
                case REQ_GetStatus:
        switch (USB_ControlRequest.bRequest)
        {
                case REQ_GetStatus:


@@ -92,7 +92,7 @@ void USB_Device_ProcessControlRequest(void)
                                USB_Device_GetDescriptor();
                                RequestHandled = true;
                        }
                                USB_Device_GetDescriptor();
                                RequestHandled = true;
                        }

-                       
+

                        break;
                case REQ_GetConfiguration:
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE))
                        break;
                case REQ_GetConfiguration:
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE))


@@ -114,11 +114,11 @@ void USB_Device_ProcessControlRequest(void)
 
        if (!(RequestHandled))
          EVENT_USB_Device_UnhandledControlRequest();
 
        if (!(RequestHandled))
          EVENT_USB_Device_UnhandledControlRequest();

-         
+

        if (Endpoint_IsSETUPReceived())
        {
                Endpoint_StallTransaction();
        if (Endpoint_IsSETUPReceived())
        {
                Endpoint_StallTransaction();

-               Endpoint_ClearSETUP();          
+               Endpoint_ClearSETUP();

        }
 }
 
        }
 }
 


@@ -126,29 +126,28 @@ static void USB_Device_SetAddress(void)
 {
        uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);
 
 {
        uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);
 

-       Endpoint_ClearSETUP();
-       
-       Endpoint_ClearStatusStage();
-       
-       while (!(Endpoint_IsINReady()))
+       ATOMIC_BLOCK(ATOMIC_RESTORESTATE)

        {
        {

-               if (USB_DeviceState == DEVICE_STATE_Unattached)
-                 return;
-       }
+               Endpoint_ClearSETUP();
+
+               Endpoint_ClearStatusStage();

 
 

-       USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
+               while (!(Endpoint_IsINReady()));

 
 

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

 
 

-       return;
+               USB_Device_SetDeviceAddress(DeviceAddress);
+       }

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

-#if defined(FIXED_NUM_CONFIGURATIONS)
+       #if defined(FIXED_NUM_CONFIGURATIONS)

        if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)
          return;
        if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)
          return;

-#else
+       #else
+       USB_Descriptor_Device_t* DevDescriptorPtr;
+

        #if defined(USE_FLASH_DESCRIPTORS)
                #define MemoryAddressSpace  MEMSPACE_FLASH
        #elif defined(USE_EEPROM_DESCRIPTORS)
        #if defined(USE_FLASH_DESCRIPTORS)
                #define MemoryAddressSpace  MEMSPACE_FLASH
        #elif defined(USE_EEPROM_DESCRIPTORS)


@@ -158,8 +157,6 @@ static void USB_Device_SetConfiguration(void)
        #else
                uint8_t MemoryAddressSpace;
        #endif
        #else
                uint8_t MemoryAddressSpace;
        #endif

-       
-       USB_Descriptor_Device_t* DevDescriptorPtr;

 
        if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr
        #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
 
        if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr
        #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)


@@ -169,7 +166,7 @@ static void USB_Device_SetConfiguration(void)
        {
                return;
        }
        {
                return;
        }

-       
+

        if (MemoryAddressSpace == MEMSPACE_FLASH)
        {
                if (((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
        if (MemoryAddressSpace == MEMSPACE_FLASH)
        {
                if (((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))


@@ -185,20 +182,23 @@ static void USB_Device_SetConfiguration(void)
                if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)
                  return;
        }
                if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)
                  return;
        }

-#endif
-       
+       #endif
+

        Endpoint_ClearSETUP();
 
        USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;
 
        Endpoint_ClearStatusStage();
 
        Endpoint_ClearSETUP();
 
        USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;
 
        Endpoint_ClearStatusStage();
 

-       USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
+       if (USB_ConfigurationNumber)
+         USB_DeviceState = DEVICE_STATE_Configured;
+       else
+         USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;

 
        EVENT_USB_Device_ConfigurationChanged();
 }
 
 
        EVENT_USB_Device_ConfigurationChanged();
 }
 

-void USB_Device_GetConfiguration(void)
+static void USB_Device_GetConfiguration(void)

 {
        Endpoint_ClearSETUP();
 
 {
        Endpoint_ClearSETUP();
 


@@ -225,7 +225,7 @@ static void USB_Device_GetInternalSerialDescriptor(void)
 
        SignatureDescriptor.Header.Type = DTYPE_String;
        SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);
 
        SignatureDescriptor.Header.Type = DTYPE_String;
        SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);

-       
+

        uint8_t SigReadAddress = 0x0E;
 
        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
        uint8_t SigReadAddress = 0x0E;
 
        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)


@@ -233,17 +233,17 @@ static void USB_Device_GetInternalSerialDescriptor(void)
                for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)
                {
                        uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
                for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)
                {
                        uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);

-                       
+

                        if (SerialCharNum & 0x01)
                        {
                                SerialByte >>= 4;
                                SigReadAddress++;
                        }
                        if (SerialCharNum & 0x01)
                        {
                                SerialByte >>= 4;
                                SigReadAddress++;
                        }

-                       
+

                        SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte);
                }
        }
                        SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte);
                }
        }

-       
+

        Endpoint_ClearSETUP();
 
        Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));
        Endpoint_ClearSETUP();
 
        Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));


@@ -256,11 +256,11 @@ static void USB_Device_GetDescriptor(void)
 {
        const void* DescriptorPointer;
        uint16_t    DescriptorSize;
 {
        const void* DescriptorPointer;
        uint16_t    DescriptorSize;

-       
+

        #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
        #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)

-       uint8_t  DescriptorAddressSpace;
+       uint8_t DescriptorAddressSpace;

        #endif
        #endif

-       
+

        #if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)
        if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))
        {
        #if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)
        if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))
        {


@@ -268,7 +268,7 @@ static void USB_Device_GetDescriptor(void)
                return;
        }
        #endif
                return;
        }
        #endif

-       
+

        if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,
                                                         &DescriptorPointer
        #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
        if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,
                                                         &DescriptorPointer
        #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)


@@ -278,7 +278,7 @@ static void USB_Device_GetDescriptor(void)
        {
                return;
        }
        {
                return;
        }

-       
+

        Endpoint_ClearSETUP();
 
        #if defined(USE_RAM_DESCRIPTORS)
        Endpoint_ClearSETUP();
 
        #if defined(USE_RAM_DESCRIPTORS)


@@ -286,14 +286,14 @@ static void USB_Device_GetDescriptor(void)
        #elif defined(USE_EEPROM_DESCRIPTORS)
        Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);
        #elif defined(USE_FLASH_DESCRIPTORS)
        #elif defined(USE_EEPROM_DESCRIPTORS)
        Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);
        #elif defined(USE_FLASH_DESCRIPTORS)

-       Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);   
+       Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);

        #else
        if (DescriptorAddressSpace == MEMSPACE_FLASH)
        #else
        if (DescriptorAddressSpace == MEMSPACE_FLASH)

-         Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize); 
+         Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);

        else if (DescriptorAddressSpace == MEMSPACE_EEPROM)
          Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);
        else
        else if (DescriptorAddressSpace == MEMSPACE_EEPROM)
          Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);
        else

-         Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);  
+         Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);

        #endif
 
        Endpoint_ClearOUT();
        #endif
 
        Endpoint_ClearOUT();


@@ -305,29 +305,29 @@ static void USB_Device_GetStatus(void)
 
        switch (USB_ControlRequest.bmRequestType)
        {
 
        switch (USB_ControlRequest.bmRequestType)
        {

-#if !defined(NO_DEVICE_SELF_POWER) || !defined(NO_DEVICE_REMOTE_WAKEUP)        
+               #if !defined(NO_DEVICE_SELF_POWER) || !defined(NO_DEVICE_REMOTE_WAKEUP)

                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):

-       #if !defined(NO_DEVICE_SELF_POWER)
+                       #if !defined(NO_DEVICE_SELF_POWER)

                        if (USB_CurrentlySelfPowered)
                          CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;
                        if (USB_CurrentlySelfPowered)
                          CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;

-       #endif
+                       #endif

 
 

-       #if !defined(NO_DEVICE_REMOTE_WAKEUP)                   
+                       #if !defined(NO_DEVICE_REMOTE_WAKEUP)

                        if (USB_RemoteWakeupEnabled)
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;
                        if (USB_RemoteWakeupEnabled)
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;

-       #endif
+                       #endif

                        break;
                        break;

-#endif
-#if !defined(CONTROL_ONLY_DEVICE)
+               #endif
+               #if !defined(CONTROL_ONLY_DEVICE)

                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):
                        Endpoint_SelectEndpoint((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);
 
                        CurrentStatus = Endpoint_IsStalled();
 
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):
                        Endpoint_SelectEndpoint((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);
 
                        CurrentStatus = Endpoint_IsStalled();
 

-                       Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);                      
+                       Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);

 
                        break;
 
                        break;

-#endif
+               #endif

                default:
                        return;
        }
                default:
                        return;
        }


@@ -336,7 +336,7 @@ static void USB_Device_GetStatus(void)
 
        Endpoint_Write_Word_LE(CurrentStatus);
        Endpoint_ClearIN();
 
        Endpoint_Write_Word_LE(CurrentStatus);
        Endpoint_ClearIN();

-       
+

        Endpoint_ClearStatusStage();
 }
 
        Endpoint_ClearStatusStage();
 }
 


@@ -344,43 +344,43 @@ static void USB_Device_ClearSetFeature(void)
 {
        switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)
        {
 {
        switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)
        {

-#if !defined(NO_DEVICE_REMOTE_WAKEUP)                  
+               #if !defined(NO_DEVICE_REMOTE_WAKEUP)

                case REQREC_DEVICE:
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)
                          USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);
                        else
                          return;
                case REQREC_DEVICE:
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)
                          USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);
                        else
                          return;

-                       
-                       break;                  
-#endif
-#if !defined(CONTROL_ONLY_DEVICE)
+
+                       break;
+               #endif
+               #if !defined(CONTROL_ONLY_DEVICE)

                case REQREC_ENDPOINT:
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT)
                        {
                                uint8_t EndpointIndex = ((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);
                case REQREC_ENDPOINT:
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT)
                        {
                                uint8_t EndpointIndex = ((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);

-                               
+

                                if (EndpointIndex == ENDPOINT_CONTROLEP)
                                  return;
 
                                Endpoint_SelectEndpoint(EndpointIndex);
 
                                if (EndpointIndex == ENDPOINT_CONTROLEP)
                                  return;
 
                                Endpoint_SelectEndpoint(EndpointIndex);
 

-                               if (!(Endpoint_IsEnabled()))
-                                 return;
-
-                               if (USB_ControlRequest.bRequest == REQ_SetFeature)
+                               if (Endpoint_IsEnabled())

                                {
                                {

-                                       Endpoint_StallTransaction();
-                               }
-                               else
-                               {
-                                       Endpoint_ClearStall();
-                                       Endpoint_ResetFIFO(EndpointIndex);
-                                       Endpoint_ResetDataToggle();
+                                       if (USB_ControlRequest.bRequest == REQ_SetFeature)
+                                       {
+                                               Endpoint_StallTransaction();
+                                       }
+                                       else
+                                       {
+                                               Endpoint_ClearStall();
+                                               Endpoint_ResetFIFO(EndpointIndex);
+                                               Endpoint_ResetDataToggle();
+                                       }

                                }
                        }
                                }
                        }

-                       
+

                        break;
                        break;

-#endif
+               #endif

                default:
                        return;
        }
                default:
                        return;
        }


@@ -393,3 +393,4 @@ static void USB_Device_ClearSetFeature(void)
 }
 
 #endif
 }
 
 #endif

+