aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-03-27 03:11:58 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-03-27 03:11:58 +0000
commitbb4880a9ee83d195adfaf6816c47a3fb92f40172 (patch)
treebba012422db3863d51935e329909f6098ee4fc3a /LUFA
parentca641bba8356851dd8144bde4a10bc5e5c647930 (diff)
downloadlufa-bb4880a9ee83d195adfaf6816c47a3fb92f40172.tar.gz
lufa-bb4880a9ee83d195adfaf6816c47a3fb92f40172.tar.bz2
lufa-bb4880a9ee83d195adfaf6816c47a3fb92f40172.zip
Fixed incorrect ADC driver init register manipulation (thanks to Tobias).
Diffstat (limited to 'LUFA')
-rw-r--r--LUFA/ChangeLog.txt1
-rw-r--r--LUFA/Drivers/AT90USBXXX/AT90USBXXX67/ADC.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index 3c482a153..e8dbba029 100644
--- a/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@ -44,6 +44,7 @@
* - Fixed CDC demo not sending an empty packet after each transfer to prevent the host from buffering incomming data
* - Fixed documentation typoes and preprocessor checks relating to misspellings of the USE_RAM_DESCRIPTORS token (thanks to Ian Gregg)
* - Fixed USBTask.h not conditionally including HostChapter9.h only when CAN_BE_DEVICE is defined (thanks to Ian Gregg)
+ * - Fixed incorrect ADC driver init register manipulation (thanks to Tobias)
*
* \section Sec_ChangeLog090209 Version 090209
*
diff --git a/LUFA/Drivers/AT90USBXXX/AT90USBXXX67/ADC.h b/LUFA/Drivers/AT90USBXXX/AT90USBXXX67/ADC.h
index 58027709f..c86203fe0 100644
--- a/LUFA/Drivers/AT90USBXXX/AT90USBXXX67/ADC.h
+++ b/LUFA/Drivers/AT90USBXXX/AT90USBXXX67/ADC.h
@@ -137,7 +137,7 @@
*/
static inline void ADC_SetupChannel(const uint8_t Channel)
{
- DDRD &= ~(1 << Channel);
+ DDRF &= ~(1 << Channel);
DIDR0 |= (1 << Channel);
}