Skip to content

Commit 1aabab0

Browse files
committed
Merge branch 'bugfix/i2c_const_function_signature' into 'master'
I2C: add const to signature of master_write function Closes IDFGH-3324 See merge request espressif/esp-idf!9306
2 parents 1ec35ba + f08743e commit 1aabab0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

components/driver/i2c.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ esp_err_t i2c_master_stop(i2c_cmd_handle_t cmd_handle)
900900
return i2c_cmd_link_append(cmd_handle, &cmd);
901901
}
902902

903-
esp_err_t i2c_master_write(i2c_cmd_handle_t cmd_handle, uint8_t *data, size_t data_len, bool ack_en)
903+
esp_err_t i2c_master_write(i2c_cmd_handle_t cmd_handle, const uint8_t *data, size_t data_len, bool ack_en)
904904
{
905905
I2C_CHECK((data != NULL), I2C_ADDR_ERROR_STR, ESP_ERR_INVALID_ARG);
906906
I2C_CHECK(cmd_handle != NULL, I2C_CMD_LINK_INIT_ERR_STR, ESP_ERR_INVALID_ARG);
@@ -917,7 +917,7 @@ esp_err_t i2c_master_write(i2c_cmd_handle_t cmd_handle, uint8_t *data, size_t da
917917
cmd.hw_cmd.ack_val = 0;
918918
cmd.hw_cmd.op_code = I2C_CMD_WRITE;
919919
cmd.hw_cmd.byte_num = len_tmp;
920-
cmd.data = data + data_offset;
920+
cmd.data = (uint8_t*) data + data_offset;
921921
ret = i2c_cmd_link_append(cmd_handle, &cmd);
922922
data_offset += len_tmp;
923923
if (ret != ESP_OK) {

components/driver/include/driver/i2c.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ esp_err_t i2c_master_write_byte(i2c_cmd_handle_t cmd_handle, uint8_t data, bool
225225
* - ESP_OK Success
226226
* - ESP_ERR_INVALID_ARG Parameter error
227227
*/
228-
esp_err_t i2c_master_write(i2c_cmd_handle_t cmd_handle, uint8_t *data, size_t data_len, bool ack_en);
228+
esp_err_t i2c_master_write(i2c_cmd_handle_t cmd_handle, const uint8_t *data, size_t data_len, bool ack_en);
229229

230230
/**
231231
* @brief Queue command for I2C master to read one byte from I2C bus

0 commit comments

Comments
 (0)