STM32 Reorg: Remove SPI hardcodes (#716)

* Move import of hardware.h to the end of traget_defs.h
* update flash_spi to new routines
* Remove hardcoded SPI from SPI lcd drivers
* Remove hardcoded SPI from touch and proto
* Fix linting issues
* Remove hardcodes for Devo12

Author: PhracturedBlue

src/target/tx/devo/devo12/lcd.h src/480x272x16_s1d13517f00a1.hsrc/target/tx/devo/devo12/lcd.h renamed to src/480x272x16_s1d13517f00a1.h

@@ -59,7 +59,7 @@ static int size_cb(int absrow, void *data)
         case ITEM_MODE:
 #endif
         case ITEM_BUZZ:
-#ifndef HAS_OLED_DISPLAY
+#if !HAS_OLED_DISPLAY
         case ITEM_BACKLIGHT:
 #else
         case ITEM_CONTRAST:
@@ -142,15 +142,15 @@ static int row_cb(int absrow, int relrow, int y, void *data)
             label = _tr_noop("PwrDn alert");
             value = _music_shutdown_cb; x = MED_SEL_X_OFFSET;
             break;
-#ifndef HAS_OLED_DISPLAY
+#if !HAS_OLED_DISPLAY
         case ITEM_BACKLIGHT:
             title = _tr_noop("LCD settings");
             label = _tr_noop("Backlight");
             value = backlight_select_cb; x = SMALL_SEL_X_OFFSET;
             break;
 #endif
         case ITEM_CONTRAST:
-#ifdef HAS_OLED_DISPLAY
+#if HAS_OLED_DISPLAY
             title = _tr_noop("LCD settings");
 #endif
             label = _tr_noop("Contrast");
@@ -229,7 +229,7 @@ static const char *_contrast_select_cb(guiObject_t *obj, int dir, void *data)
                                   0, 10, dir, 1, 1, &changed);
     if (changed) {
         LCD_Contrast(Transmitter.contrast);
-#ifdef HAS_OLED_DISPLAY
+#if HAS_OLED_DISPLAY
         Transmitter.backlight = Transmitter.contrast;
 #endif
     }

src/pages/128x64x1/tx_configure.c

@@ -31,7 +31,7 @@ enum {
     ITEM_BATT,
     ITEM_ALARM_INTV,
     ITEM_PWRDN_ALARM,
-#ifndef HAS_OLED_DISPLAY
+#if !HAS_OLED_DISPLAY
     ITEM_BACKLIGHT,
 #endif
     ITEM_CONTRAST,
@@ -184,7 +184,7 @@ static const char *modeselect_cb(guiObject_t *obj, int dir, void *data)
     return tempstring;
 }
 
