altos: Replace ao_xmem functions with direct mem calls

We no longer need to wrap these functions

Signed-off-by: Keith Packard <keithp@keithp.com>

8 files changed, 19 insertions, 19 deletions

diff --git a/src/drivers/ao_25lc1024.c b/src/drivers/ao_25lc1024.c
index c73f54df..2139dadc 100644
--- a/src/drivers/ao_25lc1024.c
+++ b/src/drivers/ao_25lc1024.c
@@ -169,7 +169,7 @@ ao_storage_device_write(uint32_t pos, void *buf, uint16_t len)
 			ao_ee_flush_internal();
 			ao_ee_block = block;
 		}
-		ao_xmemcpy(ao_ee_data + (uint16_t) (pos & 0xff), buf, len);
+		memcpy(ao_ee_data + (uint16_t) (pos & 0xff), buf, len);
 		ao_ee_block_dirty = 1;
 	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
@@ -183,7 +183,7 @@ ao_storage_device_read(uint32_t pos, void *buf, uint16_t len)
 	/* Transfer the data */
 	ao_mutex_get(&ao_ee_mutex); {
 		ao_ee_fill(block);
-		ao_xmemcpy(buf, ao_ee_data + (uint16_t) (pos & 0xff), len);
+		memcpy(buf, ao_ee_data + (uint16_t) (pos & 0xff), len);
 	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
 }
@@ -202,7 +202,7 @@ ao_storage_erase(uint32_t pos)
 	ao_mutex_get(&ao_ee_mutex); {
 		ao_ee_flush_internal();
 		ao_ee_block = (uint16_t) (pos >> EE_BLOCK_SHIFT);
-		ao_xmemset(ao_ee_data, 0xff, EE_BLOCK_SIZE);
+		memset(ao_ee_data, 0xff, EE_BLOCK_SIZE);
 		ao_ee_block_dirty = 1;
 	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
diff --git a/src/drivers/ao_at45db161d.c b/src/drivers/ao_at45db161d.c
index 516811b8..e04baaf6 100644
--- a/src/drivers/ao_at45db161d.c
+++ b/src/drivers/ao_at45db161d.c
@@ -246,7 +246,7 @@ ao_storage_device_write(uint32_t pos, void *buf, uint16_t len)
 			ao_flash_flush_internal();
 			ao_flash_block = block;
 		}
