Merge pull request #11011 from SiliconLabs/fix/fpga_tests/i2c

0xc0170 · web-flow · commit 279f4cd5841f · 2019-07-10T10:44:54.000+01:00
Allow re-initialising an I2C peripheral on Silicon Labs targets
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/i2c_api.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/i2c_api.c
@@ -119,6 +119,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl)
 
     /* Initializing the I2C */
     /* Using default settings */
+    i2c_reset(obj);
     I2C_Init_TypeDef i2cInit = I2C_INIT_DEFAULT;
     I2C_Init(obj->i2c.i2c, &i2cInit);
 
@@ -315,6 +316,8 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop)
 
 void i2c_reset(i2c_t *obj)
 {
+    i2c_enable_interrupt(obj, 0, false);
+    i2c_enable(obj, false);
     /* EMLib function */
     I2C_Reset(obj->i2c.i2c);
 }

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl)`
`119`	`119`
`120`	`120`	`/* Initializing the I2C */`
`121`	`121`	`/* Using default settings */`
	`122`	`+ i2c_reset(obj);`
`122`	`123`	`I2C_Init_TypeDef i2cInit = I2C_INIT_DEFAULT;`
`123`	`124`	`I2C_Init(obj->i2c.i2c, &i2cInit);`
`124`	`125`
`@@ -315,6 +316,8 @@ int i2c_write(i2c_t obj, int address, const char data, int length, int stop)`
`315`	`316`
`316`	`317`	`void i2c_reset(i2c_t *obj)`
`317`	`318`	`{`
	`319`	`+ i2c_enable_interrupt(obj, 0, false);`
	`320`	`+ i2c_enable(obj, false);`
`318`	`321`	`/* EMLib function */`
`319`	`322`	`I2C_Reset(obj->i2c.i2c);`
`320`	`323`	`}`