Merge pull request #6606 from maximmbed/max32630-fix-i2c

Cruz Monrreal · web-flow · commit b630691fdf61 · 2018-04-16T10:38:10.000-05:00
Fix I2C master
diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/i2c_api.c b/targets/TARGET_Maxim/TARGET_MAX32630/i2c_api.c
@@ -100,7 +100,6 @@ int i2c_stop(i2c_t *obj)
 //******************************************************************************
 int i2c_read(i2c_t *obj, int address, char *data, int length, int stop)
 {
-    MBED_ASSERT(stop != 0);
     return I2CM_Read(obj->i2c, address >> 1, NULL, 0, (uint8_t *)data, length);
 }
 
@@ -146,11 +145,6 @@ int i2c_byte_read(i2c_t *obj, int last)
         if (I2CM_WriteTxFifo(i2cm, fifo, MXC_S_I2CM_TRANS_TAG_RXDATA_NACK) != E_NO_ERROR) {
             goto byte_read_err;
         }
-
-        // Send the stop condition
-        if (I2CM_WriteTxFifo(i2cm, fifo, MXC_S_I2CM_TRANS_TAG_STOP) != E_NO_ERROR) {
-            goto byte_read_err;
-        }
     } else {
         if (I2CM_WriteTxFifo(i2cm, fifo, MXC_S_I2CM_TRANS_TAG_RXDATA_COUNT) != E_NO_ERROR) {
             goto byte_read_err;

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,6 @@ int i2c_stop(i2c_t *obj)`
`100`	`100`	`//******************************************************************************`
`101`	`101`	`int i2c_read(i2c_t obj, int address, char data, int length, int stop)`
`102`	`102`	`{`
`103`		`- MBED_ASSERT(stop != 0);`
`104`	`103`	`return I2CM_Read(obj->i2c, address >> 1, NULL, 0, (uint8_t *)data, length);`
`105`	`104`	`}`
`106`	`105`
`@@ -146,11 +145,6 @@ int i2c_byte_read(i2c_t *obj, int last)`
`146`	`145`	`if (I2CM_WriteTxFifo(i2cm, fifo, MXC_S_I2CM_TRANS_TAG_RXDATA_NACK) != E_NO_ERROR) {`
`147`	`146`	`goto byte_read_err;`
`148`	`147`	`}`
`149`		`-`
`150`		`- // Send the stop condition`
`151`		`- if (I2CM_WriteTxFifo(i2cm, fifo, MXC_S_I2CM_TRANS_TAG_STOP) != E_NO_ERROR) {`
`152`		`- goto byte_read_err;`
`153`		`- }`
`154`	`148`	`} else {`
`155`	`149`	`if (I2CM_WriteTxFifo(i2cm, fifo, MXC_S_I2CM_TRANS_TAG_RXDATA_COUNT) != E_NO_ERROR) {`
`156`	`150`	`goto byte_read_err;`