From: Michel Pollet <buserror@gmail.com>
Date: Fri, 6 Apr 2012 15:02:14 +0000 (+0100)
Subject: ADC: Grown to 64 possible mux values
X-Git-Url: http://git.rot13.org/?p=simavr;a=commitdiff_plain;h=6c922b8988a4717fa7e9805a59e0a357677af1b4

ADC: Grown to 64 possible mux values

Needs a bigger ADC, the mega1280 uses 6 bits.

Signed-off-by: Michel Pollet <buserror@gmail.com>
---

diff --git a/simavr/sim/avr_adc.c b/simavr/sim/avr_adc.c
index dd98a83..689abf7 100644
--- a/simavr/sim/avr_adc.c
+++ b/simavr/sim/avr_adc.c
@@ -229,6 +229,14 @@ static const char * irq_names[ADC_IRQ_COUNT] = {
 	[ADC_IRQ_ADC5] = "16<adc5",
 	[ADC_IRQ_ADC6] = "16<adc6",
 	[ADC_IRQ_ADC7] = "16<adc7",
+	[ADC_IRQ_ADC8] = "16<adc0",
+	[ADC_IRQ_ADC9] = "16<adc9",
+	[ADC_IRQ_ADC10] = "16<adc10",
+	[ADC_IRQ_ADC11] = "16<adc11",
+	[ADC_IRQ_ADC12] = "16<adc12",
+	[ADC_IRQ_ADC13] = "16<adc13",
+	[ADC_IRQ_ADC14] = "16<adc14",
+	[ADC_IRQ_ADC15] = "16<adc15",
 	[ADC_IRQ_TEMP] = "16<temp",
 	[ADC_IRQ_IN_TRIGGER] = "<trigger_in",
 	[ADC_IRQ_OUT_TRIGGER] = ">trigger_out",
diff --git a/simavr/sim/avr_adc.h b/simavr/sim/avr_adc.h
index c453f87..6d0020b 100644
--- a/simavr/sim/avr_adc.h
+++ b/simavr/sim/avr_adc.h
@@ -41,6 +41,8 @@ enum {
 	// input IRQ values. Values are /always/ volts * 1000 (millivolts)
 	ADC_IRQ_ADC0 = 0, ADC_IRQ_ADC1, ADC_IRQ_ADC2, ADC_IRQ_ADC3,
 	ADC_IRQ_ADC4, ADC_IRQ_ADC5, ADC_IRQ_ADC6, ADC_IRQ_ADC7,
+	ADC_IRQ_ADC8, ADC_IRQ_ADC9, ADC_IRQ_ADC10, ADC_IRQ_ADC11,
+	ADC_IRQ_ADC12, ADC_IRQ_ADC13, ADC_IRQ_ADC14, ADC_IRQ_ADC15,
 	ADC_IRQ_TEMP,			// see the datasheet
 	ADC_IRQ_IN_TRIGGER,
 	ADC_IRQ_OUT_TRIGGER,	// sends a avr_adc_mux_t
@@ -79,7 +81,7 @@ typedef struct avr_adc_t {
 
 	uint8_t 		r_admux;
 	// if the last bit exists in the mux, we are an extended ADC
-	avr_regbit_t	mux[5];
+	avr_regbit_t	mux[6];
 	avr_regbit_t	ref[3];		// reference voltages bits
 	uint16_t		ref_values[7]; // ADC_VREF_*
 
@@ -105,7 +107,7 @@ typedef struct avr_adc_t {
 	/*
 	 * runtime bits
 	 */
-	avr_adc_mux_t	muxmode[32];// maximum 5 bits of mux modes
+	avr_adc_mux_t	muxmode[64];// maximum 6 bits of mux modes
 	uint16_t		adc_values[8];	// current values on the ADCs
 	uint16_t		temp;		// temp sensor reading
 	uint8_t			first;