Seperated out parts of the PrinterHost incomplete demo into a seperate Lib subdirectory.

[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 86dfa85..c240bef 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -32,9 +32,9 @@
 \r
 void USB_INT_DisableAllInterrupts(void)\r
 {\r
 \r
 void USB_INT_DisableAllInterrupts(void)\r
 {\r

-       #if defined(USB_FULL_CONTROLLER)\r
+       #if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r

        USBCON &= ~((1 << VBUSTE) | (1 << IDTE));                               \r
        USBCON &= ~((1 << VBUSTE) | (1 << IDTE));                               \r

-       #elif defined(USB_MODIFIED_FULL_CONTROLLER)\r
+       #elif defined(USB_SERIES_4_AVR)\r

        USBCON &= ~(1 << VBUSTE);                                       \r
        #endif\r
        \r
        USBCON &= ~(1 << VBUSTE);                                       \r
        #endif\r
        \r


@@ -50,7 +50,7 @@ void USB_INT_DisableAllInterrupts(void)
 \r
 void USB_INT_ClearAllInterrupts(void)\r
 {\r
 \r
 void USB_INT_ClearAllInterrupts(void)\r
 {\r

-       #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
+       #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r

        USBINT  = 0;\r
        #endif\r
        \r
        USBINT  = 0;\r
        #endif\r
        \r


@@ -67,7 +67,7 @@ void USB_INT_ClearAllInterrupts(void)
 ISR(USB_GEN_vect, ISR_BLOCK)\r
 {\r
        #if defined(USB_CAN_BE_DEVICE)\r
 ISR(USB_GEN_vect, ISR_BLOCK)\r
 {\r
        #if defined(USB_CAN_BE_DEVICE)\r

-       #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)\r
+       #if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)\r

        if (USB_INT_HasOccurred(USB_INT_VBUS) && USB_INT_IsEnabled(USB_INT_VBUS))\r
        {\r
                USB_INT_Clear(USB_INT_VBUS);\r
        if (USB_INT_HasOccurred(USB_INT_VBUS) && USB_INT_IsEnabled(USB_INT_VBUS))\r
        {\r
                USB_INT_Clear(USB_INT_VBUS);\r


@@ -89,6 +89,8 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                }\r
                else\r
                {\r
                }\r
                else\r
                {\r

+                       USB_IsConnected = false;\r
+\r

                        EVENT_USB_Disconnect();\r
                \r
                        USB_Detach();\r
                        EVENT_USB_Disconnect();\r
                \r
                        USB_Detach();\r


@@ -96,8 +98,6 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                        USB_PLL_Off();\r
                        USB_REG_Off();\r
 \r
                        USB_PLL_Off();\r
                        USB_REG_Off();\r
 \r

-                       USB_IsConnected = false;\r
-\r

                        EVENT_USB_VBUSDisconnect();\r
                        \r
                        USB_INT_Clear(USB_INT_VBUS);\r
                        EVENT_USB_VBUSDisconnect();\r
                        \r
                        USB_INT_Clear(USB_INT_VBUS);\r


@@ -121,7 +121,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
 \r
                EVENT_USB_Suspend();\r
 \r
 \r
                EVENT_USB_Suspend();\r
 \r

-               #if defined(USB_LIMITED_CONTROLLER) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
+               #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r

                if (USB_IsConnected)\r
                {\r
                        USB_IsConnected = false;\r
                if (USB_IsConnected)\r
                {\r
                        USB_IsConnected = false;\r


@@ -145,7 +145,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_INT_Disable(USB_INT_WAKEUP);\r
                USB_INT_Enable(USB_INT_SUSPEND);\r
                \r
                USB_INT_Disable(USB_INT_WAKEUP);\r
                USB_INT_Enable(USB_INT_SUSPEND);\r
                \r

-               #if defined(USB_LIMITED_CONTROLLER) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r
+               #if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)\r

                if (!(USB_IsConnected))\r
                {\r
                        USB_IsConnected = true;\r
                if (!(USB_IsConnected))\r
                {\r
                        USB_IsConnected = true;\r


@@ -243,8 +243,8 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                {\r
                        if (USB_CurrentMode == USB_MODE_HOST)\r
                          EVENT_USB_DeviceUnattached();\r
                {\r
                        if (USB_CurrentMode == USB_MODE_HOST)\r
                          EVENT_USB_DeviceUnattached();\r

-                       else\r
-                         EVENT_USB_Disconnect();\r
+\r
+                       EVENT_USB_Disconnect();\r

                }\r
 \r
                EVENT_USB_UIDChange();\r
                }\r
 \r
                EVENT_USB_UIDChange();\r