From e5594c93b484603005e942ecb4e3647b30c5adb8 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Wed, 9 Nov 2022 09:31:58 +0000 Subject: [PATCH] Fixed regression in SPI settings. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15827 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- .../main.c | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c index 80a6dda3d..684746e32 100755 --- a/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c +++ b/demos/STM32/RT-STM32F103-OLIMEX_STM32_P103-FATFS/main.c @@ -109,12 +109,28 @@ static FATFS SDC_FS; static bool fs_ready = FALSE; /* Maximum speed SPI configuration (18MHz, CPHA=0, CPOL=0, MSb first).*/ -static SPIConfig hs_spicfg = {false, NULL, IOPORT2, GPIOB_SPI2NSS, 0, 0}; +static SPIConfig hs_spicfg = { + .circular = false, + .slave = false, + .data_cb = NULL, + .error_cb = NULL, + .ssport = GPIOB, + .sspad = GPIOB_SPI2NSS, + .cr1 = 0U, + .cr2 = 0U +}; /* Low speed SPI configuration (281.250kHz, CPHA=0, CPOL=0, MSb first).*/ -static SPIConfig ls_spicfg = {false, NULL, IOPORT2, GPIOB_SPI2NSS, - SPI_CR1_BR_2 | SPI_CR1_BR_1, - 0}; +static SPIConfig ls_spicfg = { + .circular = false, + .slave = false, + .data_cb = NULL, + .error_cb = NULL, + .ssport = IOPORT2, + .sspad = GPIOB_SPI2NSS, + .cr1 = SPI_CR1_BR_2 | SPI_CR1_BR_1, + .cr2 = 0U +}; /* MMC/SD over SPI driver configuration.*/ static MMCConfig mmccfg = {&SPID2, &ls_spicfg, &hs_spicfg};