mirror of https://github.com/rusefi/ChibiOS.git
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:
parent
bb00a2b52b
commit
e3f3484ea4
|
@ -91,7 +91,7 @@
|
|||
* @note Disabling this option saves both code and data space.
|
||||
*/
|
||||
#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
|
||||
#define SPI_SELECT_MODE SPI_SELECT_MODE_LINE
|
||||
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
|
||||
#endif
|
||||
/** @} */
|
||||
|
||||
|
|
|
@ -45,6 +45,11 @@
|
|||
/* Driver constants. */
|
||||
/*===========================================================================*/
|
||||
|
||||
/**
|
||||
* @brief Requires use of SPIv2 driver model.
|
||||
*/
|
||||
#define HAL_LLD_SELECT_SPI_V2 TRUE
|
||||
|
||||
/**
|
||||
* @name Platform identification
|
||||
* @{
|
||||
|
|
|
@ -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/RTCv3/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/TIMv1/driver.mk
|
||||
include $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv3/driver.mk
|
||||
|
|
|
@ -606,7 +606,7 @@ msg_t spiExchange(SPIDriver *spip, size_t n,
|
|||
osalSysLock();
|
||||
|
||||
msg = spiStartExchangeI(spip, n, txbuf, rxbuf);
|
||||
if (msg != MSG_OK) {
|
||||
if (msg == MSG_OK) {
|
||||
msg = spiSynchronizeS(spip, TIME_INFINITE);
|
||||
}
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ void spi_circular_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 = {
|
||||
.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 = {
|
||||
.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 = {
|
||||
.circular = true,
|
||||
|
|
Loading…
Reference in New Issue