Merge pull request #3635 from bcostm/fix_i2c

0xc0170 · web-flow · commit f231655619ca · 2017-01-26T10:39:03.000+02:00
STM32 I2C : Fix bug in i2c_byte_read function
diff --git a/targets/TARGET_STM/i2c_api.c b/targets/TARGET_STM/i2c_api.c
@@ -627,10 +627,9 @@ int i2c_byte_read(i2c_t *obj, int last) {
         }
     }
 
-    /*  Enable reload mode as we don't know how many bytes will eb sent */
-    handle->Instance->CR2 |= I2C_CR2_RELOAD;
-    /*  Set transfer size to 1 */
-    handle->Instance->CR2 |= (I2C_CR2_NBYTES & (1 << 16));
+    /* Enable reload mode as we don't know how many bytes will be sent */
+    /* and set transfer size to 1 */
+    tmpreg |= I2C_CR2_RELOAD | (I2C_CR2_NBYTES & (1 << 16));
     /* Set the prepared configuration */
     handle->Instance->CR2 = tmpreg;
 

Original file line number	Diff line number	Diff line change
`@@ -627,10 +627,9 @@ int i2c_byte_read(i2c_t *obj, int last) {`
`627`	`627`	`}`
`628`	`628`	`}`
`629`	`629`
`630`		`- /* Enable reload mode as we don't know how many bytes will eb sent */`
`631`		`- handle->Instance->CR2 \|= I2C_CR2_RELOAD;`
`632`		`- /* Set transfer size to 1 */`
`633`		`- handle->Instance->CR2 \|= (I2C_CR2_NBYTES & (1 << 16));`
	`630`	`+ /* Enable reload mode as we don't know how many bytes will be sent */`
	`631`	`+ /* and set transfer size to 1 */`
	`632`	`+ tmpreg \|= I2C_CR2_RELOAD \| (I2C_CR2_NBYTES & (1 << 16));`
`634`	`633`	`/* Set the prepared configuration */`
`635`	`634`	`handle->Instance->CR2 = tmpreg;`
`636`	`635`