Add extra tests to the MassStorage device demo and class driver for validating comman...

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

diff --git a/LUFA/Drivers/USB/LowLevel/LowLevel.c b/LUFA/Drivers/USB/LowLevel/LowLevel.c
index 82705db..4fcf4fc 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -38,8 +38,6 @@ volatile uint8_t USB_CurrentMode = USB_MODE_NONE;
 volatile uint8_t USB_Options;\r
 #endif\r
 \r
 volatile uint8_t USB_Options;\r
 #endif\r
 \r

-volatile bool FrameElapsed;\r
-\r

 void USB_Init(\r
                #if defined(USB_CAN_BE_BOTH)\r
                const uint8_t Mode\r
 void USB_Init(\r
                #if defined(USB_CAN_BE_BOTH)\r
                const uint8_t Mode\r


@@ -70,7 +68,7 @@ void USB_Init(
        USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r
        #endif\r
        \r
        USB_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;\r
        #endif\r
        \r

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

        UHWCON |= (1 << UIMOD);\r
        #elif defined(USB_HOST_ONLY)\r
        UHWCON &= ~(1 << UIMOD);\r
        UHWCON |= (1 << UIMOD);\r
        #elif defined(USB_HOST_ONLY)\r
        UHWCON &= ~(1 << UIMOD);\r


@@ -101,7 +99,7 @@ void USB_Init(
        \r
        USB_ResetInterface();\r
 \r
        \r
        USB_ResetInterface();\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

        USB_OTGPAD_On();\r
        #endif\r
 \r
        USB_OTGPAD_On();\r
        #endif\r
 \r


@@ -138,7 +136,7 @@ void USB_ShutDown(void)
        USB_Interface_Disable();\r
        USB_PLL_Off();\r
        \r
        USB_Interface_Disable();\r
        USB_PLL_Off();\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

        USB_OTGPAD_Off();\r
        #endif\r
 \r
        USB_OTGPAD_Off();\r
        #endif\r
 \r


@@ -152,8 +150,6 @@ void USB_ResetInterface(void)
        USB_INT_DisableAllInterrupts();\r
        USB_INT_ClearAllInterrupts();\r
 \r
        USB_INT_DisableAllInterrupts();\r
        USB_INT_ClearAllInterrupts();\r
 \r

-       FrameElapsed = false;\r
-\r

        USB_IsConnected = false;\r
 \r
        #if defined(USB_CAN_BE_HOST)\r
        USB_IsConnected = false;\r
 \r
        #if defined(USB_CAN_BE_HOST)\r


@@ -169,7 +165,7 @@ void USB_ResetInterface(void)
        \r
        if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
        {\r
        \r
        if (!(USB_Options & USB_OPT_MANUAL_PLL))\r
        {\r

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

                PLLFRQ = ((1 << PLLUSB) | (1 << PDIV3) | (1 << PDIV1));\r
                #endif\r
 \r
                PLLFRQ = ((1 << PLLUSB) | (1 << PDIV3) | (1 << PDIV1));\r
                #endif\r
 \r


@@ -190,10 +186,12 @@ void USB_ResetInterface(void)
                \r
        if (!(USB_Options & USB_OPT_REG_DISABLED))\r
          USB_REG_On();\r
                \r
        if (!(USB_Options & USB_OPT_REG_DISABLED))\r
          USB_REG_On();\r

+       else\r
+         USB_REG_Off();\r

        \r
        USB_CLK_Unfreeze();\r
 \r
        \r
        USB_CLK_Unfreeze();\r
 \r

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

        if (USB_CurrentMode == USB_MODE_DEVICE)\r
        {\r
                if (USB_Options & USB_DEVICE_OPT_LOWSPEED)\r
        if (USB_CurrentMode == USB_MODE_DEVICE)\r
        {\r
                if (USB_Options & USB_DEVICE_OPT_LOWSPEED)\r