From 76aae654108d525330438951c3bc40918ffc7efa Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Fri, 29 May 2009 20:48:56 +0200 Subject: Remove BUG_ON pointer assertion Signed-off-by: Michael Buesch --- pressure_control/firmware/sensor.c | 6 +----- pressure_control/firmware/util.c | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'pressure_control/firmware') diff --git a/pressure_control/firmware/sensor.c b/pressure_control/firmware/sensor.c index bf48fb2..08eca77 100644 --- a/pressure_control/firmware/sensor.c +++ b/pressure_control/firmware/sensor.c @@ -36,8 +36,6 @@ ISR(ADC_vect) const uint16_t full_scale_adc = ADC_MAX * (uint32_t)s->full_scale_mv / 5000; uint16_t adc, mv, mbar; - BUG_ON(!active_sensor); - /* Convert the ADC value to millivolts. */ adc = ADC; if (adc > full_scale_adc) @@ -52,8 +50,7 @@ ISR(ADC_vect) mbar = (uint32_t)s->full_scale_mbar * (uint32_t)mv / (uint32_t)s->full_scale_mv; - sensor_result(active_sensor, mbar); - active_sensor = NULL; + sensor_result(s, mbar); } static inline void adc_trigger(uint8_t mux, bool with_irq) @@ -69,7 +66,6 @@ static inline void adc_trigger(uint8_t mux, bool with_irq) void sensor_trigger_read(struct sensor *s) { - BUG_ON(active_sensor); active_sensor = s; mb(); /* Trigger an ADC conversion with interrupt notification. */ diff --git a/pressure_control/firmware/util.c b/pressure_control/firmware/util.c index 241fc19..0b0bbab 100644 --- a/pressure_control/firmware/util.c +++ b/pressure_control/firmware/util.c @@ -19,6 +19,7 @@ #include "util.h" #include "calibration.h" +#include "remote.h" #include #include @@ -74,7 +75,7 @@ void udelay(uint16_t usecs) void panic(const prog_char *msg) { -//TODO + print("Panic!"); infinite_sleep(); } -- cgit v1.2.3