Removed specialized Endpoint_ClearControl* and Pipe_ClearControl* macros in favour of the standard Endpoint_Clear* and Pipe_Clear* macros (Atmel have confirmed no effect from setting FIFOCON on control endpoints).

3 files changed, 33 insertions, 33 deletions

diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c
index 9cdb77695..6b69421e0 100644
--- a/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@ -160,45 +160,45 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 		case REQ_GetLineEncoding:

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

 			{

-				Endpoint_ClearControlSETUP();

+				Endpoint_ClearSETUP();

 

 				for (uint8_t i = 0; i < sizeof(LineCoding); i++)

 				  Endpoint_Write_Byte(*(LineCodingData++));	

 				

-				Endpoint_ClearControlIN();

+				Endpoint_ClearIN();

 				

 				/* Acknowledge status stage */

 				while (!(Endpoint_IsOUTReceived()));

-				Endpoint_ClearControlOUT();

+				Endpoint_ClearOUT();

 			}

 			

 			break;

 		case REQ_SetLineEncoding:

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

 			{

-				Endpoint_ClearControlSETUP();

+				Endpoint_ClearSETUP();

 

 				while (!(Endpoint_IsOUTReceived()));

 

 				for (uint8_t i = 0; i < sizeof(LineCoding); i++)

 				  *(LineCodingData++) = Endpoint_Read_Byte();

 

-				Endpoint_ClearControlOUT();

+				Endpoint_ClearOUT();

 

 				/* Acknowledge status stage */

 				while (!(Endpoint_IsINReady()));

-				Endpoint_ClearControlIN();

+				Endpoint_ClearIN();

 			}

 	

 			break;

 		case REQ_SetControlLineState:

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

 			{

-				Endpoint_ClearControlSETUP();

+				Endpoint_ClearSETUP();

 				

 				/* Acknowledge status stage */

 				while (!(Endpoint_IsINReady()));

-				Endpoint_ClearControlIN();

+				Endpoint_ClearIN();

 			}

 	

 			break;

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index 00c1ea54b..289b4eb22 100644
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -163,7 +163,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 	switch (bRequest)

 	{

 		case DFU_DNLOAD:

-			Endpoint_ClearControlSETUP();

+			Endpoint_ClearSETUP();

 			

 			/* Check if bootloader is waiting to terminate */

 			if (WaitForExit)

@@ -235,7 +235,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 							/* Check if endpoint is empty - if so clear it and wait until ready for next packet */

 							if (!(Endpoint_BytesInEndpoint()))

 							{

-								Endpoint_ClearControlOUT();

+								Endpoint_ClearOUT();

 								while (!(Endpoint_IsOUTReceived()));

 							}

 

@@ -279,7 +279,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 							/* Check if endpoint is empty - if so clear it and wait until ready for next packet */

 							if (!(Endpoint_BytesInEndpoint()))

 							{

-								Endpoint_ClearControlOUT();

+								Endpoint_ClearOUT();

 								while (!(Endpoint_IsOUTReceived()));

 							}

 

@@ -296,15 +296,15 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 				}

 			}

 

-			Endpoint_ClearControlOUT();

+			Endpoint_ClearOUT();

 

 			/* Acknowledge status stage */

 			while (!(Endpoint_IsINReady()));

-			Endpoint_ClearControlIN();

+			Endpoint_ClearIN();

 				

 			break;

 		case DFU_UPLOAD:

-			Endpoint_ClearControlSETUP();

+			Endpoint_ClearSETUP();

 

 			while (!(Endpoint_IsINReady()));

 

@@ -343,7 +343,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 						/* Check if endpoint is full - if so clear it and wait until ready for next packet */

 						if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)

 						{

-							Endpoint_ClearControlIN();

+							Endpoint_ClearIN();

 							while (!(Endpoint_IsINReady()));

 						}

 

@@ -368,7 +368,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 						/* Check if endpoint is full - if so clear it and wait until ready for next packet */

 						if (Endpoint_BytesInEndpoint() == FIXED_CONTROL_ENDPOINT_SIZE)

 						{

-							Endpoint_ClearControlIN();

+							Endpoint_ClearIN();

 							while (!(Endpoint_IsINReady()));

 						}

 

