X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b9b03aadb219d06fbad9d110e508db93e45461af..2a0c28e6e47c8a173f32fc99cd8666a2633c5c12:/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c?ds=inline

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
index 5cea55580..5c33eebe1 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -42,16 +42,22 @@
  *  within a device can be differentiated from one another. This is for the keyboard HID
  *  interface within the device.
  */
-USB_ClassInfo_HID_t Keyboard_HID_Interface =
+USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =
 	{
-		.InterfaceNumber         = 0,
-
-		.ReportINEndpointNumber  = KEYBOARD_IN_EPNUM,
-		.ReportINEndpointSize    = HID_EPSIZE,
-		
-		.ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),
-
-		.IdleCount               = 500,
+		.Config =
+			{
+				.InterfaceNumber         = 0,
+
+				.ReportINEndpointNumber  = KEYBOARD_IN_EPNUM,
+				.ReportINEndpointSize    = HID_EPSIZE,
+				
+				.ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),
+			},
+
+		.State =
+			{
+				.IdleCount               = 500,
+			}
 	};
 	
 /** LUFA HID Class driver interface configuration and state information. This structure is
@@ -59,14 +65,22 @@ USB_ClassInfo_HID_t Keyboard_HID_Interface =
  *  within a device can be differentiated from one another. This is for the mouse HID
  *  interface within the device.
  */
-USB_ClassInfo_HID_t Mouse_HID_Interface =
+USB_ClassInfo_HID_Device_t Mouse_HID_Interface =
 	{
-		.InterfaceNumber         = 0,
-
-		.ReportINEndpointNumber  = MOUSE_IN_EPNUM,
-		.ReportINEndpointSize    = HID_EPSIZE,
-
-		.ReportINBufferSize      = sizeof(USB_MouseReport_Data_t),
+		.Config =
+			{
+				.InterfaceNumber         = 0,
+
+				.ReportINEndpointNumber  = MOUSE_IN_EPNUM,
+				.ReportINEndpointSize    = HID_EPSIZE,
+
+				.ReportINBufferSize      = sizeof(USB_MouseReport_Data_t),
+			},
+			
+		.State =
+			{
+				// Leave all state values to their defaults
+			}			
 	};
 
 /** Main program entry point. This routine contains the overall program flow, including initial
@@ -80,8 +94,8 @@ int main(void)
 
 	for (;;)
 	{
-		USB_HID_USBTask(&Keyboard_HID_Interface);
-		USB_HID_USBTask(&Mouse_HID_Interface);
+		HID_Device_USBTask(&Keyboard_HID_Interface);
+		HID_Device_USBTask(&Mouse_HID_Interface);
 		USB_USBTask();
 	}
 }
@@ -125,38 +139,39 @@ void EVENT_USB_ConfigurationChanged(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
 
-	if (!(USB_HID_ConfigureEndpoints(&Keyboard_HID_Interface)))
+	if (!(HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface)))
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 	
-	if (!(USB_HID_ConfigureEndpoints(&Mouse_HID_Interface)))
+	if (!(HID_Device_ConfigureEndpoints(&Mouse_HID_Interface)))
 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
 
 /** Event handler for the library USB Unhandled Control Packet event. */
 void EVENT_USB_UnhandledControlPacket(void)
 {
-	USB_HID_ProcessControlPacket(&Keyboard_HID_Interface);
-	USB_HID_ProcessControlPacket(&Mouse_HID_Interface);
+	HID_Device_ProcessControlPacket(&Keyboard_HID_Interface);
+	HID_Device_ProcessControlPacket(&Mouse_HID_Interface);
 }
 
 /** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */
 ISR(TIMER0_COMPA_vect, ISR_BLOCK)
 {
-	if (Keyboard_HID_Interface.IdleMSRemaining)
-	  Keyboard_HID_Interface.IdleMSRemaining--;
+	if (Keyboard_HID_Interface.State.IdleMSRemaining)
+	  Keyboard_HID_Interface.State.IdleMSRemaining--;
 
-	if (Mouse_HID_Interface.IdleMSRemaining)
-	  Mouse_HID_Interface.IdleMSRemaining--;
+	if (Mouse_HID_Interface.State.IdleMSRemaining)
+	  Mouse_HID_Interface.State.IdleMSRemaining--;
 }
 
 /** HID class driver callback function for the creation of HID reports to the host.
  *
- *  \param HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
- *  \param ReportData  Pointer to a buffer where the created report should be stored
+ *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
+ *  \param[in,out] ReportID  Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID
+ *  \param[out] ReportData  Pointer to a buffer where the created report should be stored
  *
  *  \return Number of bytes written in the report (or zero if no report is to be sent
  */
-uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)
+uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, void* ReportData)
 {
 	uint8_t JoyStatus_LCL    = Joystick_GetStatus();
 	uint8_t ButtonStatus_LCL = Buttons_GetStatus();
@@ -211,12 +226,13 @@ uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceI
 
 /** HID class driver callback function for the processing of HID reports from the host.
  *
- *  \param HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
- *  \param ReportData  Pointer to a buffer where the created report has been stored
- *  \param ReportSize  Size in bytes of the received HID report
+ *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
+ *  \param[in] ReportID  Report ID of the received report from the host
+ *  \param[in] ReportData  Pointer to a buffer where the created report has been stored
+ *  \param[in] ReportSize  Size in bytes of the received HID report
  */
-void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,
-                                               void* ReportData, uint16_t ReportSize)
+void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,
+                                          const void* ReportData, const uint16_t ReportSize)
 {
 	if (HIDInterfaceInfo == &Keyboard_HID_Interface)
 	{