-#ifndef HAS_OLED_DISPLAY
+#if !HAS_OLED_DISPLAY
 static const char *backlight_select_cb(guiObject_t *obj, int dir, void *data)
 {
     (void)data;

src/pages/common/_tx_configure.c

@@ -13,20 +13,20 @@
     along with Deviation.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <libopencm3/stm32/gpio.h>
-#include <libopencm3/stm32/rcc.h>
 #include <libopencm3/stm32/fsmc.h>
 #include <libopencm3/stm32/spi.h>
 #include "common.h"
-#include "lcd.h"
+#include "480x272x16_s1d13517f00a1.h"
+#include "target/drivers/mcu/stm32/rcc.h"
 
 #define LCD_REG_ADDR  ((uint32_t)0x6C000000)    /* Register Address */
 #define LCD_DATA_ADDR  ((uint32_t)(LCD_REG_ADDR + 2)) /* Data Address */
 
 #define LCD_REG  *(volatile uint16_t *)(LCD_REG_ADDR)
 #define LCD_DATA *(volatile uint16_t *)(LCD_DATA_ADDR)
 
-#define CS_HI() gpio_set(GPIOB, GPIO1)
-#define CS_LO() gpio_clear(GPIOB, GPIO1)
+#define CS_HI() GPIO_pin_set(LCD_SPI.csn)
+#define CS_LO() GPIO_pin_clear(LCD_SPI.csn)
 
 //See this thread: http://www.deviationtx.com/forum/6-general-discussions/4278-please-help-devo-12s-fonts-is-out-of-wack
 //The new Devo12 uses a different rev of the Epson chip, which doesn't like our transparency value
@@ -147,40 +147,39 @@ void lcd_clear(unsigned int color)
 void SPILCD_SetRegister(u8 address, u16 data)
 {
     CS_LO();
-    spi_xfer(SPI1, 0x70); //Address
-    spi_xfer(SPI1, 0x00);
-    spi_xfer(SPI1, address);
+    spi_xfer(LCD_SPI.spi, 0x70);  // Address
+    spi_xfer(LCD_SPI.spi, 0x00);
+    spi_xfer(LCD_SPI.spi, address);
     CS_HI();
     usleep(1);
     CS_LO();
-    spi_xfer(SPI1, 0x72); //Write Data
-    spi_xfer(SPI1, data >> 8);
-    spi_xfer(SPI1, data & 0xFF);
+    spi_xfer(LCD_SPI.spi, 0x72);  // Write Data
+    spi_xfer(LCD_SPI.spi, data >> 8);
+    spi_xfer(LCD_SPI.spi, data & 0xFF);
     CS_HI();
 }
 
 u16 SPILCD_ReadRegister(u8 address)
 {
     CS_LO();
-    spi_xfer(SPI1, 0x70); //Address
-    spi_xfer(SPI1, 0x00);
-    spi_xfer(SPI1, address);
+    spi_xfer(LCD_SPI.spi, 0x70);  // Address
+    spi_xfer(LCD_SPI.spi, 0x00);
+    spi_xfer(LCD_SPI.spi, address);
     CS_HI();
     usleep(1);
     CS_LO();
-    spi_xfer(SPI1, 0x73); //Write Data
-    u16 out = spi_xfer(SPI1, 0);
+    spi_xfer(LCD_SPI.spi, 0x73);  // Write Data
+    u16 out = spi_xfer(LCD_SPI.spi, 0);
     out <<= 8;
-    out |= spi_xfer(SPI1, 0);
+    out |= spi_xfer(LCD_SPI.spi, 0);
     CS_HI();
     return out;
 }
 
 void SPILCD_Init()
 {
-    rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-    gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ,
-                  GPIO_CNF_OUTPUT_PUSHPULL, GPIO1);
+    rcc_periph_clock_enable(get_rcc_from_pin(LCD_SPI.csn));
+    GPIO_setup_output(LCD_SPI.csn, OTYPE_PUSHPULL);
     CS_HI();
     SPILCD_SetRegister(0x01, 0x7946);
     SPILCD_SetRegister(0x02, 0x2037);

src/target/drivers/display/8080/480x272x16_s1d13517f00a1_hx8257.c

@@ -17,11 +17,12 @@
 #include <libopencm3/stm32/spi.h>
 #include "common.h"
 #include "gui/gui.h"
+#include "target/drivers/mcu/stm32/rcc.h"
 
-#define CS_HI() gpio_set(GPIOB, GPIO0)
-#define CS_LO() gpio_clear(GPIOB, GPIO0)
-#define CMD_MODE() gpio_clear(GPIOC,GPIO5)
-#define DATA_MODE() gpio_set(GPIOC,GPIO5)
+#define CS_HI() GPIO_pin_set(LCD_SPI.csn)
+#define CS_LO() GPIO_pin_clear(LCD_SPI.csn)
+#define CMD_MODE() GPIO_pin_clear(LCD_SPI_MODE)
+#define DATA_MODE() GPIO_pin_set(LCD_SPI_MODE)
 
 #ifndef HAS_LCD_FLIPPED
     #define HAS_LCD_FLIPPED 0
@@ -42,14 +43,14 @@ static s8 dir;
 void LCD_Cmd(unsigned cmd) {
     CMD_MODE();
     CS_LO();
-    spi_xfer(SPI1, cmd);
+    spi_xfer(LCD_SPI.spi, cmd);
     CS_HI();
 }
 
 void LCD_Data(unsigned cmd) {
     DATA_MODE();
     CS_LO();
-    spi_xfer(SPI1, cmd);
+    spi_xfer(LCD_SPI.spi, cmd);
     CS_HI();
 }
 
@@ -86,12 +87,10 @@ void LCD_Init()
 {
     //Initialization is mostly done in SPI Flash
     //Setup CS as B.0 Data/Control = C.5
-    rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-    rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-    gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ,
-                  GPIO_CNF_OUTPUT_PUSHPULL, GPIO0);
-    gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
-                  GPIO_CNF_OUTPUT_PUSHPULL, GPIO5);
+    rcc_periph_clock_enable(get_rcc_from_pin(LCD_SPI.csn));
+    rcc_periph_clock_enable(get_rcc_from_pin(LCD_SPI_MODE));
+    GPIO_setup_output(LCD_SPI.csn, OTYPE_PUSHPULL);
+    GPIO_setup_output(LCD_SPI_MODE, OTYPE_PUSHPULL);
     LCD_Cmd(0xE2);  //Reset
     volatile int i = 0x8000;
     while(i) i--;

src/target/drivers/display/spi/128x64x1_nt7538.c

@@ -17,11 +17,12 @@
 #include <libopencm3/stm32/spi.h>
 #include "common.h"
 #include "gui/gui.h"
+#include "target/drivers/mcu/stm32/rcc.h"
 
