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.

2 files changed, 18 insertions, 25 deletions

diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c
index 93681170a..9132a80de 100644
--- a/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@ -37,12 +37,6 @@
  

 #include "Magstripe.h"

 

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

-BUTTLOADTAG(ProjName,    "Magstripe Reader");

-BUTTLOADTAG(BuildTime,   __TIME__);

-BUTTLOADTAG(BuildDate,   __DATE__);

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

-

 /* Scheduler Task List */

 TASK_LIST

 {

@@ -184,30 +178,30 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 				if (wLength > sizeof(KeyboardReportData))

 				  wLength = sizeof(KeyboardReportData);

 

-				Endpoint_ClearSetupReceived();

+				Endpoint_ClearControlSETUP();

 	

 				/* Write the report data to the control endpoint */

 				Endpoint_Write_Control_Stream_LE(&KeyboardReportData, wLength);

 				

 				/* Finalize the stream transfer to send the last packet or clear the host abort */

-				Endpoint_ClearSetupOUT();

+				Endpoint_ClearControlOUT();

 			}

 		

 			break;

 		case REQ_GetProtocol:

 			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

-				Endpoint_ClearSetupReceived();

+				Endpoint_ClearControlSETUP();

 				

 				/* Write the current protocol flag to the host */

 				Endpoint_Write_Byte(UsingReportProtocol);

 				

 				/* Send the flag to the host */

-				Endpoint_ClearSetupIN();

+				Endpoint_ClearControlIN();

 

 				/* Acknowledge status stage */

-				while (!(Endpoint_IsSetupOUTReceived()));

-				Endpoint_ClearSetupOUT();

+				while (!(Endpoint_IsOUTReceived()));

+				Endpoint_ClearControlOUT();

 			}

 			

 			break;

@@ -217,14 +211,14 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 				/* Read in the wValue parameter containing the new protocol mode */

 				uint16_t wValue = Endpoint_Read_Word_LE();

 				

-				Endpoint_ClearSetupReceived();

+				Endpoint_ClearControlSETUP();

 

 				/* Set or clear the flag depending on what the host indicates that the current Protocol should be */

 				UsingReportProtocol = (wValue != 0x0000);

 				

 				/* Acknowledge status stage */

-				while (!(Endpoint_IsSetupINReady()));

-				Endpoint_ClearSetupIN();

+				while (!(Endpoint_IsINReady()));

+				Endpoint_ClearControlIN();

 			}

 			

 			break;

@@ -234,31 +228,31 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 				/* Read in the wValue parameter containing the idle period */

 				uint16_t wValue = Endpoint_Read_Word_LE();

 				

-				Endpoint_ClearSetupReceived();

+				Endpoint_ClearControlSETUP();

 				

 				/* Get idle period in MSB */

 				IdleCount = (wValue >> 8);

 				

 				/* Acknowledge status stage */

-				while (!(Endpoint_IsSetupINReady()));

-				Endpoint_ClearSetupIN();

+				while (!(Endpoint_IsINReady()));

+				Endpoint_ClearControlIN();

 			}

 			

 			break;

 		case REQ_GetIdle:

 			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{		

-				Endpoint_ClearSetupReceived();

+				Endpoint_ClearControlSETUP();

 				

 				/* Write the current idle duration to the host */

 				Endpoint_Write_Byte(IdleCount);

 				

 				/* Send the flag to the host */

-				Endpoint_ClearSetupIN();

+				Endpoint_ClearControlIN();

 

 				/* Acknowledge status stage */

-				while (!(Endpoint_IsSetupOUTReceived()));

-				Endpoint_ClearSetupOUT();

+				while (!(Endpoint_IsOUTReceived()));

+				Endpoint_ClearControlOUT();

 			}

 

 			break;

@@ -410,7 +404,7 @@ TASK(USB_Keyboard_Report)
 		Endpoint_SelectEndpoint(KEYBOARD_EPNUM);

 

 		/* Check if Keyboard Endpoint Ready for Read/Write */

-		if (Endpoint_ReadWriteAllowed())

+		if (Endpoint_IsReadWriteAllowed())

 		{

 			/* Only fetch the next key to send once the period between key presses has elapsed */

 			if (!(KeyDelayRemaining))

@@ -436,7 +430,7 @@ TASK(USB_Keyboard_Report)
 				Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(USB_KeyboardReport_Data_t));

 

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

-				Endpoint_ClearCurrentBank();

+				Endpoint_ClearIN();

 

 				/* Reset the key delay period counter */

 				KeyDelayRemaining = 2;

diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h
index fbf68e51c..0393c3603 100644
--- a/Projects/Magstripe/Magstripe.h
+++ b/Projects/Magstripe/Magstripe.h
@@ -50,7 +50,6 @@
 		#include "CircularBitBuffer.h"

 

 		#include <LUFA/Version.h>                    // Library Version Information

-		#include <LUFA/Common/ButtLoadTag.h>         // PROGMEM tags readable by the ButtLoad project

 		#include <LUFA/Drivers/USB/USB.h>            // USB Functionality

 		#include <LUFA/Scheduler/Scheduler.h>        // Simple scheduler for task management