From f9821f68214dfc9834ab6e08a9d95b05334217ac Mon Sep 17 00:00:00 2001 From: caternuson Date: Tue, 10 Oct 2023 12:19:26 -0700 Subject: [PATCH 1/3] remove volatile --- Adafruit_SPITFT.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Adafruit_SPITFT.cpp b/Adafruit_SPITFT.cpp index c5ec86c2..fdec817d 100644 --- a/Adafruit_SPITFT.cpp +++ b/Adafruit_SPITFT.cpp @@ -2306,7 +2306,7 @@ inline void Adafruit_SPITFT::SPI_MOSI_HIGH(void) { #else // !USE_FAST_PINIO digitalWrite(swspi._mosi, HIGH); #if defined(ESP32) - for (volatile uint8_t i = 0; i < 1; i++) + for (uint8_t i = 0; i < 1; i++) ; #endif // end ESP32 #endif // end !USE_FAST_PINIO @@ -2329,7 +2329,7 @@ inline void Adafruit_SPITFT::SPI_MOSI_LOW(void) { #else // !USE_FAST_PINIO digitalWrite(swspi._mosi, LOW); #if defined(ESP32) - for (volatile uint8_t i = 0; i < 1; i++) + for (uint8_t i = 0; i < 1; i++) ; #endif // end ESP32 #endif // end !USE_FAST_PINIO @@ -2346,7 +2346,7 @@ inline void Adafruit_SPITFT::SPI_SCK_HIGH(void) { #else // !KINETISK *swspi.sckPortSet = swspi.sckPinMask; #if defined(__IMXRT1052__) || defined(__IMXRT1062__) // Teensy 4.x - for (volatile uint8_t i = 0; i < 1; i++) + for (uint8_t i = 0; i < 1; i++) ; #endif #endif @@ -2356,7 +2356,7 @@ inline void Adafruit_SPITFT::SPI_SCK_HIGH(void) { #else // !USE_FAST_PINIO digitalWrite(swspi._sck, HIGH); #if defined(ESP32) - for (volatile uint8_t i = 0; i < 1; i++) + for (uint8_t i = 0; i < 1; i++) ; #endif // end ESP32 #endif // end !USE_FAST_PINIO @@ -2373,7 +2373,7 @@ inline void Adafruit_SPITFT::SPI_SCK_LOW(void) { #else // !KINETISK *swspi.sckPortClr = swspi.sckPinMask; #if defined(__IMXRT1052__) || defined(__IMXRT1062__) // Teensy 4.x - for (volatile uint8_t i = 0; i < 1; i++) + for (uint8_t i = 0; i < 1; i++) ; #endif #endif @@ -2383,7 +2383,7 @@ inline void Adafruit_SPITFT::SPI_SCK_LOW(void) { #else // !USE_FAST_PINIO digitalWrite(swspi._sck, LOW); #if defined(ESP32) - for (volatile uint8_t i = 0; i < 1; i++) + for (uint8_t i = 0; i < 1; i++) ; #endif // end ESP32 #endif // end !USE_FAST_PINIO From 8eca715530f8af0d62faed2a01e83eedcd4f9f5d Mon Sep 17 00:00:00 2001 From: caternuson Date: Tue, 10 Oct 2023 14:13:04 -0700 Subject: [PATCH 2/3] remove loops --- Adafruit_SPITFT.cpp | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/Adafruit_SPITFT.cpp b/Adafruit_SPITFT.cpp index fdec817d..6a0fc58d 100644 --- a/Adafruit_SPITFT.cpp +++ b/Adafruit_SPITFT.cpp @@ -2305,10 +2305,6 @@ inline void Adafruit_SPITFT::SPI_MOSI_HIGH(void) { #endif // end !HAS_PORT_SET_CLR #else // !USE_FAST_PINIO digitalWrite(swspi._mosi, HIGH); -#if defined(ESP32) - for (uint8_t i = 0; i < 1; i++) - ; -#endif // end ESP32 #endif // end !USE_FAST_PINIO } @@ -2328,10 +2324,6 @@ inline void Adafruit_SPITFT::SPI_MOSI_LOW(void) { #endif // end !HAS_PORT_SET_CLR #else // !USE_FAST_PINIO digitalWrite(swspi._mosi, LOW); -#if defined(ESP32) - for (uint8_t i = 0; i < 1; i++) - ; -#endif // end ESP32 #endif // end !USE_FAST_PINIO } @@ -2345,20 +2337,12 @@ inline void Adafruit_SPITFT::SPI_SCK_HIGH(void) { *swspi.sckPortSet = 1; #else // !KINETISK *swspi.sckPortSet = swspi.sckPinMask; -#if defined(__IMXRT1052__) || defined(__IMXRT1062__) // Teensy 4.x - for (uint8_t i = 0; i < 1; i++) - ; -#endif #endif #else // !HAS_PORT_SET_CLR *swspi.sckPort |= swspi.sckPinMaskSet; #endif // end !HAS_PORT_SET_CLR #else // !USE_FAST_PINIO digitalWrite(swspi._sck, HIGH); -#if defined(ESP32) - for (uint8_t i = 0; i < 1; i++) - ; -#endif // end ESP32 #endif // end !USE_FAST_PINIO } @@ -2372,20 +2356,12 @@ inline void Adafruit_SPITFT::SPI_SCK_LOW(void) { *swspi.sckPortClr = 1; #else // !KINETISK *swspi.sckPortClr = swspi.sckPinMask; -#if defined(__IMXRT1052__) || defined(__IMXRT1062__) // Teensy 4.x - for (uint8_t i = 0; i < 1; i++) - ; -#endif #endif #else // !HAS_PORT_SET_CLR *swspi.sckPort &= swspi.sckPinMaskClr; #endif // end !HAS_PORT_SET_CLR #else // !USE_FAST_PINIO digitalWrite(swspi._sck, LOW); -#if defined(ESP32) - for (uint8_t i = 0; i < 1; i++) - ; -#endif // end ESP32 #endif // end !USE_FAST_PINIO } From 3c0c85ba5d739bb052f9687fe485d7eb4a953e51 Mon Sep 17 00:00:00 2001 From: caternuson Date: Tue, 10 Oct 2023 14:34:28 -0700 Subject: [PATCH 3/3] clang --- Adafruit_SPITFT.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Adafruit_SPITFT.cpp b/Adafruit_SPITFT.cpp index 6a0fc58d..eeffce78 100644 --- a/Adafruit_SPITFT.cpp +++ b/Adafruit_SPITFT.cpp @@ -2335,7 +2335,7 @@ inline void Adafruit_SPITFT::SPI_SCK_HIGH(void) { #if defined(HAS_PORT_SET_CLR) #if defined(KINETISK) *swspi.sckPortSet = 1; -#else // !KINETISK +#else // !KINETISK *swspi.sckPortSet = swspi.sckPinMask; #endif #else // !HAS_PORT_SET_CLR @@ -2354,7 +2354,7 @@ inline void Adafruit_SPITFT::SPI_SCK_LOW(void) { #if defined(HAS_PORT_SET_CLR) #if defined(KINETISK) *swspi.sckPortClr = 1; -#else // !KINETISK +#else // !KINETISK *swspi.sckPortClr = swspi.sckPinMask; #endif #else // !HAS_PORT_SET_CLR