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, 13 insertions, 20 deletions

diff --git a/Demos/Device/CDC/CDC.c b/Demos/Device/CDC/CDC.c
index 5e153f652..3dc624057 100644
--- a/Demos/Device/CDC/CDC.c
+++ b/Demos/Device/CDC/CDC.c
@@ -36,12 +36,6 @@
 

 #include "CDC.h"

 

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

-BUTTLOADTAG(ProjName,    "LUFA CDC App");

-BUTTLOADTAG(BuildTime,   __TIME__);

-BUTTLOADTAG(BuildDate,   __DATE__);

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

-

 /* Scheduler Task List */

 TASK_LIST

 {

@@ -172,13 +166,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{	

 				/* Acknowledge the SETUP packet, ready for data transfer */

-				Endpoint_ClearSetupReceived();

+				Endpoint_ClearControlSETUP();

 

 				/* Write the line coding data to the control endpoint */

 				Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));

 				

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

-				Endpoint_ClearSetupOUT();

+				Endpoint_ClearControlOUT();

 			}

 			

 			break;

@@ -186,13 +180,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				/* Acknowledge the SETUP packet, ready for data transfer */

-				Endpoint_ClearSetupReceived();

+				Endpoint_ClearControlSETUP();

 

 				/* Read the line coding data in from the host into the global struct */

 				Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));

 

 				/* Finalize the stream transfer to clear the last packet from the host */

-				Endpoint_ClearSetupIN();

+				Endpoint_ClearControlIN();

 			}

 	

 			break;

@@ -211,11 +205,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 #endif

 				

 				/* Acknowledge the SETUP packet, ready for data transfer */

-				Endpoint_ClearSetupReceived();

+				Endpoint_ClearControlSETUP();

 				

 				/* Acknowledge status stage */

-				while (!(Endpoint_IsSetupINReady()));

-				Endpoint_ClearSetupIN();

+				while (!(Endpoint_IsINReady()));

+				Endpoint_ClearControlIN();

 			}

 	

 			break;

@@ -276,7 +270,7 @@ TASK(CDC_Task)
 	Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);

 	Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));

 	Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));

-	Endpoint_ClearCurrentBank();

+	Endpoint_ClearIN();

 #endif

 

 	/* Determine if a joystick action has occurred */

@@ -307,19 +301,19 @@ TASK(CDC_Task)
 		Endpoint_Write_Stream_LE(ReportString, strlen(ReportString));

 		

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

-		Endpoint_ClearCurrentBank();

+		Endpoint_ClearIN();

 

 		/* Wait until the endpoint is ready for another packet */

-		while (!(Endpoint_ReadWriteAllowed()));

+		while (!(Endpoint_IsINReady()));

 		

 		/* Send an empty packet to ensure that the host does not buffer data sent to it */

-		Endpoint_ClearCurrentBank();

+		Endpoint_ClearIN();

 	}

 

 	/* Select the Serial Rx Endpoint */

 	Endpoint_SelectEndpoint(CDC_RX_EPNUM);

 	

 	/* Throw away any received data from the host */

-	if (Endpoint_ReadWriteAllowed())

-	  Endpoint_ClearCurrentBank();

+	if (Endpoint_IsOUTReceived())

+	  Endpoint_ClearOUT();

 }

diff --git a/Demos/Device/CDC/CDC.h b/Demos/Device/CDC/CDC.h
index a36fdc921..1537f0ba3 100644
--- a/Demos/Device/CDC/CDC.h
+++ b/Demos/Device/CDC/CDC.h
@@ -45,7 +45,6 @@
 		#include "Descriptors.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/Drivers/Board/Joystick.h>         // Joystick driver

 		#include <LUFA/Drivers/Board/LEDs.h>             // LEDs driver