From f9f4b4263c3c107cc95fedd8942b24b818e264a8 Mon Sep 17 00:00:00 2001
From: jflyper <shinoda@jaist.ac.jp>
Date: Tue, 11 Jul 2017 15:12:13 +0900
Subject: [PATCH] Make names more clear

---
 src/main/drivers/bus_spi.c     |  8 ++++----
 src/main/drivers/bus_spi.h     |  4 ++--
 src/main/drivers/bus_spi_hal.c | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/drivers/bus_spi.c b/src/main/drivers/bus_spi.c
index f923f86a2..a04108e97 100644
--- a/src/main/drivers/bus_spi.c
+++ b/src/main/drivers/bus_spi.c
@@ -206,14 +206,14 @@ bool spiIsBusBusy(SPI_TypeDef *instance)
 
 }
 
-bool spiTransfer(SPI_TypeDef *instance, uint8_t *in, const uint8_t *out, int len)
+bool spiTransfer(SPI_TypeDef *instance, uint8_t *rxData, const uint8_t *txData, int len)
 {
     uint16_t spiTimeout = 1000;
 
     uint8_t b;
     instance->DR;
     while (len--) {
-        b = out ? *(out++) : 0xFF;
+        b = txData ? *(txData++) : 0xFF;
         while (SPI_I2S_GetFlagStatus(instance, SPI_I2S_FLAG_TXE) == RESET) {
             if ((spiTimeout--) == 0)
                 return spiTimeoutUserCallback(instance);
@@ -233,8 +233,8 @@ bool spiTransfer(SPI_TypeDef *instance, uint8_t *in, const uint8_t *out, int len
 #else
         b = SPI_I2S_ReceiveData(instance);
 #endif
-        if (in)
-            *(in++) = b;
+        if (rxData)
+            *(rxData++) = b;
     }
 
     return true;
diff --git a/src/main/drivers/bus_spi.h b/src/main/drivers/bus_spi.h
index c28694a05..26fa63c1e 100644
--- a/src/main/drivers/bus_spi.h
+++ b/src/main/drivers/bus_spi.h
@@ -85,10 +85,10 @@ typedef enum SPIDevice {
 void spiPreInitCs(ioTag_t iotag);
 bool spiInit(SPIDevice device);
 void spiSetDivisor(SPI_TypeDef *instance, uint16_t divisor);
-uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t in);
+uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t data);
 bool spiIsBusBusy(SPI_TypeDef *instance);
 
-bool spiTransfer(SPI_TypeDef *instance, uint8_t *in, const uint8_t *out, int len);
+bool spiTransfer(SPI_TypeDef *instance, rxData *in, const uint8_t *txData, int len);
 
 uint16_t spiGetErrorCounter(SPI_TypeDef *instance);
 void spiResetErrorCounter(SPI_TypeDef *instance);
diff --git a/src/main/drivers/bus_spi_hal.c b/src/main/drivers/bus_spi_hal.c
index e695a18da..60bf281bf 100644
--- a/src/main/drivers/bus_spi_hal.c
+++ b/src/main/drivers/bus_spi_hal.c
@@ -261,22 +261,22 @@ bool spiIsBusBusy(SPI_TypeDef *instance)
         return false;
 }
 
-bool spiTransfer(SPI_TypeDef *instance, uint8_t *in, const uint8_t *out, int len)
+bool spiTransfer(SPI_TypeDef *instance, uint8_t *rxData, const uint8_t *txData, int len)
 {
     SPIDevice device = spiDeviceByInstance(instance);
     HAL_StatusTypeDef status;
 
     if (!in) // Tx only
     {
-        status = HAL_SPI_Transmit(&spiDevice[device].hspi, (uint8_t *)out, len, SPI_DEFAULT_TIMEOUT);
+        status = HAL_SPI_Transmit(&spiDevice[device].hspi, (uint8_t *)txData, len, SPI_DEFAULT_TIMEOUT);
     }
     else if (!out) // Rx only
     {
-        status = HAL_SPI_Receive(&spiDevice[device].hspi, in, len, SPI_DEFAULT_TIMEOUT);
+        status = HAL_SPI_Receive(&spiDevice[device].hspi, rxData, len, SPI_DEFAULT_TIMEOUT);
     }
     else // Tx and Rx
     {
-        status = HAL_SPI_TransmitReceive(&spiDevice[device].hspi, out, in, len, SPI_DEFAULT_TIMEOUT);
+        status = HAL_SPI_TransmitReceive(&spiDevice[device].hspi, txData, rxData, len, SPI_DEFAULT_TIMEOUT);
     }
 
     if ( status != HAL_OK)
@@ -295,10 +295,10 @@ static bool spiBusReadBuffer(const busDevice_t *bus, uint8_t *out, int len)
 }
 
 // return uint8_t value or -1 when failure
-uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t in)
+uint8_t spiTransferByte(SPI_TypeDef *instance, uint8_t data)
 {
-    spiTransfer(instance, &in, &in, 1);
-    return in;
+    spiTransfer(instance, &data, &data, 1);
+    return data;
 }
 
 // return uint8_t value or -1 when failure