Merge pull request #3238 from LMESTM/dev_i2c_stm32f4hal

Dev i2c stm32f4hal

Author: 0xc0170

features/unsupported/tests/mbed/i2c_master_slave_asynch/main.cpp

@@ -45,7 +45,6 @@ I2CSlave slave(D3, D6);
 volatile int why;
 volatile bool master_complete = false;
 void cbmaster_done(int event) {
-    printf("cbmaster_done\n");
     master_complete = true;
     why = event;
 }
@@ -70,7 +69,8 @@ int main()
 
     // First transfer: master to slave
     printf("\nFirst transfer: Master Tx, Repeated Start\n");
-    master.transfer(ADDR, buf_master, SIZE, 0, 0, callback, I2C_EVENT_ALL, true);
+    if(master.transfer(ADDR, buf_master, SIZE, 0, 0, callback, I2C_EVENT_ALL, true) != 0)
+            notify_completion(false);
 
     while (!master_complete) {
         if(slave.receive() == I2CSlave::WriteAddressed) {
@@ -90,7 +90,8 @@ int main()
 
     // Second transfer: slave to master
     printf("\nSecond transfer: Master Rx\n");
-    master.transfer(ADDR, 0, 0, res_master, SIZE, callback, I2C_EVENT_ALL, true);
+    if(master.transfer(ADDR, 0, 0, res_master, SIZE, callback, I2C_EVENT_ALL, true) != 0)
+            notify_completion(false);
 
     while (!master_complete) {
         if(slave.receive() == I2CSlave::ReadAddressed) {
@@ -118,7 +119,8 @@ int main()
 
     // Third transfer: Tx/Rx
     printf("\nThird transfer: Master Tx/Rx\n");
-    master.transfer(ADDR, buf_master_tx, SIZE, buf_master_rx, SIZE, callback, I2C_EVENT_ALL, false);
+    if(master.transfer(ADDR, buf_master_tx, SIZE, buf_master_rx, SIZE, callback, I2C_EVENT_ALL, false) != 0)
+            notify_completion(false);
 
     while (!master_complete) {
 
@@ -130,6 +132,7 @@ int main()
                 buf_slave_txrx[i]++;
             }
         }
+
         if((i == I2CSlave::ReadAddressed) ) {
             slave.write(buf_slave_txrx, SIZE);
         }

targets/TARGET_STM/TARGET_STM32F4/common_objects.h

@@ -84,17 +84,29 @@ struct spi_s {
 };
 
 struct i2c_s {
+    /*  The 1st 2 members I2CName i2c
+     *  and I2C_HandleTypeDef handle should
+     *  be kept as the first members of this struct
+     *  to have get_i2c_obj() function work as expected
+     */
     I2CName  i2c;
     I2C_HandleTypeDef handle;
+    uint8_t index;
+    PinName sda;
+    PinName scl;
     IRQn_Type event_i2cIRQ;
     IRQn_Type error_i2cIRQ;
+    uint8_t XferOperation;
+    volatile uint8_t event;
+#if DEVICE_I2CSLAVE
     uint8_t slave;
+    volatile uint8_t pending_slave_tx_master_rx;
+    volatile uint8_t pending_slave_rx_maxter_tx;
+#endif
 #if DEVICE_I2C_ASYNCH
     uint32_t address;
-    uint8_t event;
     uint8_t stop;
     uint8_t available_events;
-    uint8_t XferOperation;
 #endif
 };
 

targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_i2c.c

@@ -3960,7 +3960,8 @@ static HAL_StatusTypeDef I2C_MasterReceive_BTF(I2C_HandleTypeDef *hi2c)
     __HAL_I2C_DISABLE_IT(hi2c, I2C_IT_EVT | I2C_IT_ERR);
 
     hi2c->State = HAL_I2C_STATE_READY;
-    
+    hi2c->PreviousState = I2C_STATE_NONE;
+
     if(hi2c->Mode == HAL_I2C_MODE_MEM)
     {
       hi2c->Mode = HAL_I2C_MODE_NONE;