-#define CS_HI() gpio_set(GPIOB, GPIO0)
-#define CS_LO() gpio_clear(GPIOB, GPIO0)
-#define CMD_MODE() gpio_clear(GPIOC,GPIO5)
-#define DATA_MODE() gpio_set(GPIOC,GPIO5)
+#define CS_HI() GPIO_pin_set(LCD_SPI.csn)
+#define CS_LO() GPIO_pin_clear(LCD_SPI.csn)
+#define CMD_MODE() GPIO_pin_clear(LCD_SPI_MODE)
+#define DATA_MODE() GPIO_pin_set(LCD_SPI_MODE)
 
 #define PHY_LCD_WIDTH 128
 #define LCD_PAGES 8
@@ -34,14 +35,14 @@ static s8 dir;
 void LCD_Cmd(unsigned cmd) {
     CMD_MODE();
     CS_LO();
-    spi_xfer(SPI1, cmd);
+    spi_xfer(LCD_SPI.spi, cmd);
     CS_HI();
 }
 
 void LCD_Data(unsigned cmd) {
     DATA_MODE();
     CS_LO();
-    spi_xfer(SPI1, cmd);
+    spi_xfer(LCD_SPI.spi, cmd);
     CS_HI();
 }
 
@@ -77,12 +78,10 @@ void LCD_Init()
 {
     //Initialization is mostly done in SPI Flash
     //Setup CS as B.0 Data/Control = C.5
-    rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-    rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-    gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ,
-                  GPIO_CNF_OUTPUT_PUSHPULL, GPIO0);
-    gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
-                  GPIO_CNF_OUTPUT_PUSHPULL, GPIO5);
+    rcc_periph_clock_enable(get_rcc_from_pin(LCD_SPI.csn));
+    rcc_periph_clock_enable(get_rcc_from_pin(LCD_SPI_MODE));
+    GPIO_setup_output(LCD_SPI.csn, OTYPE_PUSHPULL);
+    GPIO_setup_output(LCD_SPI_MODE, OTYPE_PUSHPULL);
     _msleep(100);
     lcd_display(0); //Display Off
     LCD_Cmd(0xD5);  //Set Display Clock Divide Ratio / OSC Frequency

src/target/drivers/display/spi/128x64x1_oled_ssd1306.c

@@ -20,6 +20,8 @@
 #include "lcd.h"
 #include "ia9211_map.h"
 
+#include "target/drivers/mcu/stm32/spi.h"
+
 u32 IA9211_map_char(u32 c);
 
 static const struct font_def default_font = {1, 1};
@@ -29,8 +31,8 @@ static u16 is_double_row = 0x00;
 
 #define CUR_CHAR_SIZE  (cur_str.font.zoom)
 
-#define CS_HI() gpio_set(GPIOB, GPIO0)
-#define CS_LO() gpio_clear(GPIOB, GPIO0)
+#define CS_HI() GPIO_pin_set(LCD_SPI.csn)
+#define CS_LO() GPIO_pin_clear(LCD_SPI.csn)
 
 // The IA911 chip defines
 #define LCD_IA911_CLEAR_VRAM        0x00
@@ -97,7 +99,7 @@ void LCD_CMDLength(const u8 cmd[], u8 length) {
     while(i) i--;
 
     for(i = 0; i < length; i++) {
-        spi_xfer(SPI1, cmd[i]);
+        spi_xfer(LCD_SPI.spi, cmd[i]);
 
         // Wait a couple of clock ticks
         j = 100;
@@ -242,54 +244,35 @@ void LCD_Init()
 {
     LCD_SetFont(1);
     /* Enable GPIOA and GPIOB clock. */
-    rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
-    rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN);
-
-    /* Set GPIO0, GPIO8, GPIO15, GPIO4 (in GPIO port A) to 'output push-pull'. */
-    gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
-		  GPIO_CNF_OUTPUT_PUSHPULL, GPIO0);  //CS0
-    gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
-		  GPIO_CNF_OUTPUT_PUSHPULL, GPIO8);  //CS1
-    gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
-		  GPIO_CNF_OUTPUT_PUSHPULL, GPIO15); //CS2
-    gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ,
-		  GPIO_CNF_OUTPUT_PUSHPULL, GPIO9);  //ON, OFF?
+    rcc_periph_clock_enable(get_rcc_from_pin(LCD_SPI.csn));
+    rcc_periph_clock_enable(get_rcc_from_pin(LCD_VIDEO_CS0));
+    rcc_periph_clock_enable(get_rcc_from_pin(LCD_VIDEO_CS1));
+    rcc_periph_clock_enable(get_rcc_from_pin(LCD_VIDEO_CS2));
+    rcc_periph_clock_enable(get_rcc_from_pin(LCD_VIDEO_PWR));
+    GPIO_setup_output(LCD_SPI.csn, OTYPE_PUSHPULL);
+    GPIO_setup_output(LCD_VIDEO_CS0, OTYPE_PUSHPULL);
+    GPIO_setup_output(LCD_VIDEO_CS1, OTYPE_PUSHPULL);
+    GPIO_setup_output(LCD_VIDEO_CS2, OTYPE_PUSHPULL);
+    GPIO_setup_output(LCD_VIDEO_PWR, OTYPE_PUSHPULL);
 
     // Set the 5.8GHz receiver off (default)
