Fixed Mouse and Keyboard device demos not acting in accordance with the HID specification for idle periods (thanks to Brian Dickman).

Removed support for endpoint/pipe non-control interrupts; these did not act in the way users expected, and had many subtle issues.

10 files changed, 72 insertions, 234 deletions

diff --git a/Demos/Device/GenericHID/GenericHID.c b/Demos/Device/GenericHID/GenericHID.c
index 695342d0e..d4e7cca73 100644
--- a/Demos/Device/GenericHID/GenericHID.c
+++ b/Demos/Device/GenericHID/GenericHID.c
@@ -43,9 +43,7 @@ TASK_LIST
 	{ .Task = USB_USBTask          , .TaskStatus = TASK_STOP },

 	#endif

 	

-	#if !defined(INTERRUPT_DATA_ENDPOINT)

 	{ .Task = USB_HID_Report       , .TaskStatus = TASK_STOP },

-	#endif

 };

 

 /** Static buffer to hold the last received report from the host, so that it can be echoed back in the next sent report */

@@ -112,9 +110,7 @@ EVENT_HANDLER(USB_Connect)
 EVENT_HANDLER(USB_Disconnect)

 {

 	/* Stop running HID reporting and USB management tasks */

-	#if !defined(INTERRUPT_DATA_ENDPOINT)

 	Scheduler_SetTaskMode(USB_HID_Report, TASK_STOP);

-	#endif

 

 	#if !defined(INTERRUPT_CONTROL_ENDPOINT)

 	Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);

@@ -134,21 +130,11 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 		                       ENDPOINT_DIR_IN, GENERIC_EPSIZE,

 	                           ENDPOINT_BANK_SINGLE);

 

-	#if defined(INTERRUPT_DATA_ENDPOINT)

-	/* Enable the endpoint IN interrupt ISR for the report endpoint */

-	USB_INT_Enable(ENDPOINT_INT_IN);

-	#endif

-

 	/* Setup Generic OUT Report Endpoint */

 	Endpoint_ConfigureEndpoint(GENERIC_OUT_EPNUM, EP_TYPE_INTERRUPT,

 		                       ENDPOINT_DIR_OUT, GENERIC_EPSIZE,

 	                           ENDPOINT_BANK_SINGLE);

 

-	#if defined(INTERRUPT_DATA_ENDPOINT)

-	/* Enable the endpoint OUT interrupt ISR for the report endpoint */

-	USB_INT_Enable(ENDPOINT_INT_OUT);

-	#endif

-

 	/* Indicate USB connected and ready */

 	UpdateStatus(Status_USBReady);

 }

@@ -266,7 +252,6 @@ void CreateGenericHIDReport(uint8_t* DataArray)
 	  DataArray[i] = LastReceived[i];

 }

 

-#if !defined(INTERRUPT_DATA_ENDPOINT)

 TASK(USB_HID_Report)

 {

 	/* Check if the USB system is connected to a host */

@@ -313,8 +298,8 @@ TASK(USB_HID_Report)
 		}

 	}

 }

-#endif

 

+#if defined(INTERRUPT_CONTROL_ENDPOINT)

 /** ISR for the general Pipe/Endpoint interrupt vector. This ISR fires when an endpoint's status changes (such as

  *  a packet has been received) on an endpoint with its corresponding ISR enabling bits set. This is used to send

  *  HID packets to the host each time the HID interrupt endpoints polling period elapses, as managed by the USB

@@ -325,7 +310,6 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
 	/* Save previously selected endpoint before selecting a new endpoint */

 	uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();

 

-	#if defined(INTERRUPT_CONTROL_ENDPOINT)

 	/* Check if the control endpoint has received a request */

 	if (Endpoint_HasEndpointInterrupted(ENDPOINT_CONTROLEP))

 	{

@@ -338,60 +322,8 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
 		/* Handshake the endpoint setup interrupt - must be after the call to USB_USBTask() */

 		USB_INT_Clear(ENDPOINT_INT_SETUP);

 	}

-	#endif

-

-	#if defined(INTERRUPT_DATA_ENDPOINT)

-	/* Check if Generic IN endpoint has interrupted */

-	if (Endpoint_HasEndpointInterrupted(GENERIC_IN_EPNUM))

