projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add generic LED driver.
[fw/altos]
/
src
/
drivers
/
ao_ms5607.c
diff --git
a/src/drivers/ao_ms5607.c
b/src/drivers/ao_ms5607.c
index 53ed992afcece518c6a3a4b015c2d6aae9411cf9..a00d54c8e04c35f82e71f8cc4edb1a05537c1356 100644
(file)
--- a/
src/drivers/ao_ms5607.c
+++ b/
src/drivers/ao_ms5607.c
@@
-22,8
+22,8
@@
#if HAS_MS5607 || HAS_MS5611
#if HAS_MS5607 || HAS_MS5611
-
__xdata
struct ao_ms5607_prom ao_ms5607_prom;
-static
__xdata
uint8_t ms5607_configured;
+struct ao_ms5607_prom ao_ms5607_prom;
+static uint8_t ms5607_configured;
#ifndef AO_MS5607_SPI_SPEED
#define AO_MS5607_SPI_SPEED AO_SPI_SPEED_FAST
#ifndef AO_MS5607_SPI_SPEED
#define AO_MS5607_SPI_SPEED AO_SPI_SPEED_FAST
@@
-31,12
+31,12
@@
static __xdata uint8_t ms5607_configured;
static void
ao_ms5607_start(void) {
static void
ao_ms5607_start(void) {
- ao_spi_get_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_
CS, AO_MS5607_
SPI_INDEX, AO_MS5607_SPI_SPEED);
+ ao_spi_get_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_SPI_INDEX, AO_MS5607_SPI_SPEED);
}
static void
ao_ms5607_stop(void) {
}
static void
ao_ms5607_stop(void) {
- ao_spi_put_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_
CS, AO_MS5607_
SPI_INDEX);
+ ao_spi_put_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_SPI_INDEX);
}
static void
}
static void
@@
-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();
}
@@
-97,16
+97,16
@@
ao_ms5607_prom_valid(uint8_t *prom)
}
static void
}
static void
-ao_ms5607_prom_read(
__xdata
struct ao_ms5607_prom *prom)
+ao_ms5607_prom_read(struct ao_ms5607_prom *prom)
{
uint8_t addr;
uint16_t *r;
{
uint8_t addr;
uint16_t *r;
- r = (
__xdata
uint16_t *) prom;
+ r = (uint16_t *) 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++;
@@
-138,25
+138,25
@@
ao_ms5607_setup(void)
ao_ms5607_prom_read(&ao_ms5607_prom);
}
ao_ms5607_prom_read(&ao_ms5607_prom);
}
-static
__xdata
volatile uint8_t ao_ms5607_done;
+static 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;
static void
ao_ms5607_isr(void)
{
ao_exti_disable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
ao_ms5607_done = 1;
- ao_wakeup((
__xdata
void *) &ao_ms5607_done);
+ ao_wakeup((void *) &ao_ms5607_done);
}
static uint32_t
ao_ms5607_get_sample(uint8_t cmd) {
}
static uint32_t
ao_ms5607_get_sample(uint8_t cmd) {
-
__xdata
uint8_t reply[3];
-
__xdata
uint8_t read;
+ uint8_t reply[3];
+ uint8_t read;
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);
@@
-164,7
+164,7
@@
ao_ms5607_get_sample(uint8_t cmd) {
ao_spi_put(AO_MS5607_SPI_INDEX);
#endif
ao_arch_block_interrupts();
ao_spi_put(AO_MS5607_SPI_INDEX);
#endif
ao_arch_block_interrupts();
- while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN
, AO_MS5607_MISO
) &&
+ while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN) &&
!ao_ms5607_done)
ao_sleep((void *) &ao_ms5607_done);
ao_arch_release_interrupts();
!ao_ms5607_done)
ao_sleep((void *) &ao_ms5607_done);
ao_arch_release_interrupts();
@@
-198,7
+198,7
@@
ao_ms5607_get_sample(uint8_t cmd) {
#define AO_CONVERT_D2 token_evaluator(AO_MS5607_CONVERT_D2_, AO_MS5607_TEMP_OVERSAMPLE)
void
#define AO_CONVERT_D2 token_evaluator(AO_MS5607_CONVERT_D2_, AO_MS5607_TEMP_OVERSAMPLE)
void
-ao_ms5607_sample(
__xdata
struct ao_ms5607_sample *sample)
+ao_ms5607_sample(struct ao_ms5607_sample *sample)
{
sample->pres = ao_ms5607_get_sample(AO_CONVERT_D1);
sample->temp = ao_ms5607_get_sample(AO_CONVERT_D2);
{
sample->pres = ao_ms5607_get_sample(AO_CONVERT_D1);
sample->temp = ao_ms5607_get_sample(AO_CONVERT_D2);
@@
-214,7
+214,7
@@
ao_ms5607_sample(__xdata struct ao_ms5607_sample *sample)
#define HAS_MS5607_TASK HAS_TASK
#endif
#define HAS_MS5607_TASK HAS_TASK
#endif
-
__xdata
struct ao_ms5607_sample ao_ms5607_current;
+struct ao_ms5607_sample ao_ms5607_current;
#if HAS_MS5607_TASK
static void
#if HAS_MS5607_TASK
static void
@@
-233,7
+233,7
@@
ao_ms5607(void)
}
}
}
}
-
__xdata
struct ao_task ao_ms5607_task;
+struct ao_task ao_ms5607_task;
#endif
#if HAS_TASK
#endif
#if HAS_TASK
@@
-253,7
+253,7
@@
ao_ms5607_info(void)
static void
ao_ms5607_dump(void)
{
static void
ao_ms5607_dump(void)
{
-
__xdata
struct ao_ms5607_value value;
+ struct ao_ms5607_value value;
ao_ms5607_convert(&ao_ms5607_current, &value);
printf ("Pressure: %8lu %8ld\n", ao_ms5607_current.pres, value.pres);
ao_ms5607_convert(&ao_ms5607_current, &value);
printf ("Pressure: %8lu %8ld\n", ao_ms5607_current.pres, value.pres);
@@
-261,7
+261,7
@@
ao_ms5607_dump(void)
printf ("Altitude: %ld\n", ao_pa_to_altitude(value.pres));
}
printf ("Altitude: %ld\n", ao_pa_to_altitude(value.pres));
}
-
__code
struct ao_cmds ao_ms5607_cmds[] = {
+
const
struct ao_cmds ao_ms5607_cmds[] = {
{ ao_ms5607_dump, "B\0Display MS5607 data" },
{ 0, NULL },
};
{ ao_ms5607_dump, "B\0Display MS5607 data" },
{ 0, NULL },
};