Added CR2 setting to STM32 SPIv1 driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9640 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
67b83e80b6
commit
458e6a84df
|
@ -425,7 +425,8 @@ void spi_lld_start(SPIDriver *spip) {
|
|||
spip->spi->CR1 = 0;
|
||||
spip->spi->CR1 = spip->config->cr1 | SPI_CR1_MSTR | SPI_CR1_SSM |
|
||||
SPI_CR1_SSI;
|
||||
spip->spi->CR2 = SPI_CR2_SSOE | SPI_CR2_RXDMAEN | SPI_CR2_TXDMAEN;
|
||||
spip->spi->CR2 = spip->config->cr2 | SPI_CR2_SSOE | SPI_CR2_RXDMAEN |
|
||||
SPI_CR2_TXDMAEN;
|
||||
spip->spi->CR1 |= SPI_CR1_SPE;
|
||||
}
|
||||
|
||||
|
|
|
@ -431,9 +431,13 @@ typedef struct {
|
|||
*/
|
||||
uint16_t sspad;
|
||||
/**
|
||||
* @brief SPI initialization data.
|
||||
* @brief SPI CR1 register initialization data.
|
||||
*/
|
||||
uint16_t cr1;
|
||||
/**
|
||||
* @brief SPI CR2 register initialization data.
|
||||
*/
|
||||
uint16_t cr2;
|
||||
} SPIConfig;
|
||||
|
||||
/**
|
||||
|
|
|
@ -24,6 +24,7 @@ static const SPIConfig hs_spicfg = {
|
|||
NULL,
|
||||
GPIOA,
|
||||
GPIOA_SPI1NSS,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
|
@ -34,7 +35,8 @@ static const SPIConfig ls_spicfg = {
|
|||
NULL,
|
||||
GPIOA,
|
||||
GPIOA_SPI1NSS,
|
||||
SPI_CR1_BR_2 | SPI_CR1_BR_1
|
||||
SPI_CR1_BR_2 | SPI_CR1_BR_1,
|
||||
0
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -24,6 +24,7 @@ static const SPIConfig hs_spicfg = {
|
|||
NULL,
|
||||
GPIOB,
|
||||
12,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
|
@ -34,7 +35,8 @@ static const SPIConfig ls_spicfg = {
|
|||
NULL,
|
||||
GPIOB,
|
||||
12,
|
||||
SPI_CR1_BR_2 | SPI_CR1_BR_1
|
||||
SPI_CR1_BR_2 | SPI_CR1_BR_1,
|
||||
0
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -24,6 +24,7 @@ static const SPIConfig hs_spicfg = {
|
|||
NULL,
|
||||
GPIOB,
|
||||
12,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
|
@ -34,7 +35,8 @@ static const SPIConfig ls_spicfg = {
|
|||
NULL,
|
||||
GPIOB,
|
||||
12,
|
||||
SPI_CR1_BR_2 | SPI_CR1_BR_1
|
||||
SPI_CR1_BR_2 | SPI_CR1_BR_1,
|
||||
0
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -24,6 +24,7 @@ static const SPIConfig hs_spicfg = {
|
|||
NULL,
|
||||
GPIOB,
|
||||
12,
|
||||
0,
|
||||
0
|
||||
};
|
||||
|
||||
|
@ -34,7 +35,8 @@ static const SPIConfig ls_spicfg = {
|
|||
NULL,
|
||||
GPIOB,
|
||||
12,
|
||||
SPI_CR1_BR_2 | SPI_CR1_BR_1
|
||||
SPI_CR1_BR_2 | SPI_CR1_BR_1,
|
||||
0
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue