Improve the cpp-check issue with spi_drv_stm32.c spi_write.

Author: dgarske

hal/spi/spi_drv_stm32.c

@@ -376,22 +376,13 @@ int qspi_transfer(uint8_t fmode, const uint8_t cmd,
 uint8_t RAMFUNCTION spi_read(void)
 {
     while (!(SPI1_SR & SPI_SR_RX_NOTEMPTY));
-#ifdef SPI1_RXDR
     return SPI1_RXDR;
-#else
-    return SPI1_DR;
-#endif
 }
 
 void RAMFUNCTION spi_write(const char byte)
 {
     while (!(SPI1_SR & SPI_SR_TX_EMPTY));
-
-#ifdef SPI1_TXDR
     SPI1_TXDR = (uint8_t)byte;
-#else
-    SPI1_DR = (uint8_t)byte;
-#endif
 }
 #endif /* SPI_FLASH || WOLFBOOT_TPM */
 

hal/spi/spi_drv_stm32.h

@@ -434,8 +434,8 @@
 #define SPI1_CFG2     (*(volatile uint32_t *)(SPI1_BASE + 0x0C))
 #define SPI1_SR       (*(volatile uint32_t *)(SPI1_BASE + 0x14))
 #define SPI1_IFCR     (*(volatile uint32_t *)(SPI1_BASE + 0x18))
-#define SPI1_TXDR     (*(volatile uint8_t *)(SPI1_BASE + 0x20))
-#define SPI1_RXDR     (*(volatile uint8_t *)(SPI1_BASE + 0x30))
+#define SPI1_TXDR     (*(volatile uint8_t  *)(SPI1_BASE + 0x20))
+#define SPI1_RXDR     (*(volatile uint8_t  *)(SPI1_BASE + 0x30))
 
 #define SPI_CR1_SPI_EN              (1 << 0)
 #define SPI_CR1_MASRX               (1 << 8)  /* master automatic suspension in Receive mode */
@@ -479,7 +479,8 @@
 #define SPI1_CR1      (*(volatile uint32_t *)(SPI1_BASE))
 #define SPI1_CR2      (*(volatile uint32_t *)(SPI1_BASE + 0x04))
 #define SPI1_SR       (*(volatile uint32_t *)(SPI1_BASE + 0x08))
-#define SPI1_DR       (*(volatile uint8_t *)(SPI1_BASE + 0x0c))
+#define SPI1_TXDR     (*(volatile uint8_t  *)(SPI1_BASE + 0x0c))
+#define SPI1_RXDR     (*(volatile uint8_t  *)(SPI1_BASE + 0x0c))
 
 #define SPI_CR1_CLOCK_PHASE_SHIFT   (0)
 #define SPI_CR1_CLOCK_POL_SHIFT     (1)