Synchronise with the 090605 release.

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

diff --git a/Demos/Host/MouseHost/MouseHost.c b/Demos/Host/MouseHost/MouseHost.c
index 6a59b4d..7db9580 100644 (file)
--- a/Demos/Host/MouseHost/MouseHost.c
+++ b/Demos/Host/MouseHost/MouseHost.c
@@ -39,8 +39,8 @@
 /* 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_Mouse_Host       , TaskStatus: TASK_STOP },\r
+       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
+       { .Task = USB_Mouse_Host       , .TaskStatus = TASK_STOP },\r

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


@@ -80,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


@@ -92,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 mouse and USB management task */\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
 {\r
        /* Stop mouse and USB management task */\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r


@@ -105,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 Mouse Host task */\r
        Scheduler_SetTaskMode(USB_Mouse_Host, TASK_RUN);\r
 {\r
        /* Start Mouse Host task */\r
        Scheduler_SetTaskMode(USB_Mouse_Host, TASK_RUN);\r


@@ -115,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


@@ -129,7 +129,7 @@ EVENT_HANDLER(USB_HostError)
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\r
  *  enumerating an attached USB device.\r
  */\r
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\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


@@ -181,18 +181,14 @@ void ReadNextReport(void)
        /* Select mouse data pipe */\r
        Pipe_SelectPipe(MOUSE_DATAPIPE);        \r
 \r
        /* Select mouse data pipe */\r
        Pipe_SelectPipe(MOUSE_DATAPIPE);        \r
 \r

-       #if !defined(INTERRUPT_DATA_PIPE)\r

        /* Unfreeze keyboard data pipe */\r
        Pipe_Unfreeze();\r
        /* Unfreeze keyboard data pipe */\r
        Pipe_Unfreeze();\r

-       #endif\r

 \r
        /* Check to see if a packet has been received */\r
        if (!(Pipe_IsINReceived()))\r
        {\r
 \r
        /* Check to see if a packet has been received */\r
        if (!(Pipe_IsINReceived()))\r
        {\r

-               #if !defined(INTERRUPT_DATA_PIPE)\r

                /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r
                /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r

-               #endif\r

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


@@ -230,10 +226,8 @@ void ReadNextReport(void)
        /* Clear the IN endpoint, ready for next data packet */\r
        Pipe_ClearIN();\r
 \r
        /* Clear the IN endpoint, ready for next data packet */\r
        Pipe_ClearIN();\r
 \r

-       #if !defined(INTERRUPT_DATA_PIPE)\r

        /* Refreeze mouse data pipe */\r
        Pipe_Freeze();\r
        /* Refreeze mouse data pipe */\r
        Pipe_Freeze();\r

-       #endif\r

 }\r
 \r
 /** Task to set the configuration of the attached device after it has been enumerated, and to read and process\r
 }\r
 \r
 /** Task to set the configuration of the attached device after it has been enumerated, and to read and process\r


@@ -248,13 +242,13 @@ TASK(USB_Mouse_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
                        /* Select the control pipe for the request transfer */\r
                                };\r
 \r
                        /* Select the control pipe for the request transfer */\r


@@ -298,13 +292,13 @@ TASK(USB_Mouse_Host)
                        }\r
                \r
                        /* HID class request to set the mouse protocol to the Boot Protocol */\r
                        }\r
                \r
                        /* HID class request to set the mouse protocol to the Boot Protocol */\r

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

                                {\r
                                {\r

-                                       bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
-                                       bRequest:      REQ_SetProtocol,\r
-                                       wValue:        0,\r
-                                       wIndex:        0,\r
-                                       wLength:       0,\r
+                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                                       .bRequest      = REQ_SetProtocol,\r
+                                       .wValue        = 0,\r
+                                       .wIndex        = 0,\r
+                                       .wLength       = 0,\r

                                };\r
 \r
                        /* Select the control pipe for the request transfer */\r
                                };\r
 \r
                        /* Select the control pipe for the request transfer */\r


@@ -324,54 +318,14 @@ TASK(USB_Mouse_Host)
                                break;\r
                        }\r
 \r
                                break;\r
                        }\r
 \r

-                       #if defined(INTERRUPT_DATA_PIPE)                        \r
-                       /* Select and unfreeze mouse data pipe */\r
-                       Pipe_SelectPipe(MOUSE_DATAPIPE);        \r
-                       Pipe_Unfreeze();\r
-                       #endif\r
-\r

                        puts_P(PSTR("Mouse Enumerated.\r\n"));\r
                        \r
                        USB_HostState = HOST_STATE_Ready;\r
                        break;\r
                        puts_P(PSTR("Mouse Enumerated.\r\n"));\r
                        \r
                        USB_HostState = HOST_STATE_Ready;\r
                        break;\r

-               #if !defined(INTERRUPT_DATA_PIPE)\r

                case HOST_STATE_Ready:\r
                        /* If a report has been received, read and process it */\r
                        ReadNextReport();\r
 \r
                        break;\r
                case HOST_STATE_Ready:\r
                        /* If a report has been received, read and process it */\r
                        ReadNextReport();\r
 \r
                        break;\r

-               #endif\r
-       }\r
-}\r
-\r
-#if defined(INTERRUPT_DATA_PIPE)\r
-/** Interrupt handler for the Endpoint/Pipe interrupt vector. This interrupt fires each time an enabled\r
- *  pipe interrupt occurs on a pipe which has had that interrupt enabled.\r
- */\r
-ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)\r
-{\r
-       /* Save previously selected pipe before selecting a new pipe */\r
-       uint8_t PrevSelectedPipe = Pipe_GetCurrentPipe();\r
-\r
-       /* Check to see if the mouse data pipe has caused the interrupt */\r
-       if (Pipe_HasPipeInterrupted(MOUSE_DATAPIPE))\r
-       {\r
-               /* Clear the pipe interrupt, and select the mouse pipe */\r
-               Pipe_ClearPipeInterrupt(MOUSE_DATAPIPE);\r
-               Pipe_SelectPipe(MOUSE_DATAPIPE);        \r
-\r
-               /* Check to see if the pipe IN interrupt has fired */\r
-               if (USB_INT_HasOccurred(PIPE_INT_IN) && USB_INT_IsEnabled(PIPE_INT_IN))\r
-               {\r
-                       /* Clear interrupt flag */\r
-                       USB_INT_Clear(PIPE_INT_IN);             \r
-\r
-                       /* Read and process the next report from the device */\r
-                       ReadNextReport();\r
-               }\r

        }\r
        }\r

-\r
-       /* Restore previously selected pipe */\r
-       Pipe_SelectPipe(PrevSelectedPipe);\r

 }\r
 }\r

-#endif\r