-	{

-		/* Select the Generic IN Report Endpoint */

-		Endpoint_SelectEndpoint(GENERIC_IN_EPNUM);

-

-		/* Clear the endpoint IN interrupt flag */

-		USB_INT_Clear(ENDPOINT_INT_IN);

-

-		/* Clear the Generic IN Report endpoint interrupt and select the endpoint */

-		Endpoint_ClearEndpointInterrupt(GENERIC_IN_EPNUM);

-

-		/* Create a temporary buffer to hold the report to send to the host */

-		uint8_t GenericData[GENERIC_REPORT_SIZE];

-		

-		/* Create Generic Report Data */

-		CreateGenericHIDReport(GenericData);

-

-		/* Write Generic Report Data */

-		Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));

-

-		/* Finalize the stream transfer to send the last packet */

-		Endpoint_ClearIN();

-	}

-

-	/* Check if Generic OUT endpoint has interrupted */

-	if (Endpoint_HasEndpointInterrupted(GENERIC_OUT_EPNUM))

-	{

-		/* Select the Generic OUT Report Endpoint */

-		Endpoint_SelectEndpoint(GENERIC_OUT_EPNUM);

-

-		/* Clear the endpoint OUT Interrupt flag */

-		USB_INT_Clear(ENDPOINT_INT_OUT);

-

-		/* Clear the Generic OUT Report endpoint interrupt and select the endpoint */

-		Endpoint_ClearEndpointInterrupt(GENERIC_OUT_EPNUM);

-

-		/* Create a temporary buffer to hold the read in report from the host */

-		uint8_t GenericData[GENERIC_REPORT_SIZE];

-		

-		/* Read Generic Report Data */

-		Endpoint_Read_Stream_LE(&GenericData, sizeof(GenericData));

-		

-		/* Process Generic Report Data */

-		ProcessGenericHIDReport(GenericData);

-

-		/* Finalize the stream transfer to send the last packet */

-		Endpoint_ClearOUT();

-	}

-	#endif

 

 	/* Restore previously selected endpoint */

 	Endpoint_SelectEndpoint(PrevSelectedEndpoint);

 }

+#endif

diff --git a/Demos/Device/GenericHID/GenericHID.txt b/Demos/Device/GenericHID/GenericHID.txt
index 2e092cf3a..c78f63753 100644
--- a/Demos/Device/GenericHID/GenericHID.txt
+++ b/Demos/Device/GenericHID/GenericHID.txt
@@ -67,12 +67,5 @@
  *        which services control requests from the host. If not defined, the control endpoint

  *        is serviced via polling using the task scheduler.</td>

  *   </tr>

- *   <tr>

- *    <td>INTERRUPT_DATA_ENDPOINT</td>

- *    <td>Makefile CDEFS</td>

- *    <td>When defined, this causes the demo to enable interrupts for the data endpoints,

- *        which services incoming LED reports and outgoing key status reports to and from the host.

- *        If not defined, the data endpoints are serviced via polling using the task scheduler.</td>

- *   </tr>

  *  </table>

  */

diff --git a/Demos/Device/Keyboard/Keyboard.c b/Demos/Device/Keyboard/Keyboard.c
index 33545bff6..7b9317265 100644
--- a/Demos/Device/Keyboard/Keyboard.c
+++ b/Demos/Device/Keyboard/Keyboard.c
@@ -56,9 +56,9 @@ TASK_LIST
 bool UsingReportProtocol = true;

 

 /** Current Idle period. This is set by the host via a Set Idle HID class request to silence the device's reports

- *  for either the entire idle duration, or until the report status changes (e.g. the user moves the mouse).

+ *  for either the entire idle duration, or until the report status changes (e.g. the user presses a key).

  */

-uint8_t IdleCount = 0;

+uint16_t IdleCount = 500;

 

 /** Current Idle period remaining. When the IdleCount value is set, this tracks the remaining number of idle

  *  milliseconds. This is separate to the IdleCount timer and is incremented and compared as the host may request 

@@ -140,9 +140,7 @@ EVENT_HANDLER(USB_Reset)
 EVENT_HANDLER(USB_Disconnect)

 {

 	/* Stop running keyboard reporting and USB management tasks */

