From 647e589a6a3c6d6b7cdeb324842f983918db20d7 Mon Sep 17 00:00:00 2001 From: microDev <70126934+microDev1@users.noreply.github.com> Date: Thu, 7 Oct 2021 14:12:14 +0530 Subject: [PATCH] rename `i2c_num_status` to `peripherals_i2c_get_free_num` --- ports/espressif/common-hal/busio/I2C.c | 2 +- ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c | 2 +- ports/espressif/peripherals/i2c.c | 3 ++- ports/espressif/peripherals/i2c.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/espressif/common-hal/busio/I2C.c b/ports/espressif/common-hal/busio/I2C.c index f9d8446142..81b23cb3a3 100644 --- a/ports/espressif/common-hal/busio/I2C.c +++ b/ports/espressif/common-hal/busio/I2C.c @@ -79,7 +79,7 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, } self->sda_pin = sda; self->scl_pin = scl; - self->i2c_num = i2c_num_status(); + self->i2c_num = peripherals_i2c_get_free_num(); if (self->i2c_num == I2C_NUM_MAX) { mp_raise_ValueError(translate("All I2C peripherals are in use")); diff --git a/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c b/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c index 7ef2ff6eeb..d073a8a362 100644 --- a/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c +++ b/ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c @@ -50,7 +50,7 @@ void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_periphe self->sda_pin = sda; self->scl_pin = scl; - self->i2c_num = i2c_num_status(); + self->i2c_num = peripherals_i2c_get_free_num(); if (self->i2c_num == I2C_NUM_MAX) { mp_raise_ValueError(translate("All I2C peripherals are in use")); diff --git a/ports/espressif/peripherals/i2c.c b/ports/espressif/peripherals/i2c.c index 97cdf2ea34..7a85349f96 100644 --- a/ports/espressif/peripherals/i2c.c +++ b/ports/espressif/peripherals/i2c.c @@ -68,11 +68,12 @@ void peripherals_i2c_deinit(i2c_port_t num) { i2c_status[num] = STATUS_FREE; } -i2c_port_t i2c_num_status(void) { +i2c_port_t peripherals_i2c_get_free_num(void) { i2c_port_t i2c_num = I2C_NUM_MAX; for (i2c_port_t num = 0; num < I2C_NUM_MAX; num++) { if (i2c_status[num] == STATUS_FREE) { i2c_num = num; + break; } } if (i2c_num != I2C_NUM_MAX) { diff --git a/ports/espressif/peripherals/i2c.h b/ports/espressif/peripherals/i2c.h index c65a533247..4e7946d177 100644 --- a/ports/espressif/peripherals/i2c.h +++ b/ports/espressif/peripherals/i2c.h @@ -33,6 +33,6 @@ extern void i2c_reset(void); extern void never_reset_i2c(i2c_port_t num); extern esp_err_t peripherals_i2c_init(i2c_port_t num, const i2c_config_t *i2c_conf); extern void peripherals_i2c_deinit(i2c_port_t num); -extern i2c_port_t i2c_num_status(void); +extern i2c_port_t peripherals_i2c_get_free_num(void); #endif // MICROPY_INCLUDED_ESPRESSIF_PERIPHERALS_I2C_HANDLER_H