\r
#include "Mouse.h"\r
\r
+/** Buffer to hold the previously generated Mouse HID report, for comparison purposes inside the HID class driver. */\r
+uint8_t PrevMouseHIDReportBuffer[sizeof(USB_MouseReport_Data_t)];\r
+\r
/** LUFA HID Class driver interface configuration and state information. This structure is\r
* passed to all HID Class driver functions, so that multiple instances of the same class\r
* within a device can be differentiated from one another.\r
*/\r
-USB_ClassInfo_HID_t Mouse_HID_Interface =\r
+USB_ClassInfo_HID_Device_t Mouse_HID_Interface =\r
{\r
- .InterfaceNumber = 0,\r
+ .Config =\r
+ {\r
+ .InterfaceNumber = 0,\r
\r
- .ReportINEndpointNumber = MOUSE_EPNUM,\r
- .ReportINEndpointSize = MOUSE_EPSIZE,\r
+ .ReportINEndpointNumber = MOUSE_EPNUM,\r
+ .ReportINEndpointSize = MOUSE_EPSIZE,\r
\r
- .ReportINBufferSize = sizeof(USB_MouseReport_Data_t),\r
+ .PrevReportINBuffer = PrevMouseHIDReportBuffer,\r
+ .PrevReportINBufferSize = sizeof(PrevMouseHIDReportBuffer),\r
+ },\r
};\r
\r
/** Main program entry point. This routine contains the overall program flow, including initial\r
\r
for (;;)\r
{\r
- USB_HID_USBTask(&Mouse_HID_Interface);\r
+ HID_Device_USBTask(&Mouse_HID_Interface);\r
USB_USBTask();\r
}\r
}\r
LEDs_Init();\r
Buttons_Init();\r
USB_Init();\r
-\r
- /* Millisecond timer initialization, with output compare interrupt enabled for the idle timing */\r
- OCR0A = ((F_CPU / 64) / 1000);\r
- TCCR0A = (1 << WGM01);\r
- TCCR0B = ((1 << CS01) | (1 << CS00));\r
- TIMSK0 = (1 << OCIE0A);\r
}\r
\r
-/** Event handler for the library USB Connection event. */\r
-void EVENT_USB_Connect(void)\r
+/** Event handler for the library USB WakeUp event. */\r
+void EVENT_USB_Device_Connect(void)\r
{\r
- LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
+ LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
}\r
\r
-/** Event handler for the library USB Disconnection event. */\r
-void EVENT_USB_Disconnect(void)\r
+/** Event handler for the library USB Suspend event. */\r
+void EVENT_USB_Device_Disconnect(void)\r
{\r
- LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+ LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
}\r
\r
/** Event handler for the library USB Configuration Changed event. */\r
-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r
{\r
LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
\r
- if (!(USB_HID_ConfigureEndpoints(&Mouse_HID_Interface)))\r
+ if (!(HID_Device_ConfigureEndpoints(&Mouse_HID_Interface)))\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+\r
+ USB_Device_EnableSOFEvents();\r
}\r
\r
-/** Event handler for the library USB Unhandled Control Packet event. */\r
-void EVENT_USB_UnhandledControlPacket(void)\r
+/** Event handler for the library USB Unhandled Control Request event. */\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r
{\r
- USB_HID_ProcessControlPacket(&Mouse_HID_Interface);\r
+ HID_Device_ProcessControlRequest(&Mouse_HID_Interface);\r
}\r
\r
-/** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */\r
-ISR(TIMER0_COMPA_vect, ISR_BLOCK)\r
+/** Event handler for the USB device Start Of Frame event. */\r
+void EVENT_USB_Device_StartOfFrame(void)\r
{\r
- if (Mouse_HID_Interface.IdleMSRemaining)\r
- Mouse_HID_Interface.IdleMSRemaining--;\r
+ HID_Device_MillisecondElapsed(&Mouse_HID_Interface);\r
}\r
\r
/** HID class driver callback function for the creation of HID reports to the host.\r
*\r
- * \param HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced\r
- * \param ReportData Pointer to a buffer where the created report should be stored\r
+ * \param[in] HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced\r
+ * \param[in,out] ReportID Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID\r
+ * \param[out] ReportData Pointer to a buffer where the created report should be stored\r
+ * \param[out] ReportSize Number of bytes written in the report (or zero if no report is to be sent\r
*\r
- * \return Number of bytes written in the report (or zero if no report is to be sent\r
+ * \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent\r
*/\r
-uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)\r
+bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,\r
+ void* ReportData, uint16_t* ReportSize)\r
{\r
USB_MouseReport_Data_t* MouseReport = (USB_MouseReport_Data_t*)ReportData;\r
\r
if (ButtonStatus_LCL & BUTTONS_BUTTON1)\r
MouseReport->Button |= (1 << 1);\r
\r
- return sizeof(USB_MouseReport_Data_t);\r
+ *ReportSize = sizeof(USB_MouseReport_Data_t);\r
+ return true;\r
}\r
\r
/** HID class driver callback function for the processing of HID reports from the host.\r
*\r
- * \param HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced\r
- * \param ReportData Pointer to a buffer where the created report has been stored\r
- * \param ReportSize Size in bytes of the received HID report\r
+ * \param[in] HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced\r
+ * \param[in] ReportID Report ID of the received report from the host\r
+ * \param[in] ReportData Pointer to a buffer where the created report has been stored\r
+ * \param[in] ReportSize Size in bytes of the received HID report\r
*/\r
-void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,\r
- void* ReportData, uint16_t ReportSize)\r
+void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,\r
+ const void* ReportData, const uint16_t ReportSize)\r
{\r
// Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports\r
}\r
projects / pub / USBasp.git / blobdiff