diff options
| author | Keith Packard <keithp@keithp.com> | 2018-08-15 17:34:20 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2018-10-13 08:22:50 -0700 |
| commit | 6023ff81f1bbd240169b9548209133d3b02d475f (patch) | |
| tree | 4526e7ac4386cbd73ebea1d896548dd2997d2bbb /src/drivers | |
| parent | e2e2182a6ae6c8a7290fb5f7bbb7f8e0a863ba99 (diff) | |
altos: Remove *_TO_DATA macros
Now that we don't support 8051, we don't need these
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/ao_companion.c | 2 | ||||
| -rw-r--r-- | src/drivers/ao_gps_skytraq.c | 4 | ||||
| -rw-r--r-- | src/drivers/ao_ms5607.c | 6 | ||||
| -rw-r--r-- | src/drivers/ao_packet.c | 2 | ||||
| -rw-r--r-- | src/drivers/ao_pad.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/drivers/ao_companion.c b/src/drivers/ao_companion.c index f82558a3..598b5815 100644 --- a/src/drivers/ao_companion.c +++ b/src/drivers/ao_companion.c @@ -107,7 +107,7 @@ ao_companion(void) break; } while (ao_companion_running) { - if (ao_sleep_for(DATA_TO_XDATA(&ao_flight_state), ao_companion_setup.update_period)) + if (ao_sleep_for(&ao_flight_state, ao_companion_setup.update_period)) ao_companion_get_data(); else ao_companion_notify(); diff --git a/src/drivers/ao_gps_skytraq.c b/src/drivers/ao_gps_skytraq.c index c483382e..3ecae435 100644 --- a/src/drivers/ao_gps_skytraq.c +++ b/src/drivers/ao_gps_skytraq.c @@ -298,7 +298,7 @@ ao_nmea_gga(void) ao_mutex_get(&ao_gps_mutex); ao_gps_new |= AO_GPS_NEW_DATA; ao_gps_tick = ao_gps_next_tick; - ao_xmemcpy(&ao_gps_data, PDATA_TO_XDATA(&ao_gps_next), sizeof (ao_gps_data)); + ao_xmemcpy(&ao_gps_data, &ao_gps_next, sizeof (ao_gps_data)); ao_mutex_put(&ao_gps_mutex); ao_wakeup(&ao_gps_new); } @@ -357,7 +357,7 @@ ao_nmea_gsv(void) else if (done) { ao_mutex_get(&ao_gps_mutex); ao_gps_new |= AO_GPS_NEW_TRACKING; - ao_xmemcpy(&ao_gps_tracking_data, PDATA_TO_XDATA(&ao_gps_tracking_next), sizeof(ao_gps_tracking_data)); + ao_xmemcpy(&ao_gps_tracking_data, &ao_gps_tracking_next, sizeof(ao_gps_tracking_data)); ao_mutex_put(&ao_gps_mutex); ao_wakeup(&ao_gps_new); } diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c index 53ed992a..4bfc17db 100644 --- 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(); - 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(); } @@ -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(); - 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++; @@ -156,7 +156,7 @@ ao_ms5607_get_sample(uint8_t cmd) { 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); diff --git a/src/drivers/ao_packet.c b/src/drivers/ao_packet.c index 008af5db..1c931921 100644 --- a/src/drivers/ao_packet.c +++ b/src/drivers/ao_packet.c @@ -91,7 +91,7 @@ ao_packet_recv(uint16_t timeout) if (ao_xmemcmp(ao_rx_packet.packet.callsign, ao_config.callsign, AO_MAX_CALLSIGN) != 0 && - ao_xmemcmp(ao_config.callsign, CODE_TO_XDATA("N0CALL"), 7) != 0) + ao_xmemcmp(ao_config.callsign, "N0CALL", 7) != 0) return 0; /* SYN packets carry no data */ diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c index c6efc311..208841fb 100644 --- a/src/drivers/ao_pad.c +++ b/src/drivers/ao_pad.c @@ -203,7 +203,7 @@ ao_pad_monitor(void) ao_arch_critical( while (sample == ao_data_head) - ao_sleep((void *) DATA_TO_XDATA(&ao_data_head)); + ao_sleep((void *) &ao_data_head); ); |