djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zephyr: Rename machine I2C and SPI types consistently across ports.

Browse Source 
This renames:
- machine_hard_i2c_type -> machine_i2c_type
- machine_hard_spi_type -> machine_spi_type
This commit is contained in:
iabdalkader 2022-10-06 20:28:31 +02:00 committed by Damien George
parent bfa6f34404
commit 5e90ec2331
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/zephyr/machine_i2c.c
View File

@ -84,7 +84,7 @@ mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
mp_raise_NotImplementedError(MP_ERROR_TEXT("explicit choice of timeout is not implemented")); mp_raise_NotImplementedError(MP_ERROR_TEXT("explicit choice of timeout is not implemented"));
} }
machine_hard_i2c_obj_t *self = mp_obj_malloc(machine_hard_i2c_obj_t, &machine_hard_i2c_type); machine_hard_i2c_obj_t *self = mp_obj_malloc(machine_hard_i2c_obj_t, &machine_i2c_type);
self->dev = dev; self->dev = dev;
self->restart = false; self->restart = false;
@ -127,7 +127,7 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
}; };
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
machine_hard_i2c_type, machine_i2c_type,
MP_QSTR_I2C, MP_QSTR_I2C,
MP_TYPE_FLAG_NONE, MP_TYPE_FLAG_NONE,
make_new, machine_hard_i2c_make_new, make_new, machine_hard_i2c_make_new,

4
ports/zephyr/machine_spi.c
View File

@ -106,7 +106,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
.cs = NULL .cs = NULL
}; };
machine_hard_spi_obj_t *self = mp_obj_malloc(machine_hard_spi_obj_t, &machine_hard_spi_type); machine_hard_spi_obj_t *self = mp_obj_malloc(machine_hard_spi_obj_t, &machine_spi_type);
self->dev = dev; self->dev = dev;
self->config = cfg; self->config = cfg;
@ -198,7 +198,7 @@ STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
}; };
MP_DEFINE_CONST_OBJ_TYPE( MP_DEFINE_CONST_OBJ_TYPE(
machine_hard_spi_type, machine_spi_type,
MP_QSTR_SPI, MP_QSTR_SPI,
MP_TYPE_FLAG_NONE, MP_TYPE_FLAG_NONE,
make_new, machine_hard_spi_make_new, make_new, machine_hard_spi_make_new,

4
ports/zephyr/modmachine.c
View File

@ -69,10 +69,10 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) }, { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
#if MICROPY_PY_MACHINE_I2C #if MICROPY_PY_MACHINE_I2C
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hard_i2c_type) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_i2c_type) },
#endif #endif
#if MICROPY_PY_MACHINE_SPI #if MICROPY_PY_MACHINE_SPI
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hard_spi_type) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_spi_type) },
#endif #endif
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) }, { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
{ MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) }, { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },

4
ports/zephyr/modmachine.h
View File

@ -4,8 +4,8 @@
#include "py/obj.h" #include "py/obj.h"
extern const mp_obj_type_t machine_pin_type; extern const mp_obj_type_t machine_pin_type;
extern const mp_obj_type_t machine_hard_i2c_type; extern const mp_obj_type_t machine_i2c_type;
extern const mp_obj_type_t machine_hard_spi_type; extern const mp_obj_type_t machine_spi_type;
extern const mp_obj_type_t machine_uart_type; extern const mp_obj_type_t machine_uart_type;
MP_DECLARE_CONST_FUN_OBJ_0(machine_info_obj); MP_DECLARE_CONST_FUN_OBJ_0(machine_info_obj);