@@ -384,15 +384,15 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 				DFU_State = dfuIDLE;

 			}

 

-			Endpoint_ClearControlIN();

+			Endpoint_ClearIN();

 

 			/* Acknowledge status stage */

 			while (!(Endpoint_IsOUTReceived()));

-			Endpoint_ClearControlOUT();

+			Endpoint_ClearOUT();

 

 			break;

 		case DFU_GETSTATUS:

-			Endpoint_ClearControlSETUP();

+			Endpoint_ClearSETUP();

 			

 			/* Write 8-bit status value */

 			Endpoint_Write_Byte(DFU_Status);

@@ -407,46 +407,46 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			/* Write 8-bit state string ID number */

 			Endpoint_Write_Byte(0);

 

-			Endpoint_ClearControlIN();

+			Endpoint_ClearIN();

 			

 			/* Acknowledge status stage */

 			while (!(Endpoint_IsOUTReceived()));

-			Endpoint_ClearControlOUT();

+			Endpoint_ClearOUT();

 	

 			break;		

 		case DFU_CLRSTATUS:

-			Endpoint_ClearControlSETUP();

+			Endpoint_ClearSETUP();

 			

 			/* Reset the status value variable to the default OK status */

 			DFU_Status = OK;

 

 			/* Acknowledge status stage */

 			while (!(Endpoint_IsINReady()));

-			Endpoint_ClearControlIN();

+			Endpoint_ClearIN();

 			

 			break;

 		case DFU_GETSTATE:

-			Endpoint_ClearControlSETUP();

+			Endpoint_ClearSETUP();

 			

 			/* Write the current device state to the endpoint */

 			Endpoint_Write_Byte(DFU_State);

 		

-			Endpoint_ClearControlIN();

+			Endpoint_ClearIN();

 			

 			/* Acknowledge status stage */

 			while (!(Endpoint_IsOUTReceived()));

-			Endpoint_ClearControlOUT();

+			Endpoint_ClearOUT();

 

 			break;

 		case DFU_ABORT:

-			Endpoint_ClearControlSETUP();

+			Endpoint_ClearSETUP();

 			

 			/* Reset the current state variable to the default idle state */

 			DFU_State = dfuIDLE;

 			

 			/* Acknowledge status stage */

 			while (!(Endpoint_IsINReady()));

-			Endpoint_ClearControlIN();

+			Endpoint_ClearIN();

 

 			break;

 	}

@@ -463,7 +463,7 @@ static void DiscardFillerBytes(uint8_t NumberOfBytes)
 	{

 		if (!(Endpoint_BytesInEndpoint()))

 		{

-			Endpoint_ClearControlOUT();

+			Endpoint_ClearOUT();

 

 			/* Wait until next data packet received */

 			while (!(Endpoint_IsOUTReceived()));

diff --git a/Bootloaders/TeensyHID/TeensyHID.c b/Bootloaders/TeensyHID/TeensyHID.c
index f82e28e72..e81c462a0 100644
--- a/Bootloaders/TeensyHID/TeensyHID.c
+++ b/Bootloaders/TeensyHID/TeensyHID.c
@@ -101,7 +101,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 		case REQ_SetReport:

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

 			{

-				Endpoint_ClearControlSETUP();

+				Endpoint_ClearSETUP();

 				

 				/* Wait until the command (report) has been sent by the host */

 				while (!(Endpoint_IsOUTReceived()));

@@ -126,7 +126,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 						/* Check if endpoint is empty - if so clear it and wait until ready for next packet */

 						if (!(Endpoint_BytesInEndpoint()))

 						{

-							Endpoint_ClearControlOUT();

+							Endpoint_ClearOUT();

 							while (!(Endpoint_IsOUTReceived()));

 						}

 

@@ -142,11 +142,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 					boot_rww_enable();

 				}

 

-				Endpoint_ClearControlOUT();

+				Endpoint_ClearOUT();

 

 				/* Acknowledge status stage */

 				while (!(Endpoint_IsINReady()));

-				Endpoint_ClearControlIN();

+				Endpoint_ClearIN();

 			}

 			

 			break;