X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/8f6b4ddf764c3a54e42d00a7502c82c5c3e71b1c..01c4bef107214d5a4407a654754dc952ddd5cdba:/Demos/Host/MouseHostWithParser/MouseHostWithParser.c

diff --git a/Demos/Host/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/MouseHostWithParser/MouseHostWithParser.c
index 259da2a60..58a189f6b 100644
--- a/Demos/Host/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.c
@@ -39,8 +39,8 @@
 /* Scheduler Task List */
 TASK_LIST
 {
-	{ Task: USB_USBTask          , TaskStatus: TASK_STOP },
-	{ Task: USB_Mouse_Host       , TaskStatus: TASK_STOP },
+	{ .Task = USB_USBTask          , .TaskStatus = TASK_STOP },
+	{ .Task = USB_Mouse_Host       , .TaskStatus = TASK_STOP },
 };
 
 
@@ -185,13 +185,13 @@ TASK(USB_Mouse_Host)
 	{
 		case HOST_STATE_Addressed:	
 			/* Standard request to set the device configuration to configuration 1 */
-			USB_HostRequest = (USB_Host_Request_Header_t)
+			USB_ControlRequest = (USB_Request_Header_t)
 				{
-					bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
-					bRequest:      REQ_SetConfiguration,
-					wValue:        1,
-					wIndex:        0,
-					wLength:       0,
+					.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
+					.bRequest      = REQ_SetConfiguration,
+					.wValue        = 1,
+					.wIndex        = 0,
+					.wLength       = 0,
 				};
 
 			/* Select the control pipe for the request transfer */
@@ -312,7 +312,7 @@ void ProcessMouseReport(uint8_t* MouseReport)
 			(ReportItem->ItemType                    == REPORT_ITEM_TYPE_In))
 		{
 			/* Get the mouse button value */
-			FoundData = GetReportItemInfo(MouseReport, ReportItem);
+			FoundData = USB_GetHIDReportItemInfo(MouseReport, ReportItem);
 			
 			/* For multi-report devices - if the requested data was not in the issued report, continue */
 			if (!(FoundData))
@@ -328,7 +328,7 @@ void ProcessMouseReport(uint8_t* MouseReport)
 				 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))
 		{
 			/* Get the mouse relative position value */
-			FoundData = GetReportItemInfo(MouseReport, ReportItem);
+			FoundData = USB_GetHIDReportItemInfo(MouseReport, ReportItem);
 			
 			/* For multi-report devices - if the requested data was not in the issued report, continue */
 			if (!(FoundData))