Skip to content

Commit 7647b39

Browse files
committed
TARGET_STM: I2C sequential communication revert PR ARMmbed#3324 to original cube HAL
1 parent edcde1c commit 7647b39

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

targets/TARGET_STM/TARGET_STM32F0/device/stm32f0xx_hal_i2c.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2592,7 +2592,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Transmit_IT(I2C_HandleTypeDef *hi2c,
25922592
/* Prepare transfer parameters */
25932593
hi2c->pBuffPtr = pData;
25942594
hi2c->XferCount = Size;
2595-
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE));
2595+
hi2c->XferOptions = XferOptions;
25962596
hi2c->XferISR = I2C_Master_ISR_IT;
25972597

25982598
/* If size > MAX_NBYTE_SIZE, use reload mode */
@@ -2658,7 +2658,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c,
26582658
/* Prepare transfer parameters */
26592659
hi2c->pBuffPtr = pData;
26602660
hi2c->XferCount = Size;
2661-
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE));
2661+
hi2c->XferOptions = XferOptions;
26622662
hi2c->XferISR = I2C_Master_ISR_IT;
26632663

26642664
/* If hi2c->XferCount > MAX_NBYTE_SIZE, use reload mode */

targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_i2c.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2592,7 +2592,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Transmit_IT(I2C_HandleTypeDef *hi2c,
25922592
/* Prepare transfer parameters */
25932593
hi2c->pBuffPtr = pData;
25942594
hi2c->XferCount = Size;
2595-
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE)); // MBED patch
2595+
hi2c->XferOptions = XferOptions;
25962596
hi2c->XferISR = I2C_Master_ISR_IT;
25972597

25982598
/* If size > MAX_NBYTE_SIZE, use reload mode */
@@ -2666,7 +2666,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c,
26662666
/* Prepare transfer parameters */
26672667
hi2c->pBuffPtr = pData;
26682668
hi2c->XferCount = Size;
2669-
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE)); // MBED patch
2669+
hi2c->XferOptions = XferOptions;
26702670
hi2c->XferISR = I2C_Master_ISR_IT;
26712671

26722672
/* If hi2c->XferCount > MAX_NBYTE_SIZE, use reload mode */

targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_i2c.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2598,7 +2598,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Transmit_IT(I2C_HandleTypeDef *hi2c,
25982598
/* Prepare transfer parameters */
25992599
hi2c->pBuffPtr = pData;
26002600
hi2c->XferCount = Size;
2601-
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE)); // MBED: changed
2601+
hi2c->XferOptions = XferOptions;
26022602
hi2c->XferISR = I2C_Master_ISR_IT;
26032603

26042604
/* If size > MAX_NBYTE_SIZE, use reload mode */
@@ -2672,7 +2672,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c,
26722672
/* Prepare transfer parameters */
26732673
hi2c->pBuffPtr = pData;
26742674
hi2c->XferCount = Size;
2675-
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE)); // MBED: changed
2675+
hi2c->XferOptions = XferOptions;
26762676
hi2c->XferISR = I2C_Master_ISR_IT;
26772677

26782678
/* If hi2c->XferCount > MAX_NBYTE_SIZE, use reload mode */

targets/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_i2c.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2592,7 +2592,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Transmit_IT(I2C_HandleTypeDef *hi2c,
25922592
/* Prepare transfer parameters */
25932593
hi2c->pBuffPtr = pData;
25942594
hi2c->XferCount = Size;
2595-
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE)); // MBED commit 23926a2418
2595+
hi2c->XferOptions = XferOptions;
25962596
hi2c->XferISR = I2C_Master_ISR_IT;
25972597

25982598
/* If size > MAX_NBYTE_SIZE, use reload mode */
@@ -2666,7 +2666,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c,
26662666
/* Prepare transfer parameters */
26672667
hi2c->pBuffPtr = pData;
26682668
hi2c->XferCount = Size;
2669-
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE)); // MBED commit 23926a2418
2669+
hi2c->XferOptions = XferOptions;
26702670
hi2c->XferISR = I2C_Master_ISR_IT;
26712671

26722672
/* If hi2c->XferCount > MAX_NBYTE_SIZE, use reload mode */

targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_i2c.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3173,8 +3173,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16
31733173
/* Prepare transfer parameters */
31743174
hi2c->pBuffPtr = pData;
31753175
hi2c->XferCount = Size;
3176-
// Added for MBED PR #3324
3177-
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE));
3176+
hi2c->XferOptions = XferOptions;
31783177
hi2c->XferISR = I2C_Master_ISR_IT;
31793178

31803179
/* If hi2c->XferCount > MAX_NBYTE_SIZE, use reload mode */
@@ -3420,8 +3419,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_
34203419
/* Prepare transfer parameters */
34213420
hi2c->pBuffPtr = pData;
34223421
hi2c->XferCount = Size;
3423-
// Added for MBED PR #3324
3424-
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE));
3422+
hi2c->XferOptions = XferOptions;
34253423
hi2c->XferISR = I2C_Master_ISR_IT;
34263424

34273425
/* If hi2c->XferCount > MAX_NBYTE_SIZE, use reload mode */

0 commit comments

Comments
 (0)