From 68e777e16bd252c90d300c02ae88ff27b2fdb70d Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 9 Oct 2011 12:54:50 +0000
Subject: Prevent written but unused variable warnings on GCC 4.6 with dummy
 reads.

---
 LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h   | 6 ++++++
 LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h       | 6 ++++++
 LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h     | 6 ++++++
 LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h         | 6 ++++++
 LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h | 2 +-
 5 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'LUFA/Drivers')

diff --git a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
index f14d4839b..6aff5cc2c 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
@@ -634,6 +634,8 @@
 				uint8_t Dummy;
 
 				Dummy = UEDATX;
+
+				(void)Dummy;
 			}
 
 			/** Reads two bytes from the currently selected endpoint's bank in little endian format, for OUT
@@ -719,6 +721,8 @@
 
 				Dummy = UEDATX;
 				Dummy = UEDATX;
+
+				(void)Dummy;
 			}
 
 			/** Reads four bytes from the currently selected endpoint's bank in little endian format, for OUT
@@ -814,6 +818,8 @@
 				Dummy = UEDATX;
 				Dummy = UEDATX;
 				Dummy = UEDATX;
+
+				(void)Dummy;
 			}
 
 		/* External Variables: */
diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
index 40eebef75..277e28290 100644
--- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
@@ -613,6 +613,8 @@
 				uint8_t Dummy;
 
 				Dummy = UPDATX;
+
+				(void)Dummy;
 			}
 
 			/** Reads two bytes from the currently selected pipe's bank in little endian format, for OUT
@@ -698,6 +700,8 @@
 
 				Dummy = UPDATX;
 				Dummy = UPDATX;
+
+				(void)Dummy;
 			}
 
 			/** Reads four bytes from the currently selected pipe's bank in little endian format, for OUT
@@ -793,6 +797,8 @@
 				Dummy = UPDATX;
 				Dummy = UPDATX;
 				Dummy = UPDATX;
+
+				(void)Dummy;
 			}
 
 		/* External Variables: */
diff --git a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
index d38df8b48..8bbb605b5 100644
--- a/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
@@ -654,6 +654,8 @@
 				uint8_t Dummy;
 
 				Dummy = *(USB_EndpointFIFOPos[USB_SelectedEndpoint]++);
+
+				(void)Dummy;
 			}
 
 			/** Reads two bytes from the currently selected endpoint's bank in little endian format, for OUT
@@ -727,6 +729,8 @@
 
 				Dummy = *(USB_EndpointFIFOPos[USB_SelectedEndpoint]++);
 				Dummy = *(USB_EndpointFIFOPos[USB_SelectedEndpoint]++);
+
+				(void)Dummy;
 			}
 
 			/** Reads four bytes from the currently selected endpoint's bank in little endian format, for OUT
@@ -810,6 +814,8 @@
 				Dummy = *(USB_EndpointFIFOPos[USB_SelectedEndpoint]++);
 				Dummy = *(USB_EndpointFIFOPos[USB_SelectedEndpoint]++);
 				Dummy = *(USB_EndpointFIFOPos[USB_SelectedEndpoint]++);
+
+				(void)Dummy;
 			}
 
 		/* External Variables: */
diff --git a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
index 044dead1a..25957f27a 100644
--- a/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
@@ -648,6 +648,8 @@
 				uint8_t Dummy;
 
 				Dummy = *(USB_PipeFIFOPos[USB_SelectedPipe]++);
+
+				(void)Dummy;
 			}
 
 			/** Reads two bytes from the currently selected pipe's bank in little endian format, for OUT
@@ -721,6 +723,8 @@
 
 				Dummy = *(USB_PipeFIFOPos[USB_SelectedPipe]++);
 				Dummy = *(USB_PipeFIFOPos[USB_SelectedPipe]++);
+
+				(void)Dummy;
 			}
 
 			/** Reads four bytes from the currently selected pipe's bank in little endian format, for OUT
@@ -804,6 +808,8 @@
 				Dummy = *(USB_PipeFIFOPos[USB_SelectedPipe]++);
 				Dummy = *(USB_PipeFIFOPos[USB_SelectedPipe]++);
 				Dummy = *(USB_PipeFIFOPos[USB_SelectedPipe]++);
+
+				(void)Dummy;
 			}
 
 		/* External Variables: */
diff --git a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
index 18fe403e5..77fb7f7a4 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
+++ b/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
@@ -288,7 +288,7 @@
 	
 				Endpoint_SelectedEndpointHandle->CTRL   = 0;
 				Endpoint_SelectedEndpointHandle->STATUS = (USB_EP_BUSNACK0_bm | USB_EP_BUSNACK1_bm);
-				Endpoint_SelectedEndpointHandle->CTRL   = (EPTypeMask | Banks | Endpoint_BytesToEPSizeMask(Size));				
+				Endpoint_SelectedEndpointHandle->CTRL   = (EPTypeMask | Banks | Endpoint_BytesToEPSizeMask(Size));
 				return true;
 			}
 
-- 
cgit v1.2.3