diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-02-22 14:55:40 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-02-22 14:55:40 -0700 |
| commit | 4af4e36cda96d053458eeb040e35886890917385 (patch) | |
| tree | 2b1b870b5b15af2fea0297b8cc9a5dff73d265df /src/drivers/ao_hmc5883.c | |
| parent | 91b1a80650a7dcd7c5bf819618a8cea0fceb37d9 (diff) | |
| parent | 106b16b4d5d024543d7ad8c4b4762151e253f3c4 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/drivers/ao_hmc5883.c')
| -rw-r--r-- | src/drivers/ao_hmc5883.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/drivers/ao_hmc5883.c b/src/drivers/ao_hmc5883.c index 2d217bcf..f761671a 100644 --- a/src/drivers/ao_hmc5883.c +++ b/src/drivers/ao_hmc5883.c @@ -75,13 +75,11 @@ ao_hmc5883_sample(struct ao_hmc5883_sample *sample) ao_exti_enable(AO_HMC5883_INT_PORT, AO_HMC5883_INT_PIN); ao_hmc5883_reg_write(HMC5883_MODE, HMC5883_MODE_SINGLE); - ao_alarm(AO_MS_TO_TICKS(10)); ao_arch_block_interrupts(); while (!ao_hmc5883_done) - if (ao_sleep(&ao_hmc5883_done)) + if (ao_sleep_for(&ao_hmc5883_done, AO_MS_TO_TICKS(10))) ++ao_hmc5883_missed_irq; ao_arch_release_interrupts(); - ao_clear_alarm(); ao_hmc5883_read(HMC5883_X_MSB, (uint8_t *) sample, sizeof (struct ao_hmc5883_sample)); #if __BYTE_ORDER == __LITTLE_ENDIAN |