Removed interrupt disable/enable from the Device mode control request processing...

[pub/USBasp.git] / Demos / OTG / TestApp / TestEvents.c

diff --git a/Demos/OTG/TestApp/TestEvents.c b/Demos/OTG/TestApp/TestEvents.c
index b542bfc..d0bc805 100644 (file)
--- a/Demos/OTG/TestApp/TestEvents.c
+++ b/Demos/OTG/TestApp/TestEvents.c
@@ -31,7 +31,7 @@
 /** \file\r
  *\r
  *  This file contains dummy handlers for all the possible USB events passed to the\r
 /** \file\r
  *\r
  *  This file contains dummy handlers for all the possible USB events passed to the\r

- *  application by the library (see \ref Group_Events documentation for more details on USB events).\r
+ *  application by the library (see library documentation for more details on USB events).\r

  *\r
  *  Each event is caught and printed to the USART so that they may be monitored.\r
  */\r
  *\r
  *  Each event is caught and printed to the USART so that they may be monitored.\r
  */\r


@@ -50,78 +50,70 @@ static void Abort_Program(void)
 \r
        LEDs_SetAllLEDs(LEDS_LED1 | LEDS_LED3);\r
 \r
 \r
        LEDs_SetAllLEDs(LEDS_LED1 | LEDS_LED3);\r
 \r

-       puts_P(PSTR(ESC_INVERSE_ON "\r\n**PROGRAM ABORT**"));\r
+       puts_P(PSTR(ESC_FG_RED ESC_INVERSE_ON "\r\n**PROGRAM ABORT**" ESC_FG_WHITE));\r

        for (;;);\r
 }\r
 \r
 /** Event handler for the USB_VBUSChange event. When fired, the event is logged to the USART. */\r
        for (;;);\r
 }\r
 \r
 /** Event handler for the USB_VBUSChange event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_VBUSChange)\r
+void EVENT_USB_VBUSChange(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX "VBUS Change\r\n"));\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "VBUS Change\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /** Event handler for the USB_VBUSConnect event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_VBUSConnect event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_VBUSConnect)\r
+void EVENT_USB_VBUSConnect(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX "VBUS +\r\n"));\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "VBUS +\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /** Event handler for the USB_VBUSDisconnect event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_VBUSDisconnect event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_VBUSDisconnect)\r
+void EVENT_USB_VBUSDisconnect(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX "VBUS -\r\n"));\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "VBUS -\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /**\r
  *  Event handler for the USB_Connect event. When fired, the event is logged to the USART and the\r
  *  USB task started.\r
  */\r
 }\r
 \r
 /**\r
  *  Event handler for the USB_Connect event. When fired, the event is logged to the USART and the\r
  *  USB task started.\r
  */\r

-EVENT_HANDLER(USB_Connect)\r
+void EVENT_USB_Connect(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX "USB  +\r\n"));\r
-       LEDs_SetAllLEDs(LEDS_LED2 | LEDS_LED3 | LEDS_LED4);\r
-       \r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "USB  +\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /**\r
  *  Event handler for the USB_Disconnect event. When fired, the event is logged to the USART and the\r
  *  USB task stopped.\r
  */\r
 }\r
 \r
 /**\r
  *  Event handler for the USB_Disconnect event. When fired, the event is logged to the USART and the\r
  *  USB task stopped.\r
  */\r