-	#if !defined(INTERRUPT_DATA_ENDPOINT)

 	Scheduler_SetTaskMode(USB_Keyboard_Report, TASK_STOP);

-	#endif

 

 	#if !defined(INTERRUPT_CONTROL_ENDPOINT)

 	Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);

@@ -162,28 +160,16 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 		                       ENDPOINT_DIR_IN, KEYBOARD_EPSIZE,

 	                           ENDPOINT_BANK_SINGLE);

 

-	#if defined(INTERRUPT_DATA_ENDPOINT)

-	/* Enable the endpoint IN interrupt ISR for the report endpoint */

-	USB_INT_Enable(ENDPOINT_INT_IN);

-	#endif

-

 	/* Setup Keyboard LED Report Endpoint */

 	Endpoint_ConfigureEndpoint(KEYBOARD_LEDS_EPNUM, EP_TYPE_INTERRUPT,

 		                       ENDPOINT_DIR_OUT, KEYBOARD_EPSIZE,

 	                           ENDPOINT_BANK_SINGLE);

 

-	#if defined(INTERRUPT_DATA_ENDPOINT)

-	/* Enable the endpoint OUT interrupt ISR for the LED report endpoint */

-	USB_INT_Enable(ENDPOINT_INT_OUT);

-	#endif

-

 	/* Indicate USB connected and ready */

 	UpdateStatus(Status_USBReady);

 

-	#if !defined(INTERRUPT_DATA_ENDPOINT)

 	/* Start running keyboard reporting task */

 	Scheduler_SetTaskMode(USB_Keyboard_Report, TASK_RUN);

-	#endif

 }

 

 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific

@@ -358,7 +344,7 @@ void ProcessLEDReport(uint8_t LEDReport)
 }

 

 /** Sends the next HID report to the host, via the keyboard data endpoint. */

-static inline void SendNextReport(void)

+void SendNextReport(void)

 {

 	static USB_KeyboardReport_Data_t PrevKeyboardReportData;

 	USB_KeyboardReport_Data_t        KeyboardReportData;

@@ -367,41 +353,38 @@ static inline void SendNextReport(void)
 	/* Create the next keyboard report for transmission to the host */

 	CreateKeyboardReport(&KeyboardReportData);

 	

-	/* Check if the idle period is set */

-	if (IdleCount)

-	{

-		/* Check if idle period has elapsed */

-		if (!(IdleMSRemaining))

-		{

-			/* Reset the idle time remaining counter, must multiply by 4 to get the duration in milliseconds */

-			IdleMSRemaining = (IdleCount << 2);

-		}

-		else

-		{

-			/* Idle period not elapsed, indicate that a report must not be sent unless the report has changed */

-			SendReport = (memcmp(&PrevKeyboardReportData, &KeyboardReportData, sizeof(USB_KeyboardReport_Data_t)) != 0);

-		}

-	}

+	/* Check to see if the report data has changed - if so a report MUST be sent */

+	SendReport = (memcmp(&PrevKeyboardReportData, &KeyboardReportData, sizeof(USB_KeyboardReport_Data_t)) != 0);

 	

 	/* Save the current report data for later comparison to check for changes */

 	PrevKeyboardReportData = KeyboardReportData;

-

+	

+	/* Check if the idle period is set and has elapsed */

+	if ((IdleCount != HID_IDLE_CHANGESONLY) && (!(IdleMSRemaining)))

+	{

+		/* Reset the idle time remaining counter, must multiply by 4 to get the duration in milliseconds */

+		IdleMSRemaining = (IdleCount << 2);

+		

+		/* Idle period is set and has elapsed, must send a report to the host */

+		SendReport = true;

+	}

+	

 	/* Select the Keyboard Report Endpoint */

 	Endpoint_SelectEndpoint(KEYBOARD_EPNUM);

 

-	/* Check if Keyboard Endpoint Ready for Read/Write, and if we should send a report */

+	/* Check if Keyboard Endpoint Ready for Read/Write and if we should send a new report */

 	if (Endpoint_IsReadWriteAllowed() && SendReport)

 	{

 		/* Write Keyboard Report Data */

 		Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData));

-

+		

 		/* Finalize the stream transfer to send the last packet */

 		Endpoint_ClearIN();

 	}

 }

 

 /** Reads the next LED status report from the host from the LED data endpoint, if one has been sent. */

