Removed the automated checking of event names in the demo, project and bootloader makefiles due to inconsistancies between the behaviour of the command line tools used to perform the check on each platform.

Removed the internal endpoint and pipe memory allocation macros, as this is already performed directly in the code. Simplify the endpoint and pipe reset procedure.

8 files changed, 14 insertions, 28 deletions

diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h
index b595564a6..27bc42828 100644
--- a/LUFA/Drivers/USB/LowLevel/Device.h
+++ b/LUFA/Drivers/USB/LowLevel/Device.h
@@ -98,6 +98,11 @@
 			 *        issued if the host is currently allowing remote wakeup events from the device (i.e.,
 			 *        the \ref USB_RemoteWakeupEnabled flag is set). When the NO_DEVICE_REMOTE_WAKEUP compile
 			 *        time option is used, this macro is unavailable.
+			 *        \n
+			 *
+			 *  \note The USB clock must be running for this function to operate. If the stack is initialized with
+			 *        the \ref USB_OPT_MANUAL_PLL option enabled, the user must ensure that the PLL is running
+			 *        before attempting to call this function.
 			 *
 			 *  \see \ref Group_Descriptors for more information on the RMWAKEUP feature and device descriptors.
 			 */
diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.c b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index 22579af6d..d22a50d6c 100644
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.c
@@ -65,9 +65,9 @@ void Endpoint_ClearEndpoints(void)
 	for (uint8_t EPNum = 0; EPNum < ENDPOINT_TOTAL_ENDPOINTS; EPNum++)
 	{
 		Endpoint_SelectEndpoint(EPNum);	
-		UEIENX = 0;
-		UEINTX = 0;
-		Endpoint_DeallocateMemory();
+		UEIENX  = 0;
+		UEINTX  = 0;
+		UECFG1X = 0;
 		Endpoint_DisableEndpoint();
 	}
 }
diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index daf3d814b..8ed794d19 100644
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -1194,9 +1194,6 @@
 	/* Private Interface - For use in library only: */
 	#if !defined(__DOXYGEN__)
 		/* Macros: */
-			#define Endpoint_AllocateMemory()              MACROS{ UECFG1X |=  (1 << ALLOC); }MACROE
-			#define Endpoint_DeallocateMemory()            MACROS{ UECFG1X &= ~(1 << ALLOC); }MACROE
-			
 			#define _ENDPOINT_GET_MAXSIZE(n)               _ENDPOINT_GET_MAXSIZE2(ENDPOINT_DETAILS_EP ## n)
 			#define _ENDPOINT_GET_MAXSIZE2(details)        _ENDPOINT_GET_MAXSIZE3(details)
 			#define _ENDPOINT_GET_MAXSIZE3(maxsize, db)    maxsize
diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c
index 37ad0adc5..f00e6dd4e 100644
--- a/LUFA/Drivers/USB/LowLevel/Host.c
+++ b/LUFA/Drivers/USB/LowLevel/Host.c
@@ -144,10 +144,6 @@ void USB_Host_ProcessNextHostState(void)
 			HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset);
 			break;
 		case HOST_STATE_Default_PostReset:
-			Pipe_DisablePipe();
-			Pipe_DeallocateMemory();		
-			Pipe_ResetPipe(PIPE_CONTROLPIPE);
-			
 			Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL,
 			                   PIPE_TOKEN_SETUP, ENDPOINT_CONTROLEP,
 			                   USB_ControlPipeSize, PIPE_BANK_SINGLE);
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c
index 8e817a279..6f1d51682 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.c
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.c
@@ -60,13 +60,10 @@ void Pipe_ClearPipes(void)
 
 	for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)
 	{
-		Pipe_ResetPipe(PNum);
 		Pipe_SelectPipe(PNum);
-		UPIENX = 0;
-		UPINTX = 0;
-		Pipe_ClearError();
-		Pipe_ClearErrorFlags();
-		Pipe_DeallocateMemory();
+		UPIENX  = 0;
+		UPINTX  = 0;
+		UPCFG1X = 0;
 		Pipe_DisablePipe();
 	}
 }
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 05e393ec8..da296dcc4 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -1029,9 +1029,6 @@
 				#define ENDPOINT_CONTROLEP         0
 			#endif
 			
-			#define Pipe_AllocateMemory()          MACROS{ UPCFG1X |=  (1 << ALLOC); }MACROE
-			#define Pipe_DeallocateMemory()        MACROS{ UPCFG1X &= ~(1 << ALLOC); }MACROE
-
 		/* Function Prototypes: */
 			void Pipe_ClearPipes(void);
 
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index ffd1fcfbc..6e92adca6 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -31,6 +31,8 @@
   *    minimal loads and stores rather than complicated shifts
   *  - The software UART in the XPLAINBridge has been largely altered to try to improve upon its performance and reliability
   *  - The USBtoSerial project now flushes received data via a flush timer, so that several bytes can be transmitted at once
+  *  - Removed the automated checking of event names in the demo, project and bootloader makefiles due to inconsistancies between the
+  *    behaviour of the command line tools used to perform the check on each platform
   *
   *  <b>Fixed:</b>
   *  - Fixed AVRISP project sending a LOAD EXTENDED ADDRESS command to 128KB AVRs after programming or reading from
diff --git a/LUFA/makefile b/LUFA/makefile
index f77b1c432..157f2e7d3 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -37,18 +37,10 @@ LUFA_SRC_FILES =     ./Drivers/USB/LowLevel/DevChapter9.c        \
                      ./Drivers/Peripheral/TWI.c                  \
 					 ./Scheduler/Scheduler.c                     \
 
-LUFA_Events.lst:
-	@echo
-	@echo Generating LUFA event name list...
-	@$(shell) cat `find ./ -name "*.h"` | grep -E "EVENT_[^\(]*\(" | \
-	              sed -n -e 's/^.*EVENT_/EVENT_/p' | \
-	              cut -d'(' -f1 | sort | uniq | tee LUFA_Events.lst
-				  
-all: LUFA_Events.lst
+all:
 
 clean:
 	rm -f $(LUFA_SRC_FILES:%.c=%.o)
-	rm -f LUFA_Events.lst
 	
 clean_list: