From 1c16ae399a9f924c15d9dec54cacb1320ff0a92f Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Thu, 16 Apr 2009 23:59:14 +0000
Subject: Partial commit: change references to Drivers/AT90USBXXX to
 Drivers/Peripheral.

---
 LUFA/Drivers/Board/Dataflash.h       |  2 +-
 LUFA/Drivers/Board/Temperature.h     |  2 +-
 LUFA/Drivers/USB/LowLevel/Endpoint.h | 10 ++++++----
 LUFA/Drivers/USB/LowLevel/Pipe.h     | 15 ++++++++++-----
 LUFA/Drivers/USB/USB.h               |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'LUFA/Drivers')

diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index 4e61a6bce..c235cf319 100644
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -58,7 +58,7 @@
 	#endif
 
 	/* Includes: */
-	#include "../AT90USBXXX/SPI.h"
+	#include "../Peripheral/SPI.h"
 	#include "../../Common/Common.h"
 		
 	/* Enable C linkage for C++ Compilers: */
diff --git a/LUFA/Drivers/Board/Temperature.h b/LUFA/Drivers/Board/Temperature.h
index 6e1827edd..7069e3e99 100644
--- a/LUFA/Drivers/Board/Temperature.h
+++ b/LUFA/Drivers/Board/Temperature.h
@@ -52,8 +52,8 @@
 	/* Includes: */
 		#include <avr/pgmspace.h>
 
-		#include "../AT90USBXXX/ADC.h"
 		#include "../../Common/Common.h"
+		#include "../Peripheral/ADC.h"
 	
 		#if !defined(BOARD)
 			#error #error BOARD must be set in makefile to a value specified in BoardTypes.h.	
diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index 2223f0ca4..a7a282258 100644
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -416,9 +416,9 @@
 
 				#define Endpoint_HasEndpointInterrupted(n)    ((UEINT & (1 << n)) ? true : false)
 				
-				#define Endpoint_IsINReady()                 ((UEINTX & (1 << TXINI))  ? true : false)
+				#define Endpoint_IsINReady()                  ((UEINTX & (1 << TXINI))  ? true : false)
 				
-				#define Endpoint_IsOUTReceived()             ((UEINTX & (1 << RXOUTI)) ? true : false)
+				#define Endpoint_IsOUTReceived()              ((UEINTX & (1 << RXOUTI)) ? true : false)
 
 				#define Endpoint_IsSETUPReceived()            ((UEINTX & (1 << RXSTPI)) ? true : false)
 
@@ -428,9 +428,11 @@
 
 				#define Endpoint_ClearControlOUT()            MACROS{ UEINTX &= ~(1 << RXOUTI); }MACROE
 
-				#define Endpoint_ClearIN()                    MACROS{ UEINTX &= ~(1 << TXINI); UEINTX &= ~(1 << FIFOCON); }MACROE
+				#define Endpoint_ClearIN()                    MACROS{ uint8_t Temp = UEINTX; UEINTX = (Temp & ~(1 << TXINI)); \
+				                                                      UEINTX = (Temp & ~(1 << FIFOCON)); }MACROE
 
-				#define Endpoint_ClearOUT()                   MACROS{ UEINTX &= ~(1 << RXOUTI); UEINTX &= ~(1 << FIFOCON); }MACROE
+				#define Endpoint_ClearOUT()                   MACROS{ uint8_t Temp = UEINTX; UEINTX = (Temp & ~(1 << RXOUTI)); \
+				                                                      UEINTX = (Temp & ~(1 << FIFOCON)); }MACROE
 
 				#define Endpoint_StallTransaction()           MACROS{ UECONX |= (1 << STALLRQ); }MACROE
 
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 253ce2a93..9d8dded04 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -553,15 +553,20 @@
 
 				#define Pipe_IsSETUPSent()             ((UPINTX & (1 << TXSTPI)) ? true : false)
 
-				#define Pipe_ClearIN()                 MACROS{ UPINTX &= ~(1 << RXINI); UPINTX &= ~(1 << FIFOCON); }MACROE
+				#define Pipe_ClearIN()                 MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << RXINI)); \
+				                                               UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE
 
-				#define Pipe_ClearControlIN()          MACROS{ UPINTX &= ~(1 << RXINI); UPINTX &= ~(1 << FIFOCON); }MACROE
+				#define Pipe_ClearControlIN()          MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << RXINI)); \
+				                                               UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE
 
-				#define Pipe_ClearOUT()                MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE
+				#define Pipe_ClearOUT()                MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXOUTI)); \
+				                                               UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE
 				
-				#define Pipe_ClearControlOUT()         MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE
+				#define Pipe_ClearControlOUT()         MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXOUTI)); \
+				                                               UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE
 
-				#define Pipe_ClearControlSETUP()       MACROS{ UPINTX &= ~(1 << TXSTPI); UPINTX &= ~(1 << FIFOCON); }MACROE        
+				#define Pipe_ClearControlSETUP()       MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXSTPI)); \
+				                                               UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE
 
 				#define Pipe_IsNAKReceived()           ((UPINTX & (1 << NAKEDI)) ? true : false)
 
diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index 75fff2fcd..4d1408849 100644
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -60,7 +60,7 @@
 		#endif
 		
 	/* Includes: */
-		#include "Highlevel/USBMode.h"
+		#include "HighLevel/USBMode.h"
 		#include "HighLevel/USBTask.h"
 		#include "HighLevel/USBInterrupt.h"
 		#include "HighLevel/Events.h"
-- 
cgit v1.2.3