From b10e1fc4d35d7595f0720f9d6da80bc649d4a8c3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 29 Oct 2022 20:59:08 -0500
Subject: [PATCH] rename

---
 Marlin/src/HAL/STM32/tft/tft_spi.cpp | 8 ++++----
 Marlin/src/HAL/STM32/tft/tft_spi.h   | 4 ++--
 Marlin/src/HAL/STM32/tft/xpt2046.h   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.cpp b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
index 277909a2873e9..88eb74ffae555 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.cpp
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.cpp
@@ -142,7 +142,7 @@ void TFT_SPI::Init() {
 }
 
 // Call before any HAL initialization (DMA or SPI).
-void TFT_SPI::HALPrepare(eSPIMode spiMode) {
+void TFT_SPI::HAL_SPI_Prepare(eSPIMode spiMode) {
   uint8_t clkdiv = 1;
   #if PIN_EXISTS(TFT_MISO)
     if (spiMode == eSPIMode::READ) clkdiv = clkdiv_read;
@@ -194,7 +194,7 @@ void TFT_SPI::HALPrepare(eSPIMode spiMode) {
   #endif
 }
 
-void TFT_SPI::HALDismantle() {
+void TFT_SPI::HAL_SPI_Dismantle() {
   #ifdef STM32F1xx
     #define _DMATX_DISMANTLE(N1,N4) \
       __HAL_RCC_DMA##N1##_CLK_DISABLE(); \
@@ -227,7 +227,7 @@ void TFT_SPI::HALDismantle() {
 }
 
 void TFT_SPI::DataTransferBegin(uint16_t DataSize, eSPIMode spiMode) {
-  HALPrepare(spiMode);
+  HAL_SPI_Prepare(spiMode);
   SPIx.Init.DataSize = ( DataSize == DATASIZE_8BIT ) ?  SPI_DATASIZE_8BIT : SPI_DATASIZE_16BIT;
   HAL_SPI_Init(&SPIx);
   WRITE(TFT_CS_PIN, LOW);
@@ -237,7 +237,7 @@ void TFT_SPI::DataTransferBegin(uint16_t DataSize, eSPIMode spiMode) {
 void TFT_SPI::DataTransferEnd() {
   // TODO: apply strong integrity to the active_transfer variable!
   HAL_SPI_DeInit(&SPIx);
-  HALDismantle();
+  HAL_SPI_Dismantle();
   WRITE(TFT_CS_PIN, HIGH);
   active_transfer = false;
 }
diff --git a/Marlin/src/HAL/STM32/tft/tft_spi.h b/Marlin/src/HAL/STM32/tft/tft_spi.h
index cf6b1cd46c815..885e1a2b6fee8 100644
--- a/Marlin/src/HAL/STM32/tft/tft_spi.h
+++ b/Marlin/src/HAL/STM32/tft/tft_spi.h
@@ -55,8 +55,8 @@ class TFT_SPI {
     static void TransmitDMA_IT(uint32_t MemoryIncrease, uint16_t *Data, uint16_t Count);
   #endif
 
-  static void HALPrepare(eSPIMode spiMode);
-  static void HALDismantle(void);
+  static void HAL_SPI_Prepare(eSPIMode spiMode);
+  static void HAL_SPI_Dismantle();
 
   static uint8_t _GetClockDivider( uint32_t spibasefreq, uint32_t speed );
 
diff --git a/Marlin/src/HAL/STM32/tft/xpt2046.h b/Marlin/src/HAL/STM32/tft/xpt2046.h
index 87f09063f683c..413e2cc6f63c3 100644
--- a/Marlin/src/HAL/STM32/tft/xpt2046.h
+++ b/Marlin/src/HAL/STM32/tft/xpt2046.h
@@ -77,8 +77,8 @@ class XPT2046 {
   static uint16_t SoftwareIO(uint16_t data);
   static uint16_t IO(uint16_t data = 0) { return SPIx.Instance ? HardwareIO(data) : SoftwareIO(data); }
 
-  static void HALPrepare(void);
-  static void HALDismantle(void);
+  static void HAL_SPI_Prepare();
+  static void HAL_SPI_Dismantle();
 
 public:
   static void Init();