X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7d037c7db812be4dac1a742c990f3631fbd82cb5..a24e1cc7d761c8c3abd518a95393b46b391e7565:/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h?ds=inline

diff --git a/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h b/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
index 279e351da..02abbc7da 100644
--- a/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
+++ b/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  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
@@ -97,13 +97,6 @@
 			#error The ADC peripheral driver is not currently available for your selected microcontroller model.
 		#endif
 
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define _ADC_GET_MUX_MASK2(y)           ADC_CHANNEL ## y
-			#define _ADC_GET_MUX_MASK(y)            _ADC_GET_MUX_MASK2(y)
-	#endif
-
 	/* Public Interface - May be used in end-application: */
 		/* Macros: */
 			/** \name ADC Reference Configuration Masks */
@@ -257,7 +250,7 @@
 			 *
 			 *  \param[in] Channel  Index of the ADC channel whose MUX mask is to be retrieved.
 			 */
-			#define ADC_GET_CHANNEL_MASK(Channel)   _ADC_GET_MUX_MASK(Channel)
+			#define ADC_GET_CHANNEL_MASK(Channel)   CONCAT_EXPANDED(ADC_CHANNEL, Channel)
 			//@}
 
 		/* Inline Functions: */
@@ -369,7 +362,7 @@
 
 			/** Indicates if the current ADC conversion is completed, or still in progress.
 			 *
-			 *  \return Boolean false if the reading is still taking place, or true if the conversion is
+			 *  \return Boolean \c false if the reading is still taking place, or true if the conversion is
 			 *          complete and ready to be read out with \ref ADC_GetResult().
 			 */
 			static inline bool ADC_IsReadingComplete(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;