-static inline void ReceiveNextReport(void)

+void ReceiveNextReport(void)

 {

 	/* Select the Keyboard LED Report Endpoint */

 	Endpoint_SelectEndpoint(KEYBOARD_LEDS_EPNUM);

@@ -451,7 +434,6 @@ void UpdateStatus(uint8_t CurrentStatus)
 	LEDs_SetAllLEDs(LEDMask);

 }

 

-#if !defined(INTERRUPT_DATA_ENDPOINT)

 /** Function to manage HID report generation and transmission to the host, when in report mode. */

 TASK(USB_Keyboard_Report)

 {

@@ -465,8 +447,8 @@ TASK(USB_Keyboard_Report)
 		ReceiveNextReport();

 	}

 }

-#endif

 

+#if defined(INTERRUPT_CONTROL_ENDPOINT)

 /** ISR for the general Pipe/Endpoint interrupt vector. This ISR fires when an endpoint's status changes (such as

  *  a packet has been received) on an endpoint with its corresponding ISR enabling bits set. This is used to send

  *  HID packets to the host each time the HID interrupt endpoints polling period elapses, as managed by the USB

@@ -475,52 +457,20 @@ TASK(USB_Keyboard_Report)
  */

 ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)

 {

-	#if defined(INTERRUPT_CONTROL_ENDPOINT)

+	/* Save previously selected endpoint before selecting a new endpoint */

+	uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();

+

 	/* Check if the control endpoint has received a request */

 	if (Endpoint_HasEndpointInterrupted(ENDPOINT_CONTROLEP))

 	{

-		/* Clear the endpoint interrupt */

-		Endpoint_ClearEndpointInterrupt(ENDPOINT_CONTROLEP);

-

 		/* Process the control request */

 		USB_USBTask();

 

 		/* Handshake the endpoint setup interrupt - must be after the call to USB_USBTask() */

 		USB_INT_Clear(ENDPOINT_INT_SETUP);

 	}

-	#endif

-

-	#if defined(INTERRUPT_DATA_ENDPOINT)

-	/* Check if keyboard endpoint has interrupted */

-	if (Endpoint_HasEndpointInterrupted(KEYBOARD_EPNUM))

-	{

-		/* Select the Keyboard Report Endpoint */

-		Endpoint_SelectEndpoint(KEYBOARD_EPNUM);

-

-		/* Clear the endpoint IN interrupt flag */

-		USB_INT_Clear(ENDPOINT_INT_IN);

-

-		/* Clear the Keyboard Report endpoint interrupt */

-		Endpoint_ClearEndpointInterrupt(KEYBOARD_EPNUM);

-

-		/* Send the next keypress report to the host */

-		SendNextReport();

-	}

-

-	/* Check if Keyboard LED status Endpoint has interrupted */

-	if (Endpoint_HasEndpointInterrupted(KEYBOARD_LEDS_EPNUM))

-	{

-		/* Select the Keyboard LED Report Endpoint */

-		Endpoint_SelectEndpoint(KEYBOARD_LEDS_EPNUM);

-

-		/* Clear the endpoint OUT interrupt flag */

-		USB_INT_Clear(ENDPOINT_INT_OUT);

-

-		/* Clear the Keyboard LED Report endpoint interrupt */

-		Endpoint_ClearEndpointInterrupt(KEYBOARD_LEDS_EPNUM);

-

-		/* Process the LED report sent from the host */

-		ReceiveNextReport();

-	}

-	#endif

+	

+	/* Restore previously selected endpoint */

+	Endpoint_SelectEndpoint(PrevSelectedEndpoint);	

 }

+#endif

diff --git a/Demos/Device/Keyboard/Keyboard.h b/Demos/Device/Keyboard/Keyboard.h
index 76b770582..c73701905 100644
--- a/Demos/Device/Keyboard/Keyboard.h
+++ b/Demos/Device/Keyboard/Keyboard.h
@@ -54,6 +54,9 @@
 		#include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver

 

 	/* Macros: */

+		/** Idle period indicating that reports should be sent only when the inputs have changed */

+		#define HID_IDLE_CHANGESONLY 0

