summaryrefslogtreecommitdiff
path: root/digital/avr
diff options
context:
space:
mode:
authorNicolas Schodet2008-04-04 20:29:01 +0200
committerNicolas Schodet2008-04-04 20:29:01 +0200
commitaf59a3daa1335fa5e7d48be783f0225230fcd03e (patch)
tree719292be5626b544bbc2216544de30754f0f2c2d /digital/avr
parent3f2a34e4cc22114a37f76f516f6d4d5d896e5ece (diff)
* digital/avr/modules/adc:
- added host support.
Diffstat (limited to 'digital/avr')
-rw-r--r--digital/avr/modules/adc/Makefile.module2
-rw-r--r--digital/avr/modules/adc/README2
-rw-r--r--digital/avr/modules/adc/adc.avr.c (renamed from digital/avr/modules/adc/adc.c)16
-rw-r--r--digital/avr/modules/adc/adc.h33
-rw-r--r--digital/avr/modules/adc/adc.host.c50
5 files changed, 79 insertions, 24 deletions
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.c b/digital/avr/modules/adc/adc.avr.c
index 2d6d842f..3bfdefa9 100644
--- a/digital/avr/modules/adc/adc.c
+++ b/digital/avr/modules/adc/adc.avr.c
@@ -1,4 +1,4 @@
-/* adc.c */
+/* adc.avr.c */
/* n.avr.adc - AVR ADC Module. {{{
*
* Copyright (C) 2005 Thomas Burg
@@ -20,10 +20,11 @@
* Contact :
* Email: burg AT efrei DOT fr
* }}} */
+#include "common.h"
#include "adc.h"
-#include "io.h"
#include "modules/utils/utils.h"
+#include "io.h"
/* Tested AVR check. */
#if defined (__AVR_ATmega8__)
@@ -52,10 +53,7 @@
1, 0, 0, 1, 0, 0, 0, 0))
#define ADCSR_CFG_115200 7
-/* +AutoDec */
-/* -AutoDec */
-
-/** Initialise adc. */
+/** Initialise ADC. */
void
adc_init (void)
{
@@ -63,13 +61,13 @@ adc_init (void)
ADCSR = ADCSR_CFG | ADCSR_CFG_115200;
}
-/** Choose and start mesure on adc line. */
+/** Choose and start measure on ADC line. */
void
adc_start (uint8_t c)
{
- /* Choose adc. */
+ /* Choose ADC. */
ADMUX = ADMUX_CFG | (c & 0x07);
- /* Start mesure. */
+ /* Start measure. */
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];
+}
+