andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Few fixes, SPI v2 enabled on STM32G4xx experimentally. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14937 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2021-10-22 09:51:41 +00:00
parent bb00a2b52b
commit e3f3484ea4
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/include/hal_spi_v2.h
View File

@ -91,7 +91,7 @@
* @note Disabling this option saves both code and data space. * @note Disabling this option saves both code and data space.
*/ */
#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__) #if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
#define SPI_SELECT_MODE SPI_SELECT_MODE_LINE #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#endif #endif
/** @} */ /** @} */

5
os/hal/ports/STM32/STM32G4xx/hal_lld.h
View File

@ -45,6 +45,11 @@
/* Driver constants. */ /* Driver constants. */
/*===========================================================================*/ /*===========================================================================*/
/**
* @brief Requires use of SPIv2 driver model.
*/
#define HAL_LLD_SELECT_SPI_V2 TRUE
/** /**
* @name Platform identification * @name Platform identification
* @{ * @{

2
os/hal/ports/STM32/STM32G4xx/platform.mk
View File

@ -36,7 +36,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/RCCv1/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/RCCv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv3/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv3/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/RNGv1/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/RNGv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2/driver_v2.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/SYSTICKv1/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/SYSTICKv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv3/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv3/driver.mk

2
os/hal/src/hal_spi_v2.inc
View File

@ -606,7 +606,7 @@ msg_t spiExchange(SPIDriver *spip, size_t n,
osalSysLock(); osalSysLock();
msg = spiStartExchangeI(spip, n, txbuf, rxbuf); msg = spiStartExchangeI(spip, n, txbuf, rxbuf);
if (msg != MSG_OK) { if (msg == MSG_OK) {
msg = spiSynchronizeS(spip, TIME_INFINITE); msg = spiSynchronizeS(spip, TIME_INFINITE);
} }

6
testhal/STM32/multi/SPI/cfg/stm32g474re_nucleo64/portab.c
View File

@ -38,7 +38,7 @@ void spi_circular_cb(SPIDriver *spip);
void spi_error_cb(SPIDriver *spip); void spi_error_cb(SPIDriver *spip);
/* /*
* Circular SPI configuration (21MHz, CPHA=0, CPOL=0, MSb first). * Circular SPI configuration (42.5MHz, CPHA=0, CPOL=0, MSb first).
*/ */
const SPIConfig c_spicfg = { const SPIConfig c_spicfg = {
.circular = true, .circular = true,
@ -54,7 +54,7 @@ const SPIConfig c_spicfg = {
}; };
/* /*
* Maximum speed SPI configuration (21MHz, CPHA=0, CPOL=0, MSb first). * Maximum speed SPI configuration (42.5MHz, CPHA=0, CPOL=0, MSb first).
*/ */
const SPIConfig hs_spicfg = { const SPIConfig hs_spicfg = {
.circular = true, .circular = true,
@ -70,7 +70,7 @@ const SPIConfig hs_spicfg = {
}; };
/* /*
* Low speed SPI configuration (328.125kHz, CPHA=0, CPOL=0, MSb first). * Low speed SPI configuration (664,062kHz, CPHA=0, CPOL=0, MSb first).
*/ */
const SPIConfig ls_spicfg = { const SPIConfig ls_spicfg = {
.circular = true, .circular = true,