-EVENT_HANDLER(USB_Disconnect)\r
+void EVENT_USB_Disconnect(void)\r

 {\r
 {\r

-       Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
-\r
-       puts_P(PSTR(EVENT_PREFIX "USB  -\r\n"));\r
-       LEDs_SetAllLEDs(LEDS_LED2 | LEDS_LED3 | LEDS_LED3);\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "USB  -\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /** Event handler for the USB_Suspend event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_Suspend event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_Suspend)\r
+void EVENT_USB_Suspend(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX ESC_BG_YELLOW "USB Sleep\r\n"));\r
-       LEDs_SetAllLEDs(LEDS_ALL_LEDS);\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "USB Sleep\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /** Event handler for the USB_WakeUp event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_WakeUp event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_WakeUp)\r
+void EVENT_USB_WakeUp(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX ESC_BG_GREEN "USB Wakeup\r\n"));\r
-       LEDs_SetAllLEDs(LEDS_LED2 | LEDS_LED4);\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "USB Wakeup\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /** Event handler for the USB_Reset event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_Reset event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_Reset)\r
+void EVENT_USB_Reset(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX "USB Reset\r\n"));\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "USB Reset\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /** Event handler for the USB_UIDChange event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_UIDChange event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_UIDChange)\r
+void EVENT_USB_UIDChange(void)\r

 {\r
        char* ModeStrPtr;\r
 \r
 {\r
        char* ModeStrPtr;\r
 \r

-       puts_P(PSTR(EVENT_PREFIX "UID Change\r\n"));\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "UID Change\r\n"));\r

 \r
        if (USB_CurrentMode == USB_MODE_DEVICE)\r
          ModeStrPtr = PSTR("HOST");\r
 \r
        if (USB_CurrentMode == USB_MODE_DEVICE)\r
          ModeStrPtr = PSTR("HOST");\r


@@ -129,21 +121,19 @@ EVENT_HANDLER(USB_UIDChange)
          ModeStrPtr = PSTR("DEVICE");\r
        else\r
          ModeStrPtr = PSTR("N/A");\r
          ModeStrPtr = PSTR("DEVICE");\r
        else\r
          ModeStrPtr = PSTR("N/A");\r

-       \r
-       LEDs_SetAllLEDs(LEDS_LED2 | LEDS_LED3);\r

 \r
 \r

-       printf_P(PSTR(" -- New Mode %S\r\n"), ModeStrPtr);\r
+       printf_P(PSTR(" -- New Mode %S\r\n" ESC_FG_WHITE), ModeStrPtr);\r

 }\r
 \r
 /**\r
  *  Event handler for the USB_PowerOnFail event. When fired, the event is logged to the USART and the program\r
  *  execution aborted.\r
  */\r
 }\r
 \r
 /**\r
  *  Event handler for the USB_PowerOnFail event. When fired, the event is logged to the USART and the program\r
  *  execution aborted.\r
  */\r

-EVENT_HANDLER(USB_InitFailure)\r
+void EVENT_USB_InitFailure(const uint8_t ErrorCode)\r

 {\r
        char* ModeStrPtr;\r
        \r
 {\r
        char* ModeStrPtr;\r
        \r

-       puts_P(PSTR(EVENT_PREFIX ESC_BG_RED "Power On Fail\r\n"));\r
+       puts_P(PSTR(ESC_FG_RED EVENT_PREFIX "Power On Fail\r\n"));\r

 \r
        if (USB_CurrentMode == USB_MODE_DEVICE)\r
          ModeStrPtr = PSTR("DEVICE");\r
 \r
        if (USB_CurrentMode == USB_MODE_DEVICE)\r
          ModeStrPtr = PSTR("DEVICE");\r


@@ -153,7 +143,7 @@ EVENT_HANDLER(USB_InitFailure)
          ModeStrPtr = PSTR("N/A");\r
        \r
        printf_P(PSTR(" -- Mode %S\r\n"), ModeStrPtr);\r
          ModeStrPtr = PSTR("N/A");\r
        \r
        printf_P(PSTR(" -- Mode %S\r\n"), ModeStrPtr);\r

-       printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
+       printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);\r

 \r
        Abort_Program();\r
 }\r
 \r
        Abort_Program();\r
 }\r


@@ -162,68 +152,52 @@ EVENT_HANDLER(USB_InitFailure)
  *  Event handler for the USB_HostError event. When fired, the event is logged to the USART and the program\r
  *  execution aborted.\r
  */\r
  *  Event handler for the USB_HostError event. When fired, the event is logged to the USART and the program\r
  *  execution aborted.\r
  */\r

-EVENT_HANDLER(USB_HostError)\r
+void EVENT_USB_HostError(const uint8_t ErrorCode)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX ESC_BG_RED "Host Mode Error\r\n"));\r
-       printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
+       puts_P(PSTR(ESC_FG_RED EVENT_PREFIX "Host Mode Error\r\n"));\r
+       printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);\r

 \r
        Abort_Program();\r
 }\r
 \r
 /** Event handler for the USB_DeviceEnumerationFailed event. When fired, the event is logged to the USART. */\r
 \r
        Abort_Program();\r
 }\r
 \r
 /** Event handler for the USB_DeviceEnumerationFailed event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_DeviceEnumerationFailed)\r
+void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r

 {\r
 {\r

-       puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));\r
+       puts_P(PSTR(ESC_FG_RED EVENT_PREFIX "Dev Enum Error\r\n"));\r

        printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
        printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);\r
        printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
        printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);\r

-       printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);\r
-}\r
-\r
-/**\r
- *  Event handler for the USB_DeviceError event. When fired, the event is logged to the USART and the program\r
- *  execution aborted.\r
- */\r
-EVENT_HANDLER(USB_DeviceError)\r
-{\r
-       puts_P(PSTR(EVENT_PREFIX ESC_BG_RED "Device Mode Error\r\n"));\r
-       printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
-\r
-       Abort_Program();\r
+       printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);\r

 }\r
 \r
 /** Event handler for the USB_UnhandledControlPacket event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_UnhandledControlPacket event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_UnhandledControlPacket)\r
+void EVENT_USB_UnhandledControlPacket(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX "Ctrl Request\r\n"));\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "Ctrl Request\r\n"));\r

        printf_P(PSTR(" -- Req Data %d\r\n"), USB_ControlRequest.bRequest);\r
        printf_P(PSTR(" -- Req Type %d\r\n"), USB_ControlRequest.bmRequestType);\r
        printf_P(PSTR(" -- Req Data %d\r\n"), USB_ControlRequest.bRequest);\r
        printf_P(PSTR(" -- Req Type %d\r\n"), USB_ControlRequest.bmRequestType);\r

-       printf_P(PSTR(" -- Req Length %d\r\n"), USB_ControlRequest.wLength);\r
+       printf_P(PSTR(" -- Req Length %d\r\n" ESC_FG_WHITE), USB_ControlRequest.wLength);\r

 }\r
 \r
 /** Event handler for the USB_ConfigurationChanged event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_ConfigurationChanged event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_ConfigurationChanged)\r
+void EVENT_USB_ConfigurationChanged(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX "Configuration Number Changed\r\n"));\r
-\r
-       LEDs_SetAllLEDs(LEDS_LED2 | LEDS_LED4);\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "Configuration Number Changed\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /** Event handler for the USB_DeviceAttached event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_DeviceAttached event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_DeviceAttached)\r
+void EVENT_USB_DeviceAttached(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX ESC_BG_GREEN "Device +\r\n"));\r
-\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
+       puts_P(PSTR(ESC_FG_GREEN EVENT_PREFIX "Device +\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /** Event handler for the USB_DeviceUnattached event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_DeviceUnattached event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_DeviceUnattached)\r
+void EVENT_USB_DeviceUnattached(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX ESC_BG_YELLOW "Device -\r\n"));\r
+       puts_P(PSTR(ESC_FG_GREEN EVENT_PREFIX "Device -\r\n" ESC_FG_WHITE));\r

 }\r
 \r
 /** Event handler for the USB_DeviceEnumerationComplete event. When fired, the event is logged to the USART. */\r
 }\r
 \r
 /** Event handler for the USB_DeviceEnumerationComplete event. When fired, the event is logged to the USART. */\r

-EVENT_HANDLER(USB_DeviceEnumerationComplete)\r
+void EVENT_USB_DeviceEnumerationComplete(void)\r

 {\r
 {\r

-       puts_P(PSTR(EVENT_PREFIX "Device Enumeration Complete\r\n"));\r
+       puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "Device Enumeration Complete\r\n" ESC_FG_WHITE));\r

 }\r
 }\r