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 61acf6d..4fcf4fc 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -28,8 +28,6 @@
   this software.\r
 */\r
 \r
-#include "USBMode.h"\r
-\r
 #include "LowLevel.h"\r
 \r
 #if (!defined(USB_HOST_ONLY) && !defined(USB_DEVICE_ONLY))\r
@@ -70,7 +68,7 @@ void USB_Init(
        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
@@ -94,14 +92,14 @@ void USB_Init(
        }\r
        else\r
        {\r
-               RAISE_EVENT(USB_PowerOnFail, POWERON_ERROR_NoUSBModeSpecified);\r
+               EVENT_USB_InitFailure(USB_INITERROR_NoUSBModeSpecified);\r
                return;\r
        }\r
        #endif\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
@@ -113,7 +111,7 @@ void USB_Init(
 void USB_ShutDown(void)\r
 {\r
        if (USB_IsConnected)\r
-         RAISE_EVENT(USB_Disconnect);\r
+         EVENT_USB_Disconnect();\r
 \r
        USB_Detach();\r
 \r
@@ -138,7 +136,7 @@ void USB_ShutDown(void)
        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
@@ -152,10 +150,10 @@ void USB_ResetInterface(void)
        USB_INT_DisableAllInterrupts();\r
        USB_INT_ClearAllInterrupts();\r
 \r
-       USB_IsConnected          = false;\r
+       USB_IsConnected = false;\r
 \r
        #if defined(USB_CAN_BE_HOST)\r
-       USB_HostState            = HOST_STATE_Unattached;\r
+       USB_HostState = HOST_STATE_Unattached;\r
        #endif\r
 \r
        #if defined(USB_CAN_BE_DEVICE)\r
@@ -164,10 +162,10 @@ void USB_ResetInterface(void)
        USB_RemoteWakeupEnabled  = false;\r
        USB_CurrentlySelfPowered = false;\r
        #endif\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
@@ -188,10 +186,12 @@ void USB_ResetInterface(void)
                \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
-       #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
@@ -208,7 +208,7 @@ void USB_ResetInterface(void)
        {\r
                USB_Descriptor_Device_t* DeviceDescriptorPtr;\r
 \r
-               if (USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)\r
+               if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)\r
                {                 \r
                        #if defined(USE_RAM_DESCRIPTORS)\r
                                USB_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;\r
@@ -225,7 +225,11 @@ void USB_ResetInterface(void)
        \r
        #if defined(USB_DEVICE_ONLY)    \r
        USB_INT_Enable(USB_INT_SUSPEND);\r
-       USB_INT_Enable(USB_INT_EORSTI); \r
+       USB_INT_Enable(USB_INT_EORSTI);\r
+       #if defined(CONTROL_ONLY_DEVICE)\r
+       UENUM = ENDPOINT_CONTROLEP;\r
+       #endif\r
+               \r
        #elif defined(USB_HOST_ONLY)\r
        USB_Host_HostMode_On();\r
        \r
@@ -242,6 +246,10 @@ void USB_ResetInterface(void)
        {\r
                USB_INT_Enable(USB_INT_SUSPEND);\r
                USB_INT_Enable(USB_INT_EORSTI);\r
+\r
+               #if defined(CONTROL_ONLY_DEVICE)\r
+               UENUM = ENDPOINT_CONTROLEP;\r
+               #endif\r
        }\r
        else if (USB_CurrentMode == USB_MODE_HOST)\r
        {\r