-    gpio_clear(GPIOB, GPIO9);
+    GPIO_pin_clear(LCD_VIDEO_PWR);
 
     // Set the 5.8GHz channel
-    gpio_clear(GPIOA, GPIO0);
-    gpio_clear(GPIOA, GPIO8);
-    gpio_clear(GPIOA, GPIO15);
+    GPIO_pin_clear(LCD_VIDEO_CS0);
+    GPIO_pin_clear(LCD_VIDEO_CS1);
+    GPIO_pin_clear(LCD_VIDEO_CS2);
 
     // Initialization is mostly done in SPI Flash
     // UNLESS we use SPI2 for 4-in-1 module
-    if (_SPI_FLASH_PORT != 1) {
+    if (FLASH_SPI.spi != LCD_SPI.spi) {
         /* Enable SPI1 */
-        rcc_peripheral_enable_clock(&RCC_APB2ENR,  RCC_APB2ENR_SPI1EN);
-        gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
-                      GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO5);
-        gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ,
-                      GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO7);
-        gpio_set_mode(GPIOA, GPIO_MODE_INPUT,
-                      GPIO_CNF_INPUT_FLOAT, GPIO6);
-
-        spi_init_master(SPI1, 
-                        SPI_CR1_BAUDRATE_FPCLK_DIV_4,
-                        SPI_CR1_CPOL_CLK_TO_0_WHEN_IDLE,
-                        SPI_CR1_CPHA_CLK_TRANSITION_1, 
-                        SPI_CR1_DFF_8BIT,
-                        SPI_CR1_MSBFIRST);
-        spi_enable_software_slave_management(SPI1);
-        spi_set_nss_high(SPI1);
-
-        spi_enable(SPI1);
+        _spi_init(LCD_SPI_CFG);
     }
     // Setup CS as B.0 Data/Control = C.5
     gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ,
                   GPIO_CNF_OUTPUT_PUSHPULL, GPIO0);
-    gpio_set(GPIOB, GPIO0); // CS_HI();
+    GPIO_pin_set(LCD_SPI.csn);  // CS_HI();
 
     LCD_Cmd(LCD_IA911_CLEAR_VRAM); //Clear the VRAM
     // Wait for a couple of clock ticks
@@ -343,11 +326,11 @@ void LCD_ShowVideo(u8 enable)
         return;
 
     if(enable) {
-        gpio_set(GPIOB, GPIO9);
+        GPIO_pin_set(LCD_VIDEO_PWR);
         LCD_Cmd(LCD_IA911_CLOCK | LCD_IA911_XOSC); // Set to external mode en enable ossilator
     }
     else {
-        gpio_clear(GPIOB, GPIO9);
+        GPIO_pin_clear(LCD_VIDEO_PWR);
         LCD_Cmd(LCD_IA911_CLOCK | LCD_IA911_I_MODE | LCD_IA911_XOSC); // Set to external mode en enable ossilator
     }
 
@@ -366,19 +349,19 @@ void VIDEO_Enable(int on)
 void VIDEO_SetChannel(int ch) 
 {
     if(ch & 0x01)
-        gpio_clear(GPIOA, GPIO0);
+        GPIO_pin_clear(LCD_VIDEO_CS0);
     else
-        gpio_set(GPIOA, GPIO0);
+        GPIO_pin_set(LCD_VIDEO_CS0);
 
     if(ch & 0x02)
-        gpio_clear(GPIOA, GPIO8);
+        GPIO_pin_clear(LCD_VIDEO_CS1);
     else
-        gpio_set(GPIOA, GPIO8);
+        GPIO_pin_set(LCD_VIDEO_CS1);
 
     if(ch & 0x04)
-        gpio_clear(GPIOA, GPIO15);
+        GPIO_pin_clear(LCD_VIDEO_CS2);
     else
-        gpio_set(GPIOA, GPIO15);
+        GPIO_pin_set(LCD_VIDEO_CS2);
 }
 
 

src/target/drivers/display/spi/video_ia9211.c

@@ -61,4 +61,5 @@ static inline uint16_t GPIO_pin_get(struct mcu_pin pin)
 {
     return gpio_get(pin.port, pin.pin);
 }
+
 #endif  // _DTX_STM32F1_GPIO_H_