Removed interrupt disable/enable from the Device mode control request processing...

[pub/USBasp.git] / Demos / Device / ClassDriver / Mouse / Mouse.c

diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.c b/Demos/Device/ClassDriver/Mouse/Mouse.c
index 4489434..08e87e6 100644 (file)
--- a/Demos/Device/ClassDriver/Mouse/Mouse.c
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.c
@@ -36,6 +36,9 @@
 \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
@@ -48,6 +51,9 @@ USB_ClassInfo_HID_Device_t Mouse_HID_Interface =
 \r
                                .ReportINEndpointNumber  = MOUSE_EPNUM,\r
                                .ReportINEndpointSize    = MOUSE_EPSIZE,\r
+\r
+                               .PrevReportINBuffer      = PrevMouseHIDReportBuffer,\r
+                               .PrevReportINBufferSize  = sizeof(PrevMouseHIDReportBuffer),\r
                        },\r
        };\r
 \r
@@ -120,8 +126,7 @@ void EVENT_USB_UnhandledControlPacket(void)
 /** 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
 {\r
-       if (Mouse_HID_Interface.State.IdleMSRemaining)\r
-         Mouse_HID_Interface.State.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
@@ -129,10 +134,12 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
  *  \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_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const 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
@@ -155,7 +162,8 @@ uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const H
        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