+

 		/** HID Class specific request to get the next HID report from the device. */

 		#define REQ_GetReport      0x01

 

@@ -114,8 +117,8 @@
 	/* Function Prototypes: */

 		void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData);

 		void ProcessLEDReport(uint8_t LEDReport);

-		static inline void SendNextReport(void);

-		static inline void ReceiveNextReport(void);

+		void SendNextReport(void);

+		void ReceiveNextReport(void);

 		void UpdateStatus(uint8_t CurrentStatus);

 		

 #endif

diff --git a/Demos/Device/Keyboard/Keyboard.txt b/Demos/Device/Keyboard/Keyboard.txt
index fd95e455e..39df2a171 100644
--- a/Demos/Device/Keyboard/Keyboard.txt
+++ b/Demos/Device/Keyboard/Keyboard.txt
@@ -63,12 +63,5 @@
  *        which services control requests from the host. If not defined, the control endpoint

  *        is serviced via polling using the task scheduler.</td>

  *   </tr>

- *   <tr>

- *    <td>INTERRUPT_DATA_ENDPOINT</td>

- *    <td>Makefile CDEFS</td>

- *    <td>When defined, this causes the demo to enable interrupts for the data endpoints,

- *        which services incoming LED reports and outgoing key status reports to and from the host.

- *        If not defined, the data endpoints are serviced via polling using the task scheduler.</td>

- *   </tr>

  *  </table>

  */

diff --git a/Demos/Device/MassStorage/MassStorage.c b/Demos/Device/MassStorage/MassStorage.c
index e2c242499..b24018a10 100644
--- a/Demos/Device/MassStorage/MassStorage.c
+++ b/Demos/Device/MassStorage/MassStorage.c
@@ -387,9 +387,6 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
 	/* Check if the control endpoint has received a request */

 	if (Endpoint_HasEndpointInterrupted(ENDPOINT_CONTROLEP))

 	{

-		/* Clear the endpoint interrupt */

-		Endpoint_ClearEndpointInterrupt(ENDPOINT_CONTROLEP);

-

 		/* Process the control request */

 		USB_USBTask();

 

diff --git a/Demos/Device/Mouse/Mouse.c b/Demos/Device/Mouse/Mouse.c
index 763d366e9..8998530d8 100644
--- a/Demos/Device/Mouse/Mouse.c
+++ b/Demos/Device/Mouse/Mouse.c
@@ -43,9 +43,7 @@ TASK_LIST
 	{ .Task = USB_USBTask          , .TaskStatus = TASK_STOP },

 	#endif

 	

-	#if !defined(INTERRUPT_DATA_ENDPOINT)

 	{ .Task = USB_Mouse_Report     , .TaskStatus = TASK_STOP },

-	#endif

 };

 

 /* Global Variables */

@@ -57,7 +55,7 @@ bool UsingReportProtocol = true;
 /** Current Idle period. This is set by the host via a Set Idle HID class request to silence the device's reports

  *  for either the entire idle duration, or until the report status changes (e.g. the user moves the mouse).

  */

-uint8_t IdleCount = 0;

+uint16_t IdleCount = HID_IDLE_CHANGESONLY;

 

 /** Current Idle period remaining. When the IdleCount value is set, this tracks the remaining number of idle

  *  milliseconds. This is separate to the IdleCount timer and is incremented and compared as the host may request 

@@ -140,9 +138,7 @@ EVENT_HANDLER(USB_Reset)
 EVENT_HANDLER(USB_Disconnect)

 {

 	/* Stop running mouse reporting and USB management tasks */

-	#if !defined(INTERRUPT_DATA_ENDPOINT)

 	Scheduler_SetTaskMode(USB_Mouse_Report, TASK_STOP);

-	#endif

 

 	#if !defined(INTERRUPT_CONTROL_ENDPOINT)

 	Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);

@@ -162,18 +158,11 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 		                       ENDPOINT_DIR_IN, MOUSE_EPSIZE,

 	                           ENDPOINT_BANK_SINGLE);

 

-	#if defined(INTERRUPT_DATA_ENDPOINT)

-	/* Enable the endpoint IN interrupt ISR for the report endpoint */

-	USB_INT_Enable(ENDPOINT_INT_IN);

-	#endif

