From af59a3daa1335fa5e7d48be783f0225230fcd03e Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Fri, 4 Apr 2008 20:29:01 +0200 Subject: * digital/avr/modules/adc: - added host support. --- digital/avr/modules/adc/Makefile.module | 2 +- digital/avr/modules/adc/README | 2 +- digital/avr/modules/adc/adc.avr.c | 73 ++++++++++++++++++++++++++++++++ digital/avr/modules/adc/adc.c | 75 --------------------------------- digital/avr/modules/adc/adc.h | 33 +++++++++------ digital/avr/modules/adc/adc.host.c | 50 ++++++++++++++++++++++ 6 files changed, 145 insertions(+), 90 deletions(-) create mode 100644 digital/avr/modules/adc/adc.avr.c delete mode 100644 digital/avr/modules/adc/adc.c create mode 100644 digital/avr/modules/adc/adc.host.c (limited to 'digital/avr') diff --git a/digital/avr/modules/adc/Makefile.module b/digital/avr/modules/adc/Makefile.module index d14349c3..3f937661 100644 --- a/digital/avr/modules/adc/Makefile.module +++ b/digital/avr/modules/adc/Makefile.module @@ -1 +1 @@ -adc_SOURCES = adc.c +adc_SOURCES = adc.avr.c adc.host.c diff --git a/digital/avr/modules/adc/README b/digital/avr/modules/adc/README index ce7d8827..1fc78f28 100644 --- a/digital/avr/modules/adc/README +++ b/digital/avr/modules/adc/README @@ -1,4 +1,4 @@ -avr.adc - ADC AVR module. +avr.adc - AVR ADC module. Analog to Digital Converter module for AVR. See modules README for more details about AVR modules. diff --git a/digital/avr/modules/adc/adc.avr.c b/digital/avr/modules/adc/adc.avr.c new file mode 100644 index 00000000..3bfdefa9 --- /dev/null +++ b/digital/avr/modules/adc/adc.avr.c @@ -0,0 +1,73 @@ +/* adc.avr.c */ +/* n.avr.adc - AVR ADC Module. {{{ + * + * Copyright (C) 2005 Thomas Burg + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Contact : + * Email: burg AT efrei DOT fr + * }}} */ +#include "common.h" +#include "adc.h" + +#include "modules/utils/utils.h" +#include "io.h" + +/* Tested AVR check. */ +#if defined (__AVR_ATmega8__) +#elif defined (__AVR_ATmega8535__) +#elif defined (__AVR_ATmega128__) +#elif defined (__AVR_ATmega64__) +#elif defined (__AVR_ATmega16__) +#else +# warning "adc: not tested on this chip." +#endif + +#if defined (__AVR_ATmega128__) +#else +/* If the ADCSRB register is not set, auto-trigger is equivalent to + * free-running mode. */ +# define ADFR ADATE +#endif + +/* ADC configuration. */ +/* REFS = 01: AVCC with external capacitor at AREF pin. + * 11: Internal 2.56V Voltage Reference with external capacitor + * at AREF pin. */ +#define ADMUX_CFG (regv (REFS1, REFS0, ADLAR, MUX4, MUX3, MUX2, MUX1, MUX0, \ + 1, 1, 0, 0, 0, 0, 0, 0)) +#define ADCSR_CFG (regv (ADEN, ADSC, ADFR, ADIF, ADIE, ADPS2, ADPS1, ADPS0, \ + 1, 0, 0, 1, 0, 0, 0, 0)) +#define ADCSR_CFG_115200 7 + +/** Initialise ADC. */ +void +adc_init (void) +{ + /* Low freq. */ + ADCSR = ADCSR_CFG | ADCSR_CFG_115200; +} + +/** Choose and start measure on ADC line. */ +void +adc_start (uint8_t c) +{ + /* Choose ADC. */ + ADMUX = ADMUX_CFG | (c & 0x07); + /* Start measure. */ + ADCSR |= _BV (ADSC); +} + diff --git a/digital/avr/modules/adc/adc.c b/digital/avr/modules/adc/adc.c deleted file mode 100644 index 2d6d842f..00000000 --- a/digital/avr/modules/adc/adc.c +++ /dev/null @@ -1,75 +0,0 @@ -/* adc.c */ -/* n.avr.adc - AVR ADC Module. {{{ - * - * Copyright (C) 2005 Thomas Burg - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Contact : - * Email: burg AT efrei DOT fr - * }}} */ -#include "adc.h" - -#include "io.h" -#include "modules/utils/utils.h" - -/* Tested AVR check. */ -#if defined (__AVR_ATmega8__) -#elif defined (__AVR_ATmega8535__) -#elif defined (__AVR_ATmega128__) -#elif defined (__AVR_ATmega64__) -#elif defined (__AVR_ATmega16__) -#else -# warning "adc: not tested on this chip." -#endif - -#if defined (__AVR_ATmega128__) -#else -/* If the ADCSRB register is not set, auto-trigger is equivalent to - * free-running mode. */ -# define ADFR ADATE -#endif - -/* ADC configuration. */ -/* REFS = 01: AVCC with external capacitor at AREF pin. - * 11: Internal 2.56V Voltage Reference with external capacitor - * at AREF pin. */ -#define ADMUX_CFG (regv (REFS1, REFS0, ADLAR, MUX4, MUX3, MUX2, MUX1, MUX0, \ - 1, 1, 0, 0, 0, 0, 0, 0)) -#define ADCSR_CFG (regv (ADEN, ADSC, ADFR, ADIF, ADIE, ADPS2, ADPS1, ADPS0, \ - 1, 0, 0, 1, 0, 0, 0, 0)) -#define ADCSR_CFG_115200 7 - -/* +AutoDec */ -/* -AutoDec */ - -/** Initialise adc. */ -void -adc_init (void) -{ - /* Low freq. */ - ADCSR = ADCSR_CFG | ADCSR_CFG_115200; -} - -/** Choose and start mesure on adc line. */ -void -adc_start (uint8_t c) -{ - /* Choose adc. */ - ADMUX = ADMUX_CFG | (c & 0x07); - /* Start mesure. */ - ADCSR |= _BV (ADSC); -} - diff --git a/digital/avr/modules/adc/adc.h b/digital/avr/modules/adc/adc.h index edd4a0af..dba200ce 100644 --- a/digital/avr/modules/adc/adc.h +++ b/digital/avr/modules/adc/adc.h @@ -1,7 +1,7 @@ #ifndef adc_h #define adc_h /* adc.h */ -/* n.avr.adc - AVR ADC Module. {{{ +/* avr.adc - AVR ADC module. {{{ * * Copyright (C) 2005 Thomas Burg * @@ -23,29 +23,36 @@ * Email: burg AT efrei DOT fr * }}} */ -#include "common.h" -/* Different name on ATmega8535. */ - -#if defined (__AVR_ATmega8535__) || defined (__AVR_ATmega16__) -#define ADCSR ADCSRA +/* Different name for AVR with auto-trigger support. */ +#if !defined (__AVR_ATmega128__) +# define ADCSR ADCSRA #endif -/* +AutoDec */ +#ifdef HOST + +/* No hardware on host. */ +# define ADCSRA 1 +# define ADIF 1 + +extern uint16_t ADCW; -/** Initialise adc. */ +/** Table that the user can update to simulate an ADC. */ +extern uint16_t adc_values[8]; + +#endif /* defined (HOST) */ + +/** Initialise ADC. */ void adc_init (void); -/** Choose and start mesure on adc line. */ +/** Choose and start measure on ADC line. */ void adc_start (uint8_t c); -/* -AutoDec */ - -/** check on finish mesure */ +/** Check if measure is finished. */ #define adc_checkf() bit_is_set (ADCSR, ADIF) -/** read mesure */ +/** Read measure. */ #define adc_read() ADCW #endif /* adc_h */ diff --git a/digital/avr/modules/adc/adc.host.c b/digital/avr/modules/adc/adc.host.c new file mode 100644 index 00000000..be5471a6 --- /dev/null +++ b/digital/avr/modules/adc/adc.host.c @@ -0,0 +1,50 @@ +/* adc.host.c */ +/* avr.adc - AVR ADC module. {{{ + * + * Copyright (C) 2008 Nicolas Schodet + * + * APBTeam: + * Web: http://apbteam.org/ + * Email: team AT apbteam DOT org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * }}} */ +#include "common.h" +#include "adc.h" + +#include "modules/utils/utils.h" + +/** Simulate hardware register. */ +uint16_t ADCW; + +/** Table that the user can update to simulate an ADC. */ +uint16_t adc_values[8]; + +/** Initialise ADC. */ +void +adc_init (void) +{ + /* Nothing. */ +} + +/** Choose and start measure on ADC line. */ +void +adc_start (uint8_t c) +{ + assert (c < UTILS_COUNT (adc_values)); + ADCW = adc_values[c]; +} + -- cgit v1.2.3