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.

4 files changed, 26 insertions, 33 deletions

diff --git a/Demos/Device/MassStorage/DataflashManager.c b/Demos/Device/MassStorage/DataflashManager.c
index 7b02ed6c8..4b624190f 100644
--- a/Demos/Device/MassStorage/DataflashManager.c
+++ b/Demos/Device/MassStorage/DataflashManager.c
@@ -64,7 +64,7 @@ void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlo
 	Dataflash_SendAddressBytes(0, CurrDFPageByte);

 

 	/* Wait until endpoint is ready before continuing */

-	while (!(Endpoint_ReadWriteAllowed()));

+	while (!(Endpoint_IsReadWriteAllowed()));

 

 	while (TotalBlocks)

 	{

@@ -74,13 +74,13 @@ void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlo
 		while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))

 		{

 			/* Check if the endpoint is currently empty */

-			if (!(Endpoint_ReadWriteAllowed()))

+			if (!(Endpoint_IsReadWriteAllowed()))

 			{

 				/* Clear the current endpoint bank */

-				Endpoint_ClearCurrentBank();

+				Endpoint_ClearOUT();

 				

 				/* Wait until the host has sent another packet */

-				while (!(Endpoint_ReadWriteAllowed()));

+				while (!(Endpoint_IsReadWriteAllowed()));

 			}

 

 			/* Check if end of dataflash page reached */

@@ -157,8 +157,8 @@ void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlo
 	Dataflash_WaitWhileBusy();

 

 	/* If the endpoint is empty, clear it ready for the next packet from the host */

-	if (!(Endpoint_ReadWriteAllowed()))

-	  Endpoint_ClearCurrentBank();

+	if (!(Endpoint_IsReadWriteAllowed()))

+	  Endpoint_ClearOUT();

 

 	/* Deselect all dataflash chips */

 	Dataflash_DeselectChip();

@@ -187,7 +187,7 @@ void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBloc
 	Dataflash_SendByte(0x00);

 	

 	/* Wait until endpoint is ready before continuing */

-	while (!(Endpoint_ReadWriteAllowed()));

+	while (!(Endpoint_IsReadWriteAllowed()));

 	

 	while (TotalBlocks)

 	{

@@ -197,13 +197,13 @@ void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBloc
 		while (BytesInBlockDiv16 < (VIRTUAL_MEMORY_BLOCK_SIZE >> 4))

 		{

 			/* Check if the endpoint is currently full */

-			if (!(Endpoint_ReadWriteAllowed()))

+			if (!(Endpoint_IsReadWriteAllowed()))

 			{

 				/* Clear the endpoint bank to send its contents to the host */

-				Endpoint_ClearCurrentBank();

+				Endpoint_ClearIN();

 				

 				/* Wait until the endpoint is ready for more data */

-				while (!(Endpoint_ReadWriteAllowed()));

+				while (!(Endpoint_IsReadWriteAllowed()));

 			}

 			

 			/* Check if end of dataflash page reached */

@@ -259,8 +259,8 @@ void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBloc
 	}

 	

 	/* If the endpoint is full, send its contents to the host */

-	if (!(Endpoint_ReadWriteAllowed()))

-	  Endpoint_ClearCurrentBank();

+	if (!(Endpoint_IsReadWriteAllowed()))

+	  Endpoint_ClearIN();

 

 	/* Deselect all dataflash chips */

 	Dataflash_DeselectChip();

diff --git a/Demos/Device/MassStorage/MassStorage.c b/Demos/Device/MassStorage/MassStorage.c
index 56bc19a94..48ce5f34d 100644
--- a/Demos/Device/MassStorage/MassStorage.c
+++ b/Demos/Device/MassStorage/MassStorage.c
@@ -37,12 +37,6 @@
 #define  INCLUDE_FROM_MASSSTORAGE_C

 #include "MassStorage.h"

 

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

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

-BUTTLOADTAG(BuildTime,   __TIME__);

-BUTTLOADTAG(BuildDate,   __DATE__);

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

-

 /* Scheduler Task List */

 TASK_LIST

 {

@@ -159,30 +153,30 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 		case REQ_MassStorageReset:

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

 			{

-				Endpoint_ClearSetupReceived();

+				Endpoint_ClearControlSETUP();

 

 				/* Indicate that the current transfer should be aborted */

 				IsMassStoreReset = true;			

 

 				/* Acknowledge status stage */

-				while (!(Endpoint_IsSetupINReady()));

-				Endpoint_ClearSetupIN();

+				while (!(Endpoint_IsINReady()));

+				Endpoint_ClearControlIN();

 			}

 

 			break;

 		case REQ_GetMaxLUN:

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

 			{

-				/* Indicate to the host the number of supported LUNs (virtual disks) on the device */

-				Endpoint_ClearSetupReceived();

+				Endpoint_ClearControlSETUP();

 

+				/* Indicate to the host the number of supported LUNs (virtual disks) on the device */

 				Endpoint_Write_Byte(TOTAL_LUNS - 1);

 				

-				Endpoint_ClearSetupIN();

+				Endpoint_ClearControlIN();

 				

 				/* Acknowledge status stage */

-				while (!(Endpoint_IsSetupOUTReceived()));

-				Endpoint_ClearSetupOUT();

+				while (!(Endpoint_IsOUTReceived()));

+				Endpoint_ClearControlOUT();

 			}

 			

 			break;

@@ -234,7 +228,7 @@ TASK(USB_MassStorage)
 		Endpoint_SelectEndpoint(MASS_STORAGE_OUT_EPNUM);

 		

 		/* Check to see if a command from the host has been issued */

-		if (Endpoint_ReadWriteAllowed())

+		if (Endpoint_IsReadWriteAllowed())

 		{	

 			/* Indicate busy */

 			UpdateStatus(Status_ProcessingCommandBlock);

@@ -326,7 +320,7 @@ static bool ReadInCommandBlock(void)
 	  return false;

 

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

-	Endpoint_ClearCurrentBank();

+	Endpoint_ClearOUT();

 	

 	return true;

 }

@@ -367,7 +361,7 @@ static void ReturnCommandStatus(void)
 	  return;

 

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

-	Endpoint_ClearCurrentBank();

+	Endpoint_ClearIN();

 }

 

 /** Stream callback function for the Endpoint stream read and write functions. This callback will abort the current stream transfer

diff --git a/Demos/Device/MassStorage/MassStorage.h b/Demos/Device/MassStorage/MassStorage.h
index a30e7f746..17acca6b7 100644
--- a/Demos/Device/MassStorage/MassStorage.h
+++ b/Demos/Device/MassStorage/MassStorage.h
@@ -46,7 +46,6 @@
 		#include "DataflashManager.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/LEDs.h>         // LEDs driver

 		#include <LUFA/Drivers/Board/Dataflash.h>    // Dataflash chip driver

diff --git a/Demos/Device/MassStorage/SCSI.c b/Demos/Device/MassStorage/SCSI.c
index d50f63d91..e92be7ff8 100644
--- a/Demos/Device/MassStorage/SCSI.c
+++ b/Demos/Device/MassStorage/SCSI.c
@@ -174,7 +174,7 @@ static bool SCSI_Command_Inquiry(void)
 	Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), AbortOnMassStoreReset);

 

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

-	Endpoint_ClearCurrentBank();

+	Endpoint_ClearIN();

 

 	/* Succeed the command and update the bytes transferred counter */

 	CommandBlock.DataTransferLength -= BytesTransferred;

@@ -201,7 +201,7 @@ static bool SCSI_Command_Request_Sense(void)
 	Endpoint_Write_Stream_LE(&PadBytes, (AllocationLength - BytesTransferred), AbortOnMassStoreReset);

 

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

-	Endpoint_ClearCurrentBank();

+	Endpoint_ClearIN();

 

 	/* Succeed the command and update the bytes transferred counter */

 	CommandBlock.DataTransferLength -= BytesTransferred;

@@ -227,7 +227,7 @@ static bool SCSI_Command_Read_Capacity_10(void)
 	  return false;

 

 	/* Send the endpoint data packet to the host */

-	Endpoint_ClearCurrentBank();

+	Endpoint_ClearIN();

 

 	/* Succeed the command and update the bytes transferred counter */

 	CommandBlock.DataTransferLength -= 8;