X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d1e52660368d34d693131f6aff3c8fd8584162e5..dc42c5eb6b663b0b117b5660ba5818186744efd5:/Demos/Device/KeyboardMouse/KeyboardMouse.c?ds=inline

diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.c b/Demos/Device/KeyboardMouse/KeyboardMouse.c
index 8f6a573a6..e68a24793 100644
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.c
@@ -28,9 +28,20 @@
   arising out of or in connection with the use or performance of
   this software.
 */
- 
+
+/** \file
+ *
+ *  Main source file for the KeyboardMouse demo. This file contains the main tasks of
+ *  the demo and is responsible for the initial application hardware configuration.
+ */
+
 #include "KeyboardMouse.h"
 
+/** LUFA HID Class driver interface configuration and state information. This structure is
+ *  passed to all HID Class driver functions, so that multiple instances of the same class
+ *  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 =
 	{
 		.InterfaceNumber         = 0,
@@ -41,11 +52,16 @@ USB_ClassInfo_HID_t Keyboard_HID_Interface =
 		.ReportOUTEndpointNumber = KEYBOARD_OUT_EPNUM,
 		.ReportOUTEndpointSize   = HID_EPSIZE,
 		
-		.ReportBufferSize        = sizeof(USB_KeyboardReport_Data_t),
+		.ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),
 
 		.IdleCount               = 500,
 	};
 	
+/** LUFA HID Class driver interface configuration and state information. This structure is
+ *  passed to all HID Class driver functions, so that multiple instances of the same class
+ *  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 =
 	{
 		.InterfaceNumber         = 0,
@@ -53,12 +69,15 @@ USB_ClassInfo_HID_t Mouse_HID_Interface =
 		.ReportINEndpointNumber  = MOUSE_IN_EPNUM,
 		.ReportINEndpointSize    = HID_EPSIZE,
 
-		.ReportBufferSize        = sizeof(USB_MouseReport_Data_t),
+		.ReportINBufferSize      = sizeof(USB_MouseReport_Data_t),
 
 		.ReportOUTEndpointNumber = 0,
 		.ReportOUTEndpointSize   = 0,
 	};
-	
+
+/** Main program entry point. This routine contains the overall program flow, including initial
+ *  setup of all components and the main program loop.
+ */
 int main(void)
 {
 	SetupHardware();
@@ -73,6 +92,7 @@ int main(void)
 	}
 }
 
+/** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware()
 {
 	/* Disable watchdog if enabled by bootloader/fuses */
@@ -85,19 +105,28 @@ void SetupHardware()
 	/* Hardware Initialization */
 	Joystick_Init();
 	LEDs_Init();
-	USB_Init();	
+	USB_Init();
+
+	/* Millisecond timer initialization, with output compare interrupt enabled for the idle timing */
+	OCR0A  = ((F_CPU / 64) / 1000);
+	TCCR0A = (1 << WGM01);
+	TCCR0B = ((1 << CS01) | (1 << CS00));
+	TIMSK0 = (1 << OCIE0A);
 }
 
+/** Event handler for the library USB Connection event. */
 void EVENT_USB_Connect(void)
 {
-	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
+    LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
 }
 
+/** Event handler for the library USB Disconnection event. */
 void EVENT_USB_Disconnect(void)
 {
-	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
+    LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 }
 
+/** Event handler for the library USB Configuration Changed event. */
 void EVENT_USB_ConfigurationChanged(void)
 {
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
@@ -109,18 +138,30 @@ void EVENT_USB_ConfigurationChanged(void)
 	  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);
 }
 
-void EVENT_USB_StartOfFrame(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)
 {
-	USB_HID_RegisterStartOfFrame(&Keyboard_HID_Interface);
-	USB_HID_RegisterStartOfFrame(&Mouse_HID_Interface);
+	if (Keyboard_HID_Interface.IdleMSRemaining)
+	  Keyboard_HID_Interface.IdleMSRemaining--;
+
+	if (Mouse_HID_Interface.IdleMSRemaining)
+	  Mouse_HID_Interface.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
+ *
+ *  \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, void* ReportData)
 {
 	uint8_t JoyStatus_LCL    = Joystick_GetStatus();
@@ -174,6 +215,12 @@ 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
+ */
 void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData, uint16_t ReportSize)
 {
 	if (HIDInterfaceInfo == &Keyboard_HID_Interface)