From 2fe101a187d595b75d0dbbad8cfcf64bc0bd9c5e Mon Sep 17 00:00:00 2001 From: Michael Dewberry Date: Mon, 7 Oct 2024 00:43:17 -0400 Subject: [PATCH] fix compiler complaints about volatile on macos --- firmware/mock_hardware/common/ftdi.c | 6 +++--- firmware/mock_hardware/include/ftdi.h | 6 +++--- firmware/mock_hardware/mock_serial.c | 2 +- firmware/whitewhale-kria | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/firmware/mock_hardware/common/ftdi.c b/firmware/mock_hardware/common/ftdi.c index 06fb30b..2b97385 100644 --- a/firmware/mock_hardware/common/ftdi.c +++ b/firmware/mock_hardware/common/ftdi.c @@ -17,13 +17,13 @@ u8* ftdi_rx_buf(void) return 0; } -u8 ftdi_rx_bytes(void) +volatile u8 ftdi_rx_bytes(void) { return 0; } -u8 ftdi_rx_busy(void) { return 0; } -u8 ftdi_tx_busy(void) { return 0; } +volatile u8 ftdi_rx_busy(void) { return 0; } +volatile u8 ftdi_tx_busy(void) { return 0; } u8 ftdi_connected(void) { diff --git a/firmware/mock_hardware/include/ftdi.h b/firmware/mock_hardware/include/ftdi.h index 5b5e793..0363dec 100644 --- a/firmware/mock_hardware/include/ftdi.h +++ b/firmware/mock_hardware/include/ftdi.h @@ -13,7 +13,7 @@ void ftdi_change(uhc_device_t* dev, u8 plug); void ftdi_setup(void); u8* ftdi_rx_buf(void); -u8 ftdi_rx_bytes(void); -u8 ftdi_rx_busy(void); -u8 ftdi_tx_busy(void); +volatile u8 ftdi_rx_bytes(void); +volatile u8 ftdi_rx_busy(void); +volatile u8 ftdi_tx_busy(void); u8 ftdi_connected(void); diff --git a/firmware/mock_hardware/mock_serial.c b/firmware/mock_hardware/mock_serial.c index 86e64f0..63d2e3e 100644 --- a/firmware/mock_hardware/mock_serial.c +++ b/firmware/mock_hardware/mock_serial.c @@ -72,7 +72,7 @@ u8* mock_serial_rx_buf(void) return mock_serial_current_message_buffer; } -u8 mock_serial_rx_bytes(void) +volatile u8 mock_serial_rx_bytes(void) { return mock_serial_current_message_length; } diff --git a/firmware/whitewhale-kria b/firmware/whitewhale-kria index 1e0e2fb..35e01bd 160000 --- a/firmware/whitewhale-kria +++ b/firmware/whitewhale-kria @@ -1 +1 @@ -Subproject commit 1e0e2fbb2a81a31ad14ad996c393ed5f6b2c4fbe +Subproject commit 35e01bd5b0627ae63ff3f2611c688435ce9c09e3