alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-23 01:05:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(i2c): rename some LL functions according to TRM descriptions

Browse Source
This commit is contained in:
morris
2024-11-20 18:16:34 +08:00
parent 5c9e7670f2
commit 3fb7461eb0
17 changed files with 162 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_driver_i2c/i2c_master.c
View File

@@ -130,6 +130,7 @@ static esp_err_t s_i2c_hw_fsm_reset(i2c_master_bus_handle_t i2c_master)
}
i2c_hal_master_init(hal);
i2c_ll_enable_fifo_mode(hal->dev, true);
i2c_ll_disable_intr_mask(hal->dev, I2C_LL_INTR_MASK);
i2c_ll_clear_intr_mask(hal->dev, I2C_LL_INTR_MASK);
i2c_hal_set_timing_config(hal, &timing_config);

14
components/esp_driver_i2c/i2c_slave.c
View File

@@ -247,11 +247,11 @@ esp_err_t i2c_new_slave_device(const i2c_slave_config_t *slave_config, i2c_slave
#if SOC_I2C_SLAVE_SUPPORT_I2CRAM_ACCESS
if (i2c_slave->fifo_mode == I2C_SLAVE_NONFIFO) {
i2c_ll_slave_set_fifo_mode(hal->dev, false);
i2c_ll_enable_mem_access_nonfifo(hal->dev, true);
i2c_ll_enable_fifo_mode(hal->dev, false);
i2c_ll_slave_enable_dual_addressing_mode(hal->dev, true);
} else {
i2c_ll_slave_set_fifo_mode(hal->dev, true);
i2c_ll_enable_mem_access_nonfifo(hal->dev, false);
i2c_ll_enable_fifo_mode(hal->dev, true);
i2c_ll_slave_enable_dual_addressing_mode(hal->dev, false);
}
#endif
@@ -273,7 +273,7 @@ esp_err_t i2c_new_slave_device(const i2c_slave_config_t *slave_config, i2c_slave
#if SOC_I2C_SLAVE_CAN_GET_STRETCH_CAUSE
i2c_ll_slave_enable_scl_stretch(hal->dev, slave_config->flags.stretch_en);
#endif
i2c_ll_slave_tx_auto_start_en(hal->dev, true);
i2c_ll_slave_enable_auto_start(hal->dev, true);
i2c_ll_update(hal->dev);
portEXIT_CRITICAL(&i2c_slave->base->spinlock);
@@ -386,7 +386,7 @@ esp_err_t i2c_slave_read_ram(i2c_slave_dev_handle_t i2c_slave, uint8_t ram_offse
portEXIT_CRITICAL(&i2c_slave->base->spinlock);
return ESP_ERR_INVALID_SIZE;
}
i2c_ll_read_by_nonfifo(hal->dev, ram_offset, data, fifo_size);
i2c_ll_read_rx_by_nonfifo(hal->dev, ram_offset, data, fifo_size);
portEXIT_CRITICAL(&i2c_slave->base->spinlock);
return ESP_OK;
@@ -407,7 +407,7 @@ esp_err_t i2c_slave_write_ram(i2c_slave_dev_handle_t i2c_slave, uint8_t ram_offs
ESP_EARLY_LOGE(TAG, "No extra fifo to fill your buffer, please split your buffer");
return ESP_ERR_INVALID_SIZE;
}
i2c_ll_write_by_nonfifo(hal->dev, ram_offset, data, size);
i2c_ll_write_tx_by_nonfifo(hal->dev, ram_offset, data, size);
xSemaphoreGive(i2c_slave->slv_tx_mux);
return ESP_OK;
}

2
components/esp_driver_i2c/i2c_slave_v2.c
View File

@@ -290,7 +290,7 @@ esp_err_t i2c_new_slave_device(const i2c_slave_config_t *slave_config, i2c_slave
portENTER_CRITICAL(&i2c_slave->base->spinlock);
i2c_hal_slave_init(hal);
i2c_ll_slave_set_fifo_mode(hal->dev, true);
i2c_ll_enable_fifo_mode(hal->dev, true);
i2c_ll_set_slave_addr(hal->dev, slave_config->slave_addr, false);
i2c_ll_set_tout(hal->dev, I2C_LL_MAX_TIMEOUT);