X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f896c00c48f04fb9273555ab8d9b1af99f865d25..a789619fbe2cd07347816cc5c168e8f904acca86:/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c?ds=sidebyside

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
index 93722195a..418ccba4e 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -50,14 +50,7 @@ USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =
 
 				.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
@@ -73,14 +66,7 @@ USB_ClassInfo_HID_Device_t Mouse_HID_Interface =
 
 				.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
@@ -156,22 +142,19 @@ void EVENT_USB_UnhandledControlPacket(void)
 /** 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.State.IdleMSRemaining)
-	  Keyboard_HID_Interface.State.IdleMSRemaining--;
-
-	if (Mouse_HID_Interface.State.IdleMSRemaining)
-	  Mouse_HID_Interface.State.IdleMSRemaining--;
+	HID_Device_MillisecondElapsed(&Keyboard_HID_Interface);
+	HID_Device_MillisecondElapsed(&Mouse_HID_Interface);
 }
 
 /** 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 ReportID  Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID
- *  \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_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_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();
@@ -226,13 +209,13 @@ uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* HIDInte
 
 /** 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 ReportID  Report ID of the received report from the host
- *  \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_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_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)
 	{