From 24c0331fbdf24cf31dd0290ac1887b396bc20bc0 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Thu, 14 Jun 2012 20:57:46 +0200 Subject: digital/avr/modules/adc: use ADC instead of deprecated ADCW --- digital/avr/modules/adc/adc.h | 4 ++-- digital/avr/modules/adc/adc.host.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'digital/avr') diff --git a/digital/avr/modules/adc/adc.h b/digital/avr/modules/adc/adc.h index 0daf9119..7ac740ed 100644 --- a/digital/avr/modules/adc/adc.h +++ b/digital/avr/modules/adc/adc.h @@ -34,7 +34,7 @@ # define ADCSRA 1 # define ADIF 0 -extern uint16_t ADCW; +extern uint16_t ADC; /** Table that the user can update to simulate an ADC. */ extern uint16_t adc_values[8]; @@ -53,6 +53,6 @@ adc_start (uint8_t c); #define adc_checkf() bit_is_set (ADCSR, ADIF) /** Read measure. */ -#define adc_read() ADCW +#define adc_read() ADC #endif /* adc_h */ diff --git a/digital/avr/modules/adc/adc.host.c b/digital/avr/modules/adc/adc.host.c index be5471a6..e09f45fb 100644 --- a/digital/avr/modules/adc/adc.host.c +++ b/digital/avr/modules/adc/adc.host.c @@ -28,7 +28,7 @@ #include "modules/utils/utils.h" /** Simulate hardware register. */ -uint16_t ADCW; +uint16_t ADC; /** Table that the user can update to simulate an ADC. */ uint16_t adc_values[8]; @@ -45,6 +45,6 @@ void adc_start (uint8_t c) { assert (c < UTILS_COUNT (adc_values)); - ADCW = adc_values[c]; + ADC = adc_values[c]; } -- cgit v1.2.3