-

 	/* Indicate USB connected and ready */

 	UpdateStatus(Status_USBReady);

 

-	#if !defined(INTERRUPT_DATA_ENDPOINT)

 	/* Start running mouse reporting task */

 	Scheduler_SetTaskMode(USB_Mouse_Report, TASK_RUN);

-	#endif

 }

 

 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific

@@ -311,34 +300,36 @@ void CreateMouseReport(USB_MouseReport_Data_t* ReportData)
 }

 

 /** Sends the next HID report to the host, via the keyboard data endpoint. */

-static inline void SendNextReport(void)

+void SendNextReport(void)

 {

 	static USB_MouseReport_Data_t PrevMouseReportData;

 	USB_MouseReport_Data_t        MouseReportData;

-	bool                          SendReport = true;

+	bool                          SendReport;

 	

 	/* Create the next mouse report for transmission to the host */

 	CreateMouseReport(&MouseReportData);

 	

-	/* Check if the idle period is set*/

-	if (IdleCount)

-	{

-		/* Determine if the idle period has elapsed */

-		if (!(IdleMSRemaining))

-		{

-			/* Reset the idle time remaining counter, must multiply by 4 to get the duration in milliseconds */

-			IdleMSRemaining = (IdleCount << 2);		

-		}

-		else

-		{

-			/* Idle period not elapsed, indicate that a report must not be sent unless the report has changed */

-			SendReport = (memcmp(&PrevMouseReportData, &MouseReportData, sizeof(USB_MouseReport_Data_t)) != 0);

-		}

-	}

-

+	/* Check to see if the report data has changed - if so a report MUST be sent */

+	SendReport = (memcmp(&PrevMouseReportData, &MouseReportData, sizeof(USB_MouseReport_Data_t)) != 0);

+	

+	/* Override the check if the Y or X values are non-zero - we want continuous movement while the joystick

+	 * is being held down (via continuous reports), otherwise the cursor will only move once per joystick toggle */

+	if ((MouseReportData.Y != 0) || (MouseReportData.X != 0))

+	  SendReport = true;

+	

 	/* Save the current report data for later comparison to check for changes */

 	PrevMouseReportData = MouseReportData;

 	

+	/* Check if the idle period is set and has elapsed */

+	if ((IdleCount != HID_IDLE_CHANGESONLY) && (!(IdleMSRemaining)))

+	{

+		/* Reset the idle time remaining counter, must multiply by 4 to get the duration in milliseconds */

+		IdleMSRemaining = (IdleCount << 2);

+		

+		/* Idle period is set and has elapsed, must send a report to the host */

+		SendReport = true;

+	}

+	

 	/* Select the Mouse Report Endpoint */

 	Endpoint_SelectEndpoint(MOUSE_EPNUM);

 

@@ -380,7 +371,6 @@ void UpdateStatus(uint8_t CurrentStatus)
 	LEDs_SetAllLEDs(LEDMask);

 }

 

-#if !defined(INTERRUPT_DATA_ENDPOINT)

 /** Task to manage HID report generation and transmission to the host, when in report mode. */

 TASK(USB_Mouse_Report)

 {

@@ -391,8 +381,8 @@ TASK(USB_Mouse_Report)
 		SendNextReport();

 	}

 }

-#endif

 

