Fix |>[I2C] make iic work as expected.

Author: Jiyun-Yang

src/fw/drivers/sf32lb/i2c_hal.c

@@ -214,6 +214,11 @@ static void hal_semaphore_give(I2CBusState *bus_state)
     // If this fails, something is very wrong
     xSemaphoreGive(bus_state->event_semaphore);
 }
+static portBASE_TYPE hal_semaphore_give_from_isr(I2CBusState *bus) {
+  portBASE_TYPE should_context_switch = pdFALSE;
+  (void)xSemaphoreGiveFromISR(bus->event_semaphore,  &should_context_switch);
+  return should_context_switch;
+}
 
 static void I2Cx_IRQHandler(uint16_t index)
 {
@@ -228,7 +233,7 @@ static void I2Cx_IRQHandler(uint16_t index)
 
     if ((HAL_I2C_STATE_BUSY_TX != handle->State) && (HAL_I2C_STATE_BUSY_RX != handle->State))
     {
-        hal_semaphore_give(bus->state); 
+        hal_semaphore_give_from_isr(bus->state); 
         HAL_I2C_StateTypeDef i2c_state = HAL_I2C_GetState(handle);
         if(i2c_state == HAL_I2C_STATE_READY)
             bus->state->transfer_event = I2CTransferEvent_TransferComplete;
@@ -432,11 +437,11 @@ static HAL_StatusTypeDef master_xfer(struct I2CBusHal * i2c_hal, struct rt_i2c_m
             {
                 mem_addr_type = I2C_MEMADD_SIZE_16BIT;
             }
-            PBL_LOG(LOG_LEVEL_ALWAYS, "msg->addr = 0x%x, msg->mem_addr = 0x%x, type = %d, buf = 0x%x, len = 0x%d, timeout = %d;", 
-            (unsigned int)msg->addr, (unsigned int)msg->mem_addr, (int)mem_addr_type, (unsigned int)msg->buf, (int)msg->len, (int)bf0_i2c->bf0_i2c_cfg->timeout);
+            PBL_LOG(LOG_LEVEL_ALWAYS, "msg->addr = 0x%x, msg->mem_addr = 0x%x, type = %d, buf = 0x%x, len = 0x%d, timeout = %d;", 
+            (unsigned int)msg->addr, (unsigned int)msg->mem_addr, (int)mem_addr_type, (unsigned int)msg->buf, (int)msg->len, (int)bf0_i2c->bf0_i2c_cfg->timeout);
             if (msg->flags & RT_I2C_RD)
             {
-            
+            
                 if ((bf0_i2c->i2c_dma_flag) && (bf0_i2c->bf0_i2c_cfg->open_flag & RT_DEVICE_FLAG_DMA_RX))
                 {
                     HAL_DMA_Init(&bf0_i2c->dma.dma_rx);
@@ -509,7 +514,7 @@ static HAL_StatusTypeDef master_xfer(struct I2CBusHal * i2c_hal, struct rt_i2c_m
                 }
             }
         }
-        PBL_LOG(LOG_LEVEL_ALWAYS, "I2C hal transmit result = %d", (int)status);
+        PBL_LOG(LOG_LEVEL_ALWAYS, "I2C hal transmit result = %d", (int)status);
 
         if (HAL_OK != status) goto exit;
 #if 1
@@ -632,12 +637,16 @@ void i2c_hal_abort_transfer(I2CBus *bus)
 void i2c_hal_start_transfer(I2CBus *bus)
 {
     struct I2CBusHal * hal = (struct I2CBusHal * )bus->hal;
-    PBL_LOG(LOG_LEVEL_ALWAYS,"i2c_hal_start_transfer, 0x%p", hal);
+    PBL_LOG(LOG_LEVEL_ALWAYS,"i2c_hal_start_transfer, 0x%p", hal);
     HAL_StatusTypeDef status = master_xfer(hal, &msgs[0], msgs_num);
     if(status ==HAL_BUSY)
         return;
     if(status == HAL_OK)
+    {
         bus->state->transfer_event = I2CTransferEvent_TransferComplete;
+        if((bus->hal->i2c_dma_flag != 1) && (bus->hal->i2c_int_flag != 1))
+            hal_semaphore_give(bus->state);
+    }
     else if(status == HAL_TIMEOUT)
         bus->state->transfer_event = I2CTransferEvent_Timeout;
     else
@@ -871,15 +880,15 @@ int rt_hw_i2c_init(struct I2CBusHal * i2c_hal, bf0_i2c_config_t *cfg, struct rt_
         __HAL_LINKDMA(&(i2c_hal->handle), hdmarx, i2c_hal->dma.dma_rx);
         __HAL_LINKDMA(&(i2c_hal->handle), hdmatx, i2c_hal->dma.dma_tx);
         HAL_I2C_DMA_Init(&(i2c_hal->handle), cfg->dma_rx, cfg->dma_tx);
-
-        HAL_NVIC_SetPriority(i2c_hal->bf0_i2c_cfg->dma_rx->dma_irq, 5, 0); 
-        NVIC_EnableIRQ(i2c_hal->bf0_i2c_cfg->dma_rx->dma_irq);
-        HAL_NVIC_SetPriority(i2c_hal->bf0_i2c_cfg->dma_rx->dma_irq, 5, 0);
-        NVIC_EnableIRQ(i2c_hal->bf0_i2c_cfg->dma_rx->dma_irq);
+
+        HAL_NVIC_SetPriority(i2c_hal->bf0_i2c_cfg->dma_rx->dma_irq, 5, 0); 
+        NVIC_EnableIRQ(i2c_hal->bf0_i2c_cfg->dma_rx->dma_irq);
+        HAL_NVIC_SetPriority(i2c_hal->bf0_i2c_cfg->dma_rx->dma_irq, 5, 0);
+        NVIC_EnableIRQ(i2c_hal->bf0_i2c_cfg->dma_rx->dma_irq);
     }
     else if(i2c_hal->i2c_int_flag)
     {
-        HAL_NVIC_SetPriority(i2c_hal->bf0_i2c_cfg->irq_type, 5, 0);
+        HAL_NVIC_SetPriority(i2c_hal->bf0_i2c_cfg->irq_type, 5, 0);
         NVIC_EnableIRQ(i2c_hal->bf0_i2c_cfg->irq_type);
     }
     ret = i2c_bus_configure(i2c_hal, cfg_default);