Added new Drivers/USB/LowLevel/Device.c file to house Device mode specific functions...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / DevChapter9.c

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index f44cf0b..544531b 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -145,9 +145,6 @@ static void USB_Device_SetAddress(void)
 
 static void USB_Device_SetConfiguration(void)
 {
 
 static void USB_Device_SetConfiguration(void)
 {

-       if (USB_DeviceState != DEVICE_STATE_Addressed)
-         return;
-       

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


@@ -211,7 +208,7 @@ void USB_Device_GetConfiguration(void)
        Endpoint_ClearStatusStage();
 }
 
        Endpoint_ClearStatusStage();
 }
 

-#if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
+#if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)

 static char USB_Device_NibbleToASCII(uint8_t Nibble)
 {
        Nibble = ((Nibble & 0x0F) + '0');
 static char USB_Device_NibbleToASCII(uint8_t Nibble)
 {
        Nibble = ((Nibble & 0x0F) + '0');


@@ -264,7 +261,7 @@ static void USB_Device_GetDescriptor(void)
        uint8_t  DescriptorAddressSpace;
        #endif
        
        uint8_t  DescriptorAddressSpace;
        #endif
        

-       #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
+       #if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)

        if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))
        {
                USB_Device_GetInternalSerialDescriptor();
        if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))
        {
                USB_Device_GetInternalSerialDescriptor();