-		ao_xmemcpy(ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
+		memcpy(ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
 		       buf,
 		       len);
 		ao_flash_block_dirty = 1;
@@ -262,7 +262,7 @@ ao_storage_device_read(uint32_t pos, void *buf, uint16_t len)
 	/* Transfer the data */
 	ao_mutex_get(&ao_flash_mutex); {
 		ao_flash_fill(block);
-		ao_xmemcpy(buf,
+		memcpy(buf,
 		       ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
 		       len);
 	} ao_mutex_put(&ao_flash_mutex);
@@ -283,7 +283,7 @@ ao_storage_erase(uint32_t pos)
 	ao_mutex_get(&ao_flash_mutex); {
 		ao_flash_flush_internal();
 		ao_flash_block = (uint16_t) (pos >> ao_flash_block_shift);
-		ao_xmemset(ao_flash_data, 0xff, ao_flash_block_size);
+		memset(ao_flash_data, 0xff, ao_flash_block_size);
 		ao_flash_block_dirty = 1;
 	} ao_mutex_put(&ao_flash_mutex);
 	return 1;
diff --git a/src/drivers/ao_gps_skytraq.c b/src/drivers/ao_gps_skytraq.c
index f767118a..3b4a62ec 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, &ao_gps_next, sizeof (ao_gps_data));
+		memcpy(&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, &ao_gps_tracking_next, sizeof(ao_gps_tracking_data));
+		memcpy(&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_packet.c b/src/drivers/ao_packet.c
index b5a0a4b7..b9331c4d 100644
--- a/src/drivers/ao_packet.c
+++ b/src/drivers/ao_packet.c
@@ -42,7 +42,7 @@ ao_packet_send(void)
 #endif
 	/* If any tx data is pending then copy it into the tx packet */
 	if (ao_packet_tx_used && ao_tx_packet.len == 0) {
-		ao_xmemcpy(&ao_tx_packet.d, tx_data, ao_packet_tx_used);
+		memcpy(&ao_tx_packet.d, tx_data, ao_packet_tx_used);
 		ao_tx_packet.len = ao_packet_tx_used;
 		ao_tx_packet.seq++;
 		ao_packet_tx_used = 0;
@@ -88,10 +88,10 @@ ao_packet_recv(uint16_t timeout)
 	/* Accept packets with matching call signs, or any packet if
 	 * our callsign hasn't been configured
 	 */
-	if (ao_xmemcmp(ao_rx_packet.packet.callsign,
+	if (memcmp(ao_rx_packet.packet.callsign,
 		       ao_config.callsign,
 		       AO_MAX_CALLSIGN) != 0 &&
-	    ao_xmemcmp(ao_config.callsign, "N0CALL", 7) != 0)
+	    memcmp(ao_config.callsign, "N0CALL", 7) != 0)
 		return 0;
 
 	/* SYN packets carry no data */
@@ -111,7 +111,7 @@ ao_packet_recv(uint16_t timeout)
 			/* Copy data to the receive data buffer and set up the
 			 * offsets
 			 */
-			ao_xmemcpy(rx_data, ao_rx_packet.packet.d, ao_rx_packet.packet.len);
+			memcpy(rx_data, ao_rx_packet.packet.d, ao_rx_packet.packet.len);
 			ao_packet_rx_used = 0;
 			ao_packet_rx_len = ao_rx_packet.packet.len;
 
diff --git a/src/drivers/ao_packet_master.c b/src/drivers/ao_packet_master.c
index e67dd27f..a44b34cf 100644
--- a/src/drivers/ao_packet_master.c
+++ b/src/drivers/ao_packet_master.c
@@ -93,7 +93,7 @@ ao_packet_master(void)
 	ao_packet_master_delay = AO_PACKET_MASTER_DELAY_SHORT;
 	while (ao_packet_enable) {
 		uint8_t	r;
-		ao_xmemcpy(ao_tx_packet.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
+		memcpy(ao_tx_packet.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
 		ao_packet_send();
 		if (ao_tx_packet.len)
 			ao_packet_master_busy();
diff --git a/src/drivers/ao_packet_slave.c b/src/drivers/ao_packet_slave.c
index a5834799..314ce14a 100644
--- a/src/drivers/ao_packet_slave.c
+++ b/src/drivers/ao_packet_slave.c
@@ -26,7 +26,7 @@ ao_packet_slave(void)
 	ao_packet_restart = 1;
 	while (ao_packet_enable) {
 		if (ao_packet_recv(0)) {
-			ao_xmemcpy(&ao_tx_packet.callsign, &ao_rx_packet.packet.callsign, AO_MAX_CALLSIGN);
+			memcpy(&ao_tx_packet.callsign, &ao_rx_packet.packet.callsign, AO_MAX_CALLSIGN);
 #if HAS_FLIGHT
 			ao_flight_force_idle = true;
 #endif
diff --git a/src/drivers/ao_radio_master.c b/src/drivers/ao_radio_master.c
index 8b62a4de..b229bd6f 100644
--- a/src/drivers/ao_radio_master.c
+++ b/src/drivers/ao_radio_master.c
@@ -134,7 +134,7 @@ ao_radio_get_data(void *d, uint8_t size)
 		    AO_RADIO_SPI_REPLY_HEADER_LEN + size,
 		    AO_RADIO_SPI_BUS);
 	ao_radio_master_stop();
-	ao_xmemcpy(d, ao_radio_spi_reply.payload, size);
+	memcpy(d, ao_radio_spi_reply.payload, size);
 	PRINTD ("fetched %d\n", size);
 }
 
@@ -150,7 +150,7 @@ void
 ao_radio_send(const void *d, uint8_t size)
 {
 	ao_radio_get(AO_RADIO_SPI_SEND, size);
-	ao_xmemcpy(&ao_radio_spi_request.payload, d, size);
+	memcpy(&ao_radio_spi_request.payload, d, size);
 	ao_radio_master_send();
 	ao_radio_put();
 }
@@ -190,7 +190,7 @@ ao_radio_cmac_set_key(void)
 	 */
 	PRINTD ("set key\n");
 	ao_radio_get(AO_RADIO_SPI_CMAC_KEY, AO_AES_LEN);
-	ao_xmemcpy(&ao_radio_spi_request.payload, &ao_config.aes_key, AO_AES_LEN);
+	memcpy(&ao_radio_spi_request.payload, &ao_config.aes_key, AO_AES_LEN);
 	ao_radio_master_send();
 	ao_radio_put();
 	PRINTD ("key set\n");
@@ -212,7 +212,7 @@ ao_radio_cmac_send(void *packet, uint8_t len)
 	
 	PRINTD ("sending packet\n");
 	ao_radio_get(AO_RADIO_SPI_CMAC_SEND, len);
-	ao_xmemcpy(&ao_radio_spi_request.payload, packet, len);
+	memcpy(&ao_radio_spi_request.payload, packet, len);
 	ao_radio_master_send();
 	ao_radio_put();
 	PRINTD ("packet sent\n");
diff --git a/src/drivers/ao_radio_slave.c b/src/drivers/ao_radio_slave.c
index 7859d6b6..e0470934 100644
--- a/src/drivers/ao_radio_slave.c
+++ b/src/drivers/ao_radio_slave.c
@@ -107,7 +107,7 @@ ao_radio_slave_spi(void)
 			break;
 			
 		case AO_RADIO_SPI_CMAC_KEY:
-			ao_xmemcpy(&ao_config.aes_key, ao_radio_spi_request.payload, AO_AES_LEN);
+			memcpy(&ao_config.aes_key, ao_radio_spi_request.payload, AO_AES_LEN);
 			break;
 
 		case AO_RADIO_SPI_TEST_ON: