projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Centre images in the Atmel Studio help, apply text formatting styles recursively.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
Peripheral
/
AVR8
/
ADC_AVR8.h
diff --git
a/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
b/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
index
474f570
..
02abbc7
100644
(file)
--- a/
LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
+++ b/
LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
@@
-97,13
+97,6
@@
#error The ADC peripheral driver is not currently available for your selected microcontroller model.
#endif
#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 */
/* 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.
*/
*
* \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: */
//@}
/* Inline Functions: */
@@
-369,7
+362,7
@@
/** Indicates if the current ADC conversion is completed, or still in progress.
*
/** 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;
* complete and ready to be read out with \ref ADC_GetResult().
*/
static inline bool ADC_IsReadingComplete(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;