Rewritten event system to remove all macros, to make user code clearer.

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

diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index 9630b6a..b3b56b8 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -90,7 +90,7 @@ void USB_Host_ProcessNextHostState(void)
                                USB_INT_Enable(USB_INT_VBERRI);\r
 \r
                                USB_IsConnected = true;\r
                                USB_INT_Enable(USB_INT_VBERRI);\r
 \r
                                USB_IsConnected = true;\r

-                               RAISE_EVENT(USB_Connect);\r
+                               EVENT_USB_Connect();\r

                                        \r
                                USB_Host_ResumeBus();\r
                                Pipe_ClearPipes();\r
                                        \r
                                USB_Host_ResumeBus();\r
                                Pipe_ClearPipes();\r


@@ -184,7 +184,7 @@ void USB_Host_ProcessNextHostState(void)
                case HOST_STATE_Default_PostAddressSet:\r
                        USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
 \r
                case HOST_STATE_Default_PostAddressSet:\r
                        USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);\r
 \r

-                       RAISE_EVENT(USB_DeviceEnumerationComplete);\r
+                       EVENT_USB_DeviceEnumerationComplete();\r

                        USB_HostState = HOST_STATE_Addressed;\r
 \r
                        break;\r
                        USB_HostState = HOST_STATE_Addressed;\r
 \r
                        break;\r


@@ -192,14 +192,14 @@ void USB_Host_ProcessNextHostState(void)
 \r
        if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))\r
        {\r
 \r
        if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))\r
        {\r

-               RAISE_EVENT(USB_DeviceEnumerationFailed, ErrorCode, SubErrorCode);\r
+               EVENT_USB_DeviceEnumerationFailed(ErrorCode, SubErrorCode);\r

 \r
                USB_Host_VBUS_Auto_Off();\r
 \r
 \r
                USB_Host_VBUS_Auto_Off();\r
 \r

-               RAISE_EVENT(USB_DeviceUnattached);\r
+               EVENT_USB_DeviceUnattached();\r

                \r
                if (USB_IsConnected)\r
                \r
                if (USB_IsConnected)\r

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

 \r
                USB_ResetInterface();\r
        }\r
 \r
                USB_ResetInterface();\r
        }\r