More minor renaming of library enums and events to try to create a consistent API.

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

diff --git a/Demos/Host/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/MouseHostWithParser/MouseHostWithParser.c
index 259da2a..58a189f 100644 (file)
--- a/Demos/Host/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.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


@@ -185,13 +185,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


@@ -312,7 +312,7 @@ void ProcessMouseReport(uint8_t* MouseReport)
                        (ReportItem->ItemType                    == REPORT_ITEM_TYPE_In))\r
                {\r
                        /* Get the mouse button value */\r
                        (ReportItem->ItemType                    == REPORT_ITEM_TYPE_In))\r
                {\r
                        /* Get the mouse button value */\r

-                       FoundData = GetReportItemInfo(MouseReport, ReportItem);\r
+                       FoundData = USB_GetHIDReportItemInfo(MouseReport, ReportItem);\r

                        \r
                        /* For multi-report devices - if the requested data was not in the issued report, continue */\r
                        if (!(FoundData))\r
                        \r
                        /* For multi-report devices - if the requested data was not in the issued report, continue */\r
                        if (!(FoundData))\r


@@ -328,7 +328,7 @@ void ProcessMouseReport(uint8_t* MouseReport)
                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r
                {\r
                        /* Get the mouse relative position value */\r
                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))\r
                {\r
                        /* Get the mouse relative position value */\r

-                       FoundData = GetReportItemInfo(MouseReport, ReportItem);\r
+                       FoundData = USB_GetHIDReportItemInfo(MouseReport, ReportItem);\r

                        \r
                        /* For multi-report devices - if the requested data was not in the issued report, continue */\r
                        if (!(FoundData))\r
                        \r
                        /* For multi-report devices - if the requested data was not in the issued report, continue */\r
                        if (!(FoundData))\r