stm32/machine_i2c_target: Update bindings.

Signed-off-by: Damien George <[email protected]>

Author: dpgeorge

ports/stm32/machine_i2c_target.c

@@ -41,7 +41,7 @@ typedef struct _machine_i2c_target_obj_t {
     mp_hal_pin_obj_t sda;
 } machine_i2c_target_obj_t;
 
-static const machine_i2c_target_obj_t machine_i2cslave_obj[] = {
+static const machine_i2c_target_obj_t machine_i2c_target_obj[] = {
     #if defined(MICROPY_HW_I2C1_SCL)
     {{&machine_i2c_target_type}, I2C1, I2C1_EV_IRQn, I2C1_ER_IRQn, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
     #else
@@ -64,19 +64,17 @@ static const machine_i2c_target_obj_t machine_i2cslave_obj[] = {
     #endif
 };
 
-static machine_i2c_target_data_t i2c_target_data[4];
-
 /******************************************************************************/
 // stm32 hardware bindings
 
 static machine_i2c_target_obj_t *get_self(i2c_slave_t *i2c) {
     size_t i2c_id = ((uintptr_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
-    return (machine_i2c_target_obj_t *)&machine_i2cslave_obj[i2c_id];
+    return (machine_i2c_target_obj_t *)&machine_i2c_target_obj[i2c_id];
 }
 
 static machine_i2c_target_data_t *get_data(i2c_slave_t *i2c) {
     size_t i2c_id = ((uintptr_t)i2c - I2C1_BASE) / (I2C2_BASE - I2C1_BASE);
-    return &i2c_target_data[i2c_id];
+    return &machine_i2c_target_data[i2c_id];
 }
 
 int i2c_slave_process_addr_match(i2c_slave_t *i2c, int rw) {
@@ -104,6 +102,10 @@ void i2c_slave_process_tx_end(i2c_slave_t *i2c) {
 /******************************************************************************/
 // I2CTarget port implementation
 
+static inline size_t mp_machine_i2c_target_get_index(machine_i2c_target_obj_t *self) {
+    return self - &machine_i2c_target_obj[0];
+}
+
 static void mp_machine_i2c_target_deinit_all_port(void) {
 }
 
@@ -139,10 +141,6 @@ static mp_obj_t mp_machine_i2c_target_make_new(const mp_obj_type_t *type, size_t
         { MP_QSTR_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 7} },
         { MP_QSTR_mem, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_mem_addrsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} },
-        /*
-        { MP_QSTR_scl, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_sda, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        */
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -170,20 +168,20 @@ static mp_obj_t mp_machine_i2c_target_make_new(const mp_obj_type_t *type, size_t
         }
     } else {
         i2c_id = mp_obj_get_int(args[ARG_id].u_obj);
-        if (i2c_id < 1 || i2c_id > MP_ARRAY_SIZE(machine_i2cslave_obj)
-            || machine_i2cslave_obj[i2c_id - 1].base.type == NULL) {
+        if (i2c_id < 1 || i2c_id > MP_ARRAY_SIZE(machine_i2c_target_obj)
+            || machine_i2c_target_obj[i2c_id - 1].base.type == NULL) {
             nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
                 MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id));
         }
     }
 
     // Initialise data.
-    MP_STATE_PORT(i2c_target_mem_obj)[i2c_id - 1] = args[ARG_mem].u_obj;
-    machine_i2c_target_data_t *data = &i2c_target_data[i2c_id - 1];
+    MP_STATE_PORT(machine_i2c_target_mem_obj)[i2c_id - 1] = args[ARG_mem].u_obj;
+    machine_i2c_target_data_t *data = &machine_i2c_target_data[i2c_id - 1];
     machine_i2c_target_data_init(data, args[ARG_mem].u_obj, args[ARG_mem_addrsize].u_int);
 
     // Get static target object.
-    machine_i2c_target_obj_t *self = (machine_i2c_target_obj_t *)&machine_i2cslave_obj[i2c_id - 1];
+    machine_i2c_target_obj_t *self = (machine_i2c_target_obj_t *)&machine_i2c_target_obj[i2c_id - 1];
 
     // Initialise the I2C target.
     mp_hal_pin_config_alt(self->scl, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_NONE, AF_FN_I2C, i2c_id);
@@ -200,7 +198,7 @@ static mp_obj_t mp_machine_i2c_target_make_new(const mp_obj_type_t *type, size_t
 static void mp_machine_i2c_target_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "I2CTarget(%u, addr=%u)",
-        self - &machine_i2cslave_obj[0] + 1,
+        self - &machine_i2c_target_obj[0] + 1,
         (self->i2c->OAR1 >> 1) & 0x7f);
 }
 

ports/stm32/mpconfigport.h

@@ -131,6 +131,8 @@
 #define MICROPY_PY_MACHINE_I2C      (MICROPY_HW_ENABLE_HW_I2C)
 #define MICROPY_PY_MACHINE_I2C_TARGET (MICROPY_HW_ENABLE_HW_I2C_TARGET)
 #define MICROPY_PY_MACHINE_I2C_TARGET_INCLUDEFILE "ports/stm32/machine_i2c_target.c"
+#define MICROPY_PY_MACHINE_I2C_TARGET_MAX (4)
+#define MICROPY_PY_MACHINE_I2C_TARGET_HARD_IRQ (1)
 #define MICROPY_PY_MACHINE_SOFTI2C  (1)
 #define MICROPY_PY_MACHINE_I2S_INCLUDEFILE "ports/stm32/machine_i2s.c"
 #define MICROPY_PY_MACHINE_I2S_CONSTANT_RX (I2S_MODE_MASTER_RX)