projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Remove *_TO_DATA macros
[fw/altos]
/
src
/
drivers
/
ao_ms5607.c
diff --git
a/src/drivers/ao_ms5607.c
b/src/drivers/ao_ms5607.c
index 3b3381ef0a3453ac32b790763b4b737a2627f118..4bfc17db8016f1adaeb0f7d2cc2eaf842e7f30c8 100644
(file)
--- a/
src/drivers/ao_ms5607.c
+++ b/
src/drivers/ao_ms5607.c
@@
-45,7
+45,7
@@
ao_ms5607_reset(void) {
cmd = AO_MS5607_RESET;
ao_ms5607_start();
cmd = AO_MS5607_RESET;
ao_ms5607_start();
- ao_spi_send(
DATA_TO_XDATA(&cmd)
, 1, AO_MS5607_SPI_INDEX);
+ ao_spi_send(
&cmd
, 1, AO_MS5607_SPI_INDEX);
ao_delay(AO_MS_TO_TICKS(10));
ao_ms5607_stop();
}
ao_delay(AO_MS_TO_TICKS(10));
ao_ms5607_stop();
}
@@
-87,13
+87,13
@@
ao_ms5607_prom_valid(uint8_t *prom)
if (*p++ + 1 > 1)
break;
if (i == 16)
if (*p++ + 1 > 1)
break;
if (i == 16)
- return
false
;
+ return
FALSE
;
crc = ao_ms5607_crc(prom);
if (crc != (prom[15] & 0xf))
crc = ao_ms5607_crc(prom);
if (crc != (prom[15] & 0xf))
- return
false
;
+ return
FALSE
;
- return
true
;
+ return
TRUE
;
}
static void
}
static void
@@
-106,7
+106,7
@@
ao_ms5607_prom_read(__xdata struct ao_ms5607_prom *prom)
for (addr = 0; addr < 8; addr++) {
uint8_t cmd = AO_MS5607_PROM_READ(addr);
ao_ms5607_start();
for (addr = 0; addr < 8; addr++) {
uint8_t cmd = AO_MS5607_PROM_READ(addr);
ao_ms5607_start();
- ao_spi_send(
DATA_TO_XDATA(&cmd)
, 1, AO_MS5607_SPI_INDEX);
+ ao_spi_send(
&cmd
, 1, AO_MS5607_SPI_INDEX);
ao_spi_recv(r, 2, AO_MS5607_SPI_INDEX);
ao_ms5607_stop();
r++;
ao_spi_recv(r, 2, AO_MS5607_SPI_INDEX);
ao_ms5607_stop();
r++;
@@
-156,7
+156,7
@@
ao_ms5607_get_sample(uint8_t cmd) {
ao_ms5607_done = 0;
ao_ms5607_start();
ao_ms5607_done = 0;
ao_ms5607_start();
- ao_spi_send(
DATA_TO_XDATA(&cmd)
, 1, AO_MS5607_SPI_INDEX);
+ ao_spi_send(
&cmd
, 1, AO_MS5607_SPI_INDEX);
ao_exti_enable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
ao_exti_enable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);