X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5832bab02f9dedee5fae540f0e38b7417cddfb9d..03ee87b35abdb8b92e8b55ec040fa943f9a6786c:/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h

diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
index 3824145bf..472e1df47 100644
--- a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
+++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, and distribute this software
-  and its documentation for any purpose and without fee is hereby
-  granted, provided that the above copyright notice appear in all
-  copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting 
+  documentation, and that the name of the author not be used in 
+  advertising or publicity pertaining to distribution of the 
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
@@ -149,7 +149,7 @@
 				
 				#define  ADC_GetStatus()               ((ADCSRA & (1 << ADEN)) ? true : false)
 
-				#define  ADC_IsReadingComplete()         (!(ADCSRA & (1 << ADSC)))
+				#define  ADC_IsReadingComplete()        (ADCSRA & (1 << ADSC))
 				
 				#define  ADC_GetResult()                 ADC			
 			#endif
@@ -205,7 +205,7 @@
 				ADCSRA |= (1 << ADSC);
 			}
 
-			/** Performs a complete single reading from channel, including a polling spinloop to wait for the
+			/** Performs a complete single reading from channel, including a polling spin-loop to wait for the
 			 *  conversion to complete, and the returning of the converted value.
 			 *
 			 *  \param[in] MUXMask  Mask comprising of an ADC channel number, reference mask and adjustment mask