mirror of https://github.com/rusefi/ChibiOS.git
Fixed bug #781.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10228 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
1ab61e8d8f
commit
ceb326112d
|
@ -537,18 +537,18 @@ void i2c_lld_init(void) {
|
||||||
void i2c_lld_start(I2CDriver *i2cp) {
|
void i2c_lld_start(I2CDriver *i2cp) {
|
||||||
I2C_TypeDef *dp = i2cp->i2c;
|
I2C_TypeDef *dp = i2cp->i2c;
|
||||||
|
|
||||||
i2cp->txdmamode = STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE |
|
|
||||||
STM32_DMA_CR_MINC | STM32_DMA_CR_DMEIE |
|
|
||||||
STM32_DMA_CR_TEIE | STM32_DMA_CR_TCIE |
|
|
||||||
STM32_DMA_CR_DIR_M2P;
|
|
||||||
i2cp->rxdmamode = STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE |
|
|
||||||
STM32_DMA_CR_MINC | STM32_DMA_CR_DMEIE |
|
|
||||||
STM32_DMA_CR_TEIE | STM32_DMA_CR_TCIE |
|
|
||||||
STM32_DMA_CR_DIR_P2M;
|
|
||||||
|
|
||||||
/* If in stopped state then enables the I2C and DMA clocks.*/
|
/* If in stopped state then enables the I2C and DMA clocks.*/
|
||||||
if (i2cp->state == I2C_STOP) {
|
if (i2cp->state == I2C_STOP) {
|
||||||
|
|
||||||
|
i2cp->txdmamode = STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE |
|
||||||
|
STM32_DMA_CR_MINC | STM32_DMA_CR_DMEIE |
|
||||||
|
STM32_DMA_CR_TEIE | STM32_DMA_CR_TCIE |
|
||||||
|
STM32_DMA_CR_DIR_M2P;
|
||||||
|
i2cp->rxdmamode = STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE |
|
||||||
|
STM32_DMA_CR_MINC | STM32_DMA_CR_DMEIE |
|
||||||
|
STM32_DMA_CR_TEIE | STM32_DMA_CR_TCIE |
|
||||||
|
STM32_DMA_CR_DIR_P2M;
|
||||||
|
|
||||||
#if STM32_I2C_USE_I2C1
|
#if STM32_I2C_USE_I2C1
|
||||||
if (&I2CD1 == i2cp) {
|
if (&I2CD1 == i2cp) {
|
||||||
bool b;
|
bool b;
|
||||||
|
|
|
@ -672,18 +672,18 @@ void i2c_lld_init(void) {
|
||||||
void i2c_lld_start(I2CDriver *i2cp) {
|
void i2c_lld_start(I2CDriver *i2cp) {
|
||||||
I2C_TypeDef *dp = i2cp->i2c;
|
I2C_TypeDef *dp = i2cp->i2c;
|
||||||
|
|
||||||
#if STM32_I2C_USE_DMA == TRUE
|
|
||||||
/* Common DMA modes.*/
|
|
||||||
i2cp->txdmamode = DMAMODE_COMMON | STM32_DMA_CR_DIR_M2P;
|
|
||||||
i2cp->rxdmamode = DMAMODE_COMMON | STM32_DMA_CR_DIR_P2M;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Make sure I2C peripheral is disabled */
|
/* Make sure I2C peripheral is disabled */
|
||||||
dp->CR1 &= ~I2C_CR1_PE;
|
dp->CR1 &= ~I2C_CR1_PE;
|
||||||
|
|
||||||
/* If in stopped state then enables the I2C and DMA clocks.*/
|
/* If in stopped state then enables the I2C and DMA clocks.*/
|
||||||
if (i2cp->state == I2C_STOP) {
|
if (i2cp->state == I2C_STOP) {
|
||||||
|
|
||||||
|
#if STM32_I2C_USE_DMA == TRUE
|
||||||
|
/* Common DMA modes.*/
|
||||||
|
i2cp->txdmamode = DMAMODE_COMMON | STM32_DMA_CR_DIR_M2P;
|
||||||
|
i2cp->rxdmamode = DMAMODE_COMMON | STM32_DMA_CR_DIR_P2M;
|
||||||
|
#endif
|
||||||
|
|
||||||
#if STM32_I2C_USE_I2C1
|
#if STM32_I2C_USE_I2C1
|
||||||
if (&I2CD1 == i2cp) {
|
if (&I2CD1 == i2cp) {
|
||||||
|
|
||||||
|
|
|
@ -261,6 +261,7 @@
|
||||||
(backported to 16.1.6).
|
(backported to 16.1.6).
|
||||||
- HAL: Fixed STM32F105 port not compiling (bug #782)
|
- HAL: Fixed STM32F105 port not compiling (bug #782)
|
||||||
(backported to 16.1.6, 3.0.6, 2.6.10).
|
(backported to 16.1.6, 3.0.6, 2.6.10).
|
||||||
|
- HAL: Fixed I2Cv1 Freeze when started twice (bug #781)(backported to 16.1.9).
|
||||||
- HAL: Fixed wrong registry for STM32F205xx and STM32F215xx port
|
- HAL: Fixed wrong registry for STM32F205xx and STM32F215xx port
|
||||||
(bug #780)(backported to 16.1.6, 3.0.6).
|
(bug #780)(backported to 16.1.6, 3.0.6).
|
||||||
- HAL: Fixed wrong HSE checks and PLL2 enable switch in STM32F105 and
|
- HAL: Fixed wrong HSE checks and PLL2 enable switch in STM32F105 and
|
||||||
|
|
Loading…
Reference in New Issue