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

[pub/USBasp.git] / Demos / Host / CDCHost / CDCHost.c

diff --git a/Demos/Host/CDCHost/CDCHost.c b/Demos/Host/CDCHost/CDCHost.c
index 1f05ecb..b834731 100644 (file)
--- a/Demos/Host/CDCHost/CDCHost.c
+++ b/Demos/Host/CDCHost/CDCHost.c
@@ -36,17 +36,11 @@
  \r
 #include "CDCHost.h"\r
 \r
  \r
 #include "CDCHost.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA CDC Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r

-       { Task: USB_USBTask          , TaskStatus: TASK_STOP },\r
-       { Task: USB_CDC_Host         , TaskStatus: TASK_STOP },\r
+       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
+       { .Task = USB_CDC_Host         , .TaskStatus = TASK_STOP },\r

 };\r
 \r
 \r
 };\r
 \r
 \r


@@ -75,7 +69,7 @@ int main(void)
        /* Initialize USB Subsystem */\r
        USB_Init();\r
 \r
        /* Initialize USB Subsystem */\r
        USB_Init();\r
 \r

-       /* Startup message */\r
+       /* Start-up message */\r

        puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY\r
               "CDC Host Demo running.\r\n" ESC_INVERSE_OFF));\r
                   \r
        puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY\r
               "CDC Host Demo running.\r\n" ESC_INVERSE_OFF));\r
                   \r


