Move new Class Driver powered demos to a new ClassDriver subdirectory, re-add old...

[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 1616ae5..82705db 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -38,6 +38,8 @@ volatile uint8_t USB_CurrentMode = USB_MODE_NONE;
 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
@@ -92,7 +94,7 @@ 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
@@ -111,7 +113,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
@@ -150,6 +152,8 @@ void USB_ResetInterface(void)
        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
@@ -206,7 +210,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
@@ -224,7 +228,6 @@ void USB_ResetInterface(void)
        #if defined(USB_DEVICE_ONLY)    \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