Fixed GenericHIDHost demo report write routine incorrect for control type requests (thanks to Andrei Krainev).

Removed Endpoint_ClearCurrentBank() and Pipe_ClearCurrentBank() in favour of new Endpoint_ClearIN(), Endpoint_ClearOUT(), Endpoint_ClearControlIN(), Endpoint_ClearControlOUT(), Pipe_ClearIN(), Pipe_ClearOUT(), Pipe_ClearControlIN() and Pipe_ClearControlOUT() macros (done to allow for the detection of packets of zero length).

Renamed *_ReadWriteAllowed() macros to *_IsReadWriteAllowed() to remain consistent with the rest of the LUFA API.

Endpoint_IsSetupReceived() macro has been renamed to Endpoint_IsSETUPReceived(), Endpoint_ClearSetupReceived() macro has been renamed to Endpoint_ClearControlSETUP(), the Pipe_IsSetupSent() macro has been renamed to Pipe_IsSETUPSent() and the Pipe_ClearSetupSent() macro is no longer applicable and should be removed - changes made to compliment the new endpoint and pipe bank management API.

Updated all demos, bootloaders and projects to use the new endpoint and pipe management APIs (thanks to Roman Thiel).

Updated library doxygen documentation, added groups, changed documentation macro functions to real functions for clarity.

Removed old endpoint and pipe aliased read/write/discard routines which did not have an explicit endian specifier for clarity.

Removed the ButtLoadTag.h header file, as no one used for its intended purpose anyway.

1 files changed, 35 insertions, 37 deletions

diff --git a/Demos/Host/MouseHost/MouseHost.c b/Demos/Host/MouseHost/MouseHost.c
index ff2542834..6a59b4d59 100644
--- a/Demos/Host/MouseHost/MouseHost.c
+++ b/Demos/Host/MouseHost/MouseHost.c
@@ -36,12 +36,6 @@
  

 #include "MouseHost.h"

 

-/* Project Tags, for reading out using the ButtLoad project */

-BUTTLOADTAG(ProjName,    "LUFA Mouse Host App");

-BUTTLOADTAG(BuildTime,   __TIME__);

-BUTTLOADTAG(BuildDate,   __DATE__);

-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);

-

 /* Scheduler Task List */

 TASK_LIST

 {

@@ -188,49 +182,53 @@ void ReadNextReport(void)
 	Pipe_SelectPipe(MOUSE_DATAPIPE);	

 

 	#if !defined(INTERRUPT_DATA_PIPE)

-	/* Unfreeze mouse data pipe */

+	/* Unfreeze keyboard data pipe */

 	Pipe_Unfreeze();

 	#endif

 

-	/* Ensure pipe contains data and is ready to be read before continuing */

-	if (!(Pipe_ReadWriteAllowed()))

+	/* Check to see if a packet has been received */

+	if (!(Pipe_IsINReceived()))

 	{

 		#if !defined(INTERRUPT_DATA_PIPE)

-		/* Refreeze mouse data pipe */

+		/* Refreeze HID data IN pipe */

 		Pipe_Freeze();

 		#endif

-

+			

 		return;

 	}

 

-	/* Read in mouse report data */

-	Pipe_Read_Stream_LE(&MouseReport, sizeof(MouseReport));				

-		

-	/* Clear the IN endpoint, ready for next data packet */

-	Pipe_ClearCurrentBank();

+	/* Ensure pipe contains data before trying to read from it */

+	if (Pipe_IsReadWriteAllowed())

+	{

+		/* Read in mouse report data */

+		Pipe_Read_Stream_LE(&MouseReport, sizeof(MouseReport));				

+

+		/* Alter status LEDs according to mouse X movement */

+		if (MouseReport.X > 0)

+		  LEDMask |= LEDS_LED1;

+		else if (MouseReport.X < 0)

+		  LEDMask |= LEDS_LED2;

+			

+		/* Alter status LEDs according to mouse Y movement */

+		if (MouseReport.Y > 0)

+		  LEDMask |= LEDS_LED3;

+		else if (MouseReport.Y < 0)

+		  LEDMask |= LEDS_LED4;

+

+		/* Alter status LEDs according to mouse button position */

+		if (MouseReport.Button)

+		  LEDMask  = LEDS_ALL_LEDS;

 		

-	/* Alter status LEDs according to mouse X movement */

-	if (MouseReport.X > 0)

-	  LEDMask |= LEDS_LED1;

-	else if (MouseReport.X < 0)

-	  LEDMask |= LEDS_LED2;

+		LEDs_SetAllLEDs(LEDMask);

 		

-	/* Alter status LEDs according to mouse Y movement */

-	if (MouseReport.Y > 0)

-	  LEDMask |= LEDS_LED3;

-	else if (MouseReport.Y < 0)

-	  LEDMask |= LEDS_LED4;

-

-	/* Alter status LEDs according to mouse button position */

-	if (MouseReport.Button)

-	  LEDMask  = LEDS_ALL_LEDS;

-	

-	LEDs_SetAllLEDs(LEDMask);

-	

-	/* Print mouse report data through the serial port */

-	printf_P(PSTR("dX:%2d dY:%2d Button:%d\r\n"), MouseReport.X,

-												  MouseReport.Y,

-												  MouseReport.Button);

+		/* Print mouse report data through the serial port */

+		printf_P(PSTR("dX:%2d dY:%2d Button:%d\r\n"), MouseReport.X,

+													  MouseReport.Y,

+													  MouseReport.Button);

+	}

+

+	/* Clear the IN endpoint, ready for next data packet */

+	Pipe_ClearIN();

 

 	#if !defined(INTERRUPT_DATA_PIPE)

 	/* Refreeze mouse data pipe */