@@ -86,7 +80,7 @@ int main(void)
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r

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

 {\r
        puts_P(PSTR("Device Attached.\r\n"));\r
        UpdateStatus(Status_USBEnumerating);\r
 {\r
        puts_P(PSTR("Device Attached.\r\n"));\r
        UpdateStatus(Status_USBEnumerating);\r


@@ -98,7 +92,7 @@ EVENT_HANDLER(USB_DeviceAttached)
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
  *  stops the library USB task management process.\r
  */\r
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
  *  stops the library USB task management process.\r
  */\r

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

 {\r
        /* Stop keyboard and USB management task */\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
 {\r
        /* Stop keyboard and USB management task */\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r


@@ -111,7 +105,7 @@ EVENT_HANDLER(USB_DeviceUnattached)
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
  *  enumerated by the host and is now ready to be used by the application.\r
  */\r
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
  *  enumerated by the host and is now ready to be used by the application.\r
  */\r

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

 {\r
        /* Start CDC Host task */\r
        Scheduler_SetTaskMode(USB_CDC_Host, TASK_RUN);\r
 {\r
        /* Start CDC Host task */\r
        Scheduler_SetTaskMode(USB_CDC_Host, TASK_RUN);\r


@@ -121,7 +115,7 @@ EVENT_HANDLER(USB_DeviceEnumerationComplete)
 }\r
 \r
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */\r
 }\r
 \r
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */\r

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

 {\r
        USB_ShutDown();\r
 \r
 {\r
        USB_ShutDown();\r
 \r


@@ -132,10 +126,10 @@ EVENT_HANDLER(USB_HostError)
        for(;;);\r
 }\r
 \r
        for(;;);\r
 }\r
 \r

-/** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occured while\r
+/** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\r

  *  enumerating an attached USB device.\r
  */\r
  *  enumerating an attached USB device.\r
  */\r

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

 {\r
        puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));\r
        printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
 {\r
        puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));\r
        printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r


@@ -187,16 +181,19 @@ TASK(USB_CDC_Host)
        {\r
                case HOST_STATE_Addressed:\r
                        /* Standard request to set the device configuration to configuration 1 */\r
        {\r
                case HOST_STATE_Addressed:\r
                        /* Standard request to set the device configuration to configuration 1 */\r

-                       USB_HostRequest = (USB_Host_Request_Header_t)\r
+                       USB_ControlRequest = (USB_Request_Header_t)\r

                                {\r
                                {\r

-                                       bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                                       bRequest:      REQ_SetConfiguration,\r
-                                       wValue:        1,\r
-                                       wIndex:        0,\r
-                                       wLength:       0,\r
+                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                                       .bRequest      = REQ_SetConfiguration,\r
+                                       .wValue        = 1,\r
+                                       .wIndex        = 0,\r
+                                       .wLength       = 0,\r

                                };\r
 \r
                                };\r
 \r

-                       /* Send the request, display error and wait for device detatch if request fails */\r
+                       /* Select the control pipe for the request transfer */\r
+                       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r
+                       /* Send the request, display error and wait for device detach if request fails */\r

                        if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
                        {\r
                                puts_P(PSTR("Control Error (Set Configuration).\r\n"));\r
                        if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)\r
                        {\r
                                puts_P(PSTR("Control Error (Set Configuration).\r\n"));\r


@@ -241,33 +238,37 @@ TASK(USB_CDC_Host)
                        /* Select and the data IN pipe */\r
                        Pipe_SelectPipe(CDC_DATAPIPE_IN);\r
 \r
                        /* Select and the data IN pipe */\r
                        Pipe_SelectPipe(CDC_DATAPIPE_IN);\r
 \r

-                       /* Check if data is in the pipe */\r
-                       if (Pipe_ReadWriteAllowed())\r
+                       /* Check to see if a packet has been received */\r
+                       if (Pipe_IsINReceived())\r

                        {\r
                        {\r

-                               /* Get the length of the pipe data, and create a new buffer to hold it */\r
-                               uint16_t BufferLength = Pipe_BytesInPipe();\r
-                               uint8_t Buffer[BufferLength];\r
-                               \r
-                               /* Read in the pipe data to the tempoary buffer */\r
-                               Pipe_Read_Stream_LE(Buffer, BufferLength);\r
-                               \r
+                               /* Check if data is in the pipe */\r
+                               if (Pipe_IsReadWriteAllowed())\r
+                               {\r
+                                       /* Get the length of the pipe data, and create a new buffer to hold it */\r
+                                       uint16_t BufferLength = Pipe_BytesInPipe();\r
+                                       uint8_t  Buffer[BufferLength];\r
+                                       \r
+                                       /* Read in the pipe data to the temporary buffer */\r
+                                       Pipe_Read_Stream_LE(Buffer, BufferLength);\r
+                                                                       \r
+                                       /* Print out the buffer contents to the USART */\r
+                                       for (uint16_t BufferByte = 0; BufferByte < BufferLength; BufferByte++)\r
+                                         putchar(Buffer[BufferByte]);\r
+                               }\r
+\r

                                /* Clear the pipe after it is read, ready for the next packet */\r
                                /* Clear the pipe after it is read, ready for the next packet */\r

-                               Pipe_ClearCurrentBank();\r
-                               \r
-                               /* Print out the buffer contents to the USART */\r
-                               for (uint16_t BufferByte = 0; BufferByte < BufferLength; BufferByte++)\r
-                                 putchar(Buffer[BufferByte]);\r
+                               Pipe_ClearIN();\r

                        }\r
 \r
                        /* Select and unfreeze the notification pipe */\r
                        Pipe_SelectPipe(CDC_NOTIFICATIONPIPE);\r
                        Pipe_Unfreeze();\r
                        \r
                        }\r
 \r
                        /* Select and unfreeze the notification pipe */\r
                        Pipe_SelectPipe(CDC_NOTIFICATIONPIPE);\r
                        Pipe_Unfreeze();\r
                        \r

-                       /* Check if data is in the pipe */\r
-                       if (Pipe_ReadWriteAllowed())\r
+                       /* Check if a packet has been received */\r
+                       if (Pipe_IsINReceived())\r

                        {\r
                        {\r

-                               /* Discard the event notification */\r
-                               Pipe_ClearCurrentBank();\r
+                               /* Discard the unused event notification */\r
+                               Pipe_ClearIN();\r

                        }\r
                        \r
                        /* Freeze notification IN pipe after use */\r
                        }\r
                        \r
                        /* Freeze notification IN pipe after use */\r