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

diff --git a/Demos/Host/StillImageHost/ConfigDescriptor.h b/Demos/Host/StillImageHost/ConfigDescriptor.h
index f791488b1..cb4de5f46 100644
--- a/Demos/Host/StillImageHost/ConfigDescriptor.h
+++ b/Demos/Host/StillImageHost/ConfigDescriptor.h
@@ -38,7 +38,6 @@
 

 	/* Includes: */

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

-		#include <LUFA/Drivers/USB/Class/ConfigDescriptor.h>     // Configuration Descriptor Parser

 		

 		#include "StillImageHost.h"

 		

diff --git a/Demos/Host/StillImageHost/StillImageCommands.c b/Demos/Host/StillImageHost/StillImageCommands.c
index 43e57e126..ebf20b0b2 100644
--- a/Demos/Host/StillImageHost/StillImageCommands.c
+++ b/Demos/Host/StillImageHost/StillImageCommands.c
@@ -72,7 +72,7 @@ void SImage_SendBlockHeader(void)
 		}

 		

 		/* Send the PIMA command block to the attached device */

-		Pipe_ClearCurrentBank();

+		Pipe_ClearOUT();

 	}

 					

 	/* Freeze pipe after use */

@@ -90,7 +90,7 @@ void SImage_RecieveEventHeader(void)
 	Pipe_Read_Stream_LE(&PIMA_EventBlock, sizeof(PIMA_EventBlock));

 	

 	/* Clear the pipe after read complete to prepare for next event */

-	Pipe_ClearCurrentBank();

+	Pipe_ClearIN();

 	

 	/* Freeze the event pipe again after use */

 	Pipe_Freeze();

@@ -106,7 +106,7 @@ uint8_t SImage_RecieveBlockHeader(void)
 	Pipe_Unfreeze();

 	

 	/* Wait until data received on the IN pipe */

-	while (!(Pipe_ReadWriteAllowed()))

+	while (!(Pipe_IsReadWriteAllowed()))

 	{

 		/* Check to see if a new frame has been issued (1ms elapsed) */

 		if (USB_INT_HasOccurred(USB_INT_HSOFI))

@@ -179,7 +179,7 @@ uint8_t SImage_RecieveBlockHeader(void)
 		}

 		

 		/* Clear pipe bank after use */

-		Pipe_ClearCurrentBank();

+		Pipe_ClearIN();

 	}

 	

 	/* Freeze the IN pipe after use */

@@ -203,7 +203,7 @@ void SImage_SendData(void* Buffer, uint16_t Bytes)
 	Pipe_Write_Stream_LE(Buffer, Bytes);

 

 	/* Send the last packet to the attached device */

-	Pipe_ClearCurrentBank();

+	Pipe_ClearOUT();

 

 	/* Freeze the pipe again after use */

 	Pipe_Freeze();

diff --git a/Demos/Host/StillImageHost/StillImageHost.c b/Demos/Host/StillImageHost/StillImageHost.c
index 1694322ee..d9dd7ce3f 100644
--- a/Demos/Host/StillImageHost/StillImageHost.c
+++ b/Demos/Host/StillImageHost/StillImageHost.c
@@ -36,11 +36,6 @@
 

 #include "StillImageHost.h"

 

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

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

-BUTTLOADTAG(BuildTime,   __TIME__);

-BUTTLOADTAG(BuildDate,   __DATE__);

-

 /* Scheduler Task List */

 TASK_LIST

 {

@@ -243,7 +238,7 @@ TASK(USB_SImage_Host)
 			SImage_ReadData(DeviceInfo, DeviceInfoSize);

 			

 			/* Once all the data has been read, the pipe must be cleared before the response can be sent */

-			Pipe_ClearCurrentBank();

+			Pipe_ClearIN();

 			

 			/* Create a pointer for walking through the info dataset */

 			uint8_t* DeviceInfoPos = DeviceInfo;

diff --git a/Demos/Host/StillImageHost/StillImageHost.h b/Demos/Host/StillImageHost/StillImageHost.h
index 7757b0807..e4d2e85f8 100644
--- a/Demos/Host/StillImageHost/StillImageHost.h
+++ b/Demos/Host/StillImageHost/StillImageHost.h
@@ -46,7 +46,6 @@
 		#include "PIMACodes.h"

 		#include "StillImageCommands.h"

 

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

 		#include <LUFA/Drivers/Misc/TerminalCodes.h>             // ANSI Terminal Escape Codes

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

 		#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h>       // Serial stream driver