altos: Make MS5607 PROM a public variable

[fw/altos] / src / drivers / ao_ms5607.c

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 8f1dcbe1688b268c00d5f6b526a2cc8f9a62cd5e..6098699edf4b1735a8a0ede41fd163722ba809aa 100644 (file)
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -21,8 +21,8 @@
 
 #if HAS_MS5607 || HAS_MS5611
 
-static struct ao_ms5607_prom   ms5607_prom;
-static uint8_t                 ms5607_configured;
+__xdata struct ao_ms5607_prom  ao_ms5607_prom;
+static __xdata uint8_t         ms5607_configured;
 
 static void
 ao_ms5607_start(void) {
@@ -40,7 +40,7 @@ ao_ms5607_reset(void) {
 
        cmd = AO_MS5607_RESET;
        ao_ms5607_start();
-       ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+       ao_spi_send(DATA_TO_XDATA(&cmd), 1, AO_MS5607_SPI_INDEX);
        ao_delay(AO_MS_TO_TICKS(10));
        ao_ms5607_stop();
 }
@@ -69,17 +69,17 @@ ao_ms5607_crc(uint8_t *prom)
 }
 
 static void
-ao_ms5607_prom_read(struct ao_ms5607_prom *prom)
+ao_ms5607_prom_read(__xdata struct ao_ms5607_prom *prom)
 {
-       uint8_t         addr;
-       uint8_t         crc;
-       uint16_t        *r;
+       uint8_t                 addr;
+       uint8_t                 crc;
+       __xdata uint16_t        *r;
 
-       r = (uint16_t *) prom;
+       r = (__xdata uint16_t *) prom;
        for (addr = 0; addr < 8; addr++) {
                uint8_t cmd = AO_MS5607_PROM_READ(addr);
                ao_ms5607_start();
-               ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+               ao_spi_send(DATA_TO_XDATA(&cmd), 1, AO_MS5607_SPI_INDEX);
                ao_spi_recv(r, 2, AO_MS5607_SPI_INDEX);
                ao_ms5607_stop();
                r++;
@@ -111,28 +111,28 @@ ao_ms5607_setup(void)
                return;
        ms5607_configured = 1;
        ao_ms5607_reset();
-       ao_ms5607_prom_read(&ms5607_prom);
+       ao_ms5607_prom_read(&ao_ms5607_prom);
 }
 
-static volatile uint8_t        ao_ms5607_done;
+static __xdata volatile uint8_t        ao_ms5607_done;
 
 static void
 ao_ms5607_isr(void)
 {
        ao_exti_disable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
        ao_ms5607_done = 1;
-       ao_wakeup((void *) &ao_ms5607_done);
+       ao_wakeup((__xdata void *) &ao_ms5607_done);
 }
 
 static uint32_t
 ao_ms5607_get_sample(uint8_t cmd) {
-       uint8_t reply[3];
-       uint8_t read;
+       __xdata uint8_t reply[3];
+       __xdata uint8_t read;
 
        ao_ms5607_done = 0;
 
        ao_ms5607_start();
-       ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+       ao_spi_send(DATA_TO_XDATA(&cmd), 1, AO_MS5607_SPI_INDEX);
 
        ao_exti_enable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
 
@@ -140,7 +140,8 @@ ao_ms5607_get_sample(uint8_t cmd) {
        ao_spi_put(AO_MS5607_SPI_INDEX);
 #endif
        ao_arch_block_interrupts();
-       while (!ao_ms5607_done)
+       while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN, AO_MS5607_MISO) &&
+              !ao_ms5607_done)
                ao_sleep((void *) &ao_ms5607_done);
        ao_arch_release_interrupts();
 #if AO_MS5607_PRIVATE_PINS
@@ -173,16 +174,20 @@ ao_ms5607_get_sample(uint8_t cmd) {
 #define AO_CONVERT_D2  token_evaluator(AO_MS5607_CONVERT_D2_, AO_MS5607_TEMP_OVERSAMPLE)
 
 void
-ao_ms5607_sample(struct ao_ms5607_sample *sample)
+ao_ms5607_sample(__xdata struct ao_ms5607_sample *sample)
 {
        sample->pres = ao_ms5607_get_sample(AO_CONVERT_D1);
        sample->temp = ao_ms5607_get_sample(AO_CONVERT_D2);
 }
 
+#ifdef _CC1111_H_
+#include "ao_ms5607_convert_8051.c"
+#else
 #include "ao_ms5607_convert.c"
+#endif
 
 #if HAS_TASK
-struct ao_ms5607_sample        ao_ms5607_current;
+__xdata struct ao_ms5607_sample        ao_ms5607_current;
 
 static void
 ao_ms5607(void)
@@ -191,10 +196,10 @@ ao_ms5607(void)
        for (;;)
        {
                ao_ms5607_sample(&ao_ms5607_current);
-               ao_arch_critical(
-                       AO_DATA_PRESENT(AO_DATA_MS5607);
-                       AO_DATA_WAIT();
-                       );
+               ao_arch_block_interrupts();
+               AO_DATA_PRESENT(AO_DATA_MS5607);
+               AO_DATA_WAIT();
+               ao_arch_release_interrupts();
        }
 }
 
@@ -203,24 +208,24 @@ __xdata struct ao_task ao_ms5607_task;
 void
 ao_ms5607_info(void)
 {
-       printf ("ms5607 reserved: %u\n", ms5607_prom.reserved);
-       printf ("ms5607 sens: %u\n", ms5607_prom.sens);
-       printf ("ms5607 off: %u\n", ms5607_prom.off);
-       printf ("ms5607 tcs: %u\n", ms5607_prom.tcs);
-       printf ("ms5607 tco: %u\n", ms5607_prom.tco);
-       printf ("ms5607 tref: %u\n", ms5607_prom.tref);
-       printf ("ms5607 tempsens: %u\n", ms5607_prom.tempsens);
-       printf ("ms5607 crc: %u\n", ms5607_prom.crc);
+       printf ("ms5607 reserved: %u\n", ao_ms5607_prom.reserved);
+       printf ("ms5607 sens: %u\n", ao_ms5607_prom.sens);
+       printf ("ms5607 off: %u\n", ao_ms5607_prom.off);
+       printf ("ms5607 tcs: %u\n", ao_ms5607_prom.tcs);
+       printf ("ms5607 tco: %u\n", ao_ms5607_prom.tco);
+       printf ("ms5607 tref: %u\n", ao_ms5607_prom.tref);
+       printf ("ms5607 tempsens: %u\n", ao_ms5607_prom.tempsens);
+       printf ("ms5607 crc: %u\n", ao_ms5607_prom.crc);
 }
 
 static void
 ao_ms5607_dump(void)
 {
-       struct ao_ms5607_value value;
+       __xdata struct ao_ms5607_value value;
 
        ao_ms5607_convert(&ao_ms5607_current, &value);
-       printf ("Pressure:    %8u %8d\n", ao_ms5607_current.pres, value.pres);
-       printf ("Temperature: %8u %8d\n", ao_ms5607_current.temp, value.temp);
+       printf ("Pressure:    %8lu %8ld\n", ao_ms5607_current.pres, value.pres);
+       printf ("Temperature: %8lu %8ld\n", ao_ms5607_current.temp, value.temp);
        printf ("Altitude: %ld\n", ao_pa_to_altitude(value.pres));
 }