Fix build error in TestApp demo caused by previous commit.

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

diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
index 5edefa9..51a761a 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -93,7 +93,10 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                \r
                        USB_Detach();\r
                        USB_CLK_Freeze();\r
                \r
                        USB_Detach();\r
                        USB_CLK_Freeze();\r

-                       USB_PLL_Off();\r
+\r
+                       if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
+                         USB_PLL_Off();\r
+\r

                        USB_REG_Off();\r
 \r
                        EVENT_USB_VBUSDisconnect();\r
                        USB_REG_Off();\r
 \r
                        EVENT_USB_VBUSDisconnect();\r


@@ -143,7 +146,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_DeviceState = DEVICE_STATE_Powered;\r
                EVENT_USB_Connect();\r
                #else\r
                USB_DeviceState = DEVICE_STATE_Powered;\r
                EVENT_USB_Connect();\r
                #else\r

-               USB_DeviceState = DEVICE_STATE_Configured;\r
+               USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r

                EVENT_USB_WakeUp();             \r
                #endif\r
        }\r
                EVENT_USB_WakeUp();             \r
                #endif\r
        }\r


@@ -249,7 +252,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 }\r
 \r
 #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
 }\r
 \r
 #if defined(INTERRUPT_CONTROL_ENDPOINT)\r

-ISR(USB_COM_vect, ISR_BLOCK)\r
+ISR(USB_COM_vect, ISR_NOBLOCK)\r

 {\r
        uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();\r
 \r
 {\r
        uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();\r
 \r