From 21984e237a2795aac07898f416bee028109532f8 Mon Sep 17 00:00:00 2001
From: Bart Van Der Meerssche <bart.vandermeerssche@flukso.net>
Date: Wed, 29 Dec 2010 17:43:17 +0100
Subject: [PATCH] avr: port INT0 and INT1 ISRs to flukso v2

---
 mote/v2/avr/main.c | 25 +++++++++++++++++++++++--
 mote/v2/avr/main.h |  7 +++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/mote/v2/avr/main.c b/mote/v2/avr/main.c
index ff9e79a..38b2f1a 100644
--- a/mote/v2/avr/main.c
+++ b/mote/v2/avr/main.c
@@ -145,6 +145,27 @@ ISR(SPI_STC_vect)
 	}
 }
 
+ISR(INT0_vect)
+{
+	uint8_t muxn_l = phy_to_log[3];
+
+	register_pulse(&sensor[muxn_l], &state[muxn_l]);
+}
+
+ISR(INT1_vect)
+{
+	uint8_t muxn_l = phy_to_log[4];
+
+	register_pulse(&sensor[muxn_l], &state[muxn_l]);
+}
+
+void register_pulse(volatile struct sensor_struct *psensor, volatile struct state_struct *pstate)
+{
+	psensor->counter += psensor->meterconst;
+	pstate->flags |= STATE_PULSE;
+	pstate->timestamp = time.ms;
+}
+
 ISR(TIMER1_COMPA_vect)
 {
 	uint8_t muxn_l = phy_to_log[muxn];
@@ -267,7 +288,7 @@ void setup_analog_comparator(void)
 	ACSR |= (1<<ACBG) | (1<<ACIE) | (1<<ACIS1) | (1<<ACIS0);
 }
 
-void calculate_power(struct state_struct *pstate)
+void calculate_power(volatile struct state_struct *pstate)
 {
 	int32_t rest, power = 0;
 	uint8_t pulse_count;
@@ -335,7 +356,7 @@ int main(void)
 
 		for (i = 0; i < 3; i++) {
 			if (state[i].flags & STATE_POWER_CALC) {
-				calculate_power((struct state_struct *)&state[i]);
+				calculate_power(&state[i]);
 				state[i].flags &= ~STATE_POWER_CALC;
 				state[i].flags |= STATE_POWER;
 			}
diff --git a/mote/v2/avr/main.h b/mote/v2/avr/main.h
index 62bca43..abd4151 100644
--- a/mote/v2/avr/main.h
+++ b/mote/v2/avr/main.h
@@ -79,3 +79,10 @@ asm volatile ( \
 	"r2", "r4", "r5" \
 )
 
+void register_pulse(volatile struct sensor_struct *psensor, volatile struct state_struct *pstate);
+void setup_datastructs(void);
+void setup_pulse_input(void);
+void setup_adc(void);
+void setup_timer1(void);
+void setup_analog_comparator(void);
+void calculate_power(volatile struct state_struct *pstate);