Moved out each demos' functionality library files (e.g. Ring Buffer library) to ...

[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 3994e2f..8b395be 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/LowLevel.c
+++ b/LUFA/Drivers/USB/LowLevel/LowLevel.c
@@ -92,7 +92,7 @@ void USB_Init(
        }\r
        else\r
        {\r
        }\r
        else\r
        {\r

-               RAISE_EVENT(USB_PowerOnFail, POWERON_ERROR_NoUSBModeSpecified);\r
+               EVENT_USB_InitFailure(USB_INITERROR_NoUSBModeSpecified);\r

                return;\r
        }\r
        #endif\r
                return;\r
        }\r
        #endif\r


@@ -111,7 +111,7 @@ void USB_Init(
 void USB_ShutDown(void)\r
 {\r
        if (USB_IsConnected)\r
 void USB_ShutDown(void)\r
 {\r
        if (USB_IsConnected)\r

-         RAISE_EVENT(USB_Disconnect);\r
+         EVENT_USB_Disconnect();\r

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


@@ -150,10 +150,10 @@ void USB_ResetInterface(void)
        USB_INT_DisableAllInterrupts();\r
        USB_INT_ClearAllInterrupts();\r
 \r
        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
 \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
        #endif\r
 \r
        #if defined(USB_CAN_BE_DEVICE)\r


@@ -206,7 +206,7 @@ void USB_ResetInterface(void)
        {\r
                USB_Descriptor_Device_t* DeviceDescriptorPtr;\r
 \r
        {\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
                {                 \r
                        #if defined(USE_RAM_DESCRIPTORS)\r
                                USB_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;\r