+#if defined(INTERRUPT_CONTROL_ENDPOINT)

 /** ISR for the general Pipe/Endpoint interrupt vector. This ISR fires when an endpoint's status changes (such as

  *  a packet has been received) on an endpoint with its corresponding ISR enabling bits set. This is used to send

  *  HID packets to the host each time the HID interrupt endpoints polling period elapses, as managed by the USB

@@ -401,36 +391,20 @@ TASK(USB_Mouse_Report)
  */

 ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)

 {

-	#if defined(INTERRUPT_CONTROL_ENDPOINT)

+	/* Save previously selected endpoint before selecting a new endpoint */

+	uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();

+

 	/* Check if the control endpoint has received a request */

 	if (Endpoint_HasEndpointInterrupted(ENDPOINT_CONTROLEP))

 	{

-		/* Clear the endpoint interrupt */

-		Endpoint_ClearEndpointInterrupt(ENDPOINT_CONTROLEP);

-

 		/* Process the control request */

 		USB_USBTask();

 

 		/* Handshake the endpoint setup interrupt - must be after the call to USB_USBTask() */

 		USB_INT_Clear(ENDPOINT_INT_SETUP);

 	}

-	#endif

-	

-	#if defined(INTERRUPT_DATA_ENDPOINT)

-	/* Check if mouse endpoint has interrupted */

-	if (Endpoint_HasEndpointInterrupted(MOUSE_EPNUM))

-	{

-		/* Select the Mouse Report Endpoint */

-		Endpoint_SelectEndpoint(MOUSE_EPNUM);

 

-		/* Clear the endpoint IN interrupt flag */

-		USB_INT_Clear(ENDPOINT_INT_IN);

-

-		/* Clear the Mouse Report endpoint interrupt and select the endpoint */

-		Endpoint_ClearEndpointInterrupt(MOUSE_EPNUM);

-

-		/* Send the next mouse report to the host */

-		SendNextReport();

-	}

-	#endif

+	/* Restore previously selected endpoint */

+	Endpoint_SelectEndpoint(PrevSelectedEndpoint);

 }

+#endif

diff --git a/Demos/Device/Mouse/Mouse.h b/Demos/Device/Mouse/Mouse.h
index 4eaf457ca..afa5a6a55 100644
--- a/Demos/Device/Mouse/Mouse.h
+++ b/Demos/Device/Mouse/Mouse.h
@@ -57,23 +57,26 @@
 		TASK(USB_Mouse_Report);

 

 	/* Macros: */

+		/** Idle period indicating that reports should be sent only when the inputs have changed */

+		#define HID_IDLE_CHANGESONLY 0

+	

 		/** HID Class specific request to get the next HID report from the device. */

-		#define REQ_GetReport      0x01

+		#define REQ_GetReport        0x01

 

 		/** HID Class specific request to get the idle timeout period of the device. */

-		#define REQ_GetIdle        0x02

+		#define REQ_GetIdle          0x02

 

 		/** HID Class specific request to send the next HID report to the device. */

-		#define REQ_SetReport      0x09

+		#define REQ_SetReport        0x09

 

 		/** HID Class specific request to set the idle timeout period of the device. */

-		#define REQ_SetIdle        0x0A

+		#define REQ_SetIdle          0x0A

 

 		/** HID Class specific request to get the current HID protocol in use, either report or boot. */

-		#define REQ_GetProtocol    0x03

+		#define REQ_GetProtocol      0x03

 

 		/** HID Class specific request to set the current HID protocol in use, either report or boot. */

-		#define REQ_SetProtocol    0x0B

+		#define REQ_SetProtocol      0x0B

 

 	/* Type Defines: */

 		/** Type define for the mouse HID report structure, for creating and sending HID reports to the host PC.

diff --git a/Demos/Device/Mouse/Mouse.txt b/Demos/Device/Mouse/Mouse.txt
index 2d566ddeb..a3bf024d5 100644
--- a/Demos/Device/Mouse/Mouse.txt
+++ b/Demos/Device/Mouse/Mouse.txt
@@ -64,12 +64,5 @@
  *        which services control requests from the host. If not defined, the control endpoint

  *        is serviced via polling using the task scheduler.</td>

  *   </tr>

- *   <tr>

- *    <td>INTERRUPT_DATA_ENDPOINT</td>

- *    <td>Makefile CDEFS</td>

- *    <td>When defined, this causes the demo to enable interrupts for the data endpoint,

- *        which services outgoing mouse button and movement reports to the host. If not defined,

- *        the data endpoint is serviced via polling using the task scheduler.</td>

- *   </tr>

  *  </table>

  */

diff --git a/Demos/Device/RNDISEthernet/RNDISConstants.h b/Demos/Device/RNDISEthernet/RNDISConstants.h
index 3296666f9..ad66f62db 100644
--- a/Demos/Device/RNDISEthernet/RNDISConstants.h
+++ b/Demos/Device/RNDISEthernet/RNDISConstants.h
@@ -96,4 +96,4 @@
 		#define OID_802_3_XMIT_ONE_COLLISION          0x01020102UL

 		#define OID_802_3_XMIT_MORE_COLLISIONS        0x01020103UL

 

-#endif
\ No newline at end of file
+#endif