From: Keith Packard <keithp@keithp.com>
Date: Sun, 24 Feb 2013 09:20:16 +0000 (-0800)
Subject: altos/driver: Make HMC5883 driver build again
X-Git-Tag: altosdroid_v1.2-1~104
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=9230f0a5b119044235c0c419e85a83115aae924d

altos/driver: Make HMC5883 driver build again

Adapt to changes in OS interfaces

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/drivers/ao_hmc5883.c b/src/drivers/ao_hmc5883.c
index 059fc2c8..782d03f4 100644
--- a/src/drivers/ao_hmc5883.c
+++ b/src/drivers/ao_hmc5883.c
@@ -77,11 +77,11 @@ ao_hmc5883_sample(struct ao_hmc5883_sample *sample)
 	ao_hmc5883_reg_write(HMC5883_MODE, HMC5883_MODE_SINGLE);
 
 	ao_alarm(AO_MS_TO_TICKS(10));
-	cli();
+	ao_arch_block_interrupts();
 	while (!ao_hmc5883_done)
 		if (ao_sleep(&ao_hmc5883_done))
 			++ao_hmc5883_missed_irq;
-	sei();
+	ao_arch_release_interrupts();
 	ao_clear_alarm();
 
 	ao_hmc5883_read(HMC5883_X_MSB, (uint8_t *) sample, sizeof (struct ao_hmc5883_sample));
@@ -109,7 +109,7 @@ ao_hmc5883_setup(void)
 	ao_i2c_put(AO_HMC5883_I2C_INDEX);
 
 	if (!present)
-		ao_panic(AO_PANIC_SELF_TEST);
+		ao_panic(AO_PANIC_SELF_TEST_HMC5883);
 
 	ao_hmc5883_reg_write(HMC5883_CONFIG_A,
 			     (HMC5883_CONFIG_A_MA_8 << HMC5883_CONFIG_A_MA) |