TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

all: Make all mp_obj_type_t defs use MP_DEFINE_CONST_OBJ_TYPE.

Browse Source 
In preparation for upcoming rework of mp_obj_type_t layout.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared
2021-07-14 14:38:38 +10:00
committed by Damien George
parent cdb880789f
commit 662b9761b3
227 changed files with 2543 additions and 2184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ports/zephyr/machine_i2c.c
View File

@@ -126,13 +126,14 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
.transfer_single = machine_hard_i2c_transfer_single,
};
const mp_obj_type_t machine_hard_i2c_type = {
{ &mp_type_type },
.name = MP_QSTR_I2C,
.print = machine_hard_i2c_print,
.make_new = machine_hard_i2c_make_new,
.protocol = &machine_hard_i2c_p,
.locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
machine_hard_i2c_type,
MP_QSTR_I2C,
MP_TYPE_FLAG_NONE,
machine_hard_i2c_make_new,
print, machine_hard_i2c_print,
protocol, &machine_hard_i2c_p,
locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
);
#endif // MICROPY_PY_MACHINE_I2C

19
ports/zephyr/machine_pin.c
View File

@@ -285,15 +285,16 @@ STATIC const mp_pin_p_t machine_pin_pin_p = {
.ioctl = machine_pin_ioctl,
};
const mp_obj_type_t machine_pin_type = {
{ &mp_type_type },
.name = MP_QSTR_Pin,
.print = machine_pin_print,
.make_new = mp_pin_make_new,
.call = machine_pin_call,
.protocol = &machine_pin_pin_p,
.locals_dict = (mp_obj_t)&machine_pin_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
machine_pin_type,
MP_QSTR_Pin,
MP_TYPE_FLAG_NONE,
mp_pin_make_new,
print, machine_pin_print,
call, machine_pin_call,
protocol, &machine_pin_pin_p,
locals_dict, (mp_obj_t)&machine_pin_locals_dict
);
STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);

17
ports/zephyr/machine_spi.c
View File

@@ -197,13 +197,14 @@ STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
.transfer = machine_hard_spi_transfer,
};
const mp_obj_type_t machine_hard_spi_type = {
{ &mp_type_type },
.name = MP_QSTR_SPI,
.print = machine_hard_spi_print,
.make_new = machine_hard_spi_make_new,
.protocol = &machine_hard_spi_p,
.locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
machine_hard_spi_type,
MP_QSTR_SPI,
MP_TYPE_FLAG_NONE,
machine_hard_spi_make_new,
print, machine_hard_spi_print,
protocol, &machine_hard_spi_p,
locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
);
#endif // MICROPY_PY_MACHINE_SPI

21
ports/zephyr/machine_uart.c
View File

@@ -154,13 +154,14 @@ STATIC const mp_stream_p_t uart_stream_p = {
.is_text = false,
};
const mp_obj_type_t machine_uart_type = {
{ &mp_type_type },
.name = MP_QSTR_UART,
.print = machine_uart_print,
.make_new = machine_uart_make_new,
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &uart_stream_p,
.locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
machine_uart_type,
MP_QSTR_UART,
MP_TYPE_FLAG_NONE,
machine_uart_make_new,
print, machine_uart_print,
getiter, mp_identity_getiter,
iternext, mp_stream_unbuffered_iter,
protocol, &uart_stream_p,
locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
);

17
ports/zephyr/modusocket.c
View File

@@ -353,14 +353,15 @@ STATIC const mp_stream_p_t socket_stream_p = {
.ioctl = sock_ioctl,
};
STATIC const mp_obj_type_t socket_type = {
{ &mp_type_type },
.name = MP_QSTR_socket,
.print = socket_print,
.make_new = socket_make_new,
.protocol = &socket_stream_p,
.locals_dict = (mp_obj_t)&socket_locals_dict,
};
STATIC MP_DEFINE_CONST_OBJ_TYPE(
socket_type,
MP_QSTR_socket,
MP_TYPE_FLAG_NONE,
socket_make_new,
print, socket_print,
protocol, &socket_stream_p,
locals_dict, (mp_obj_t)&socket_locals_dict
);
//
// getaddrinfo() implementation

13
ports/zephyr/modzsensor.c
View File

@@ -105,12 +105,13 @@ STATIC const mp_rom_map_elem_t sensor_locals_dict_table[] = {
STATIC MP_DEFINE_CONST_DICT(sensor_locals_dict, sensor_locals_dict_table);
STATIC const mp_obj_type_t sensor_type = {
{ &mp_type_type },
.name = MP_QSTR_Sensor,
.make_new = sensor_make_new,
.locals_dict = (void *)&sensor_locals_dict,
};
STATIC MP_DEFINE_CONST_OBJ_TYPE(
sensor_type,
MP_QSTR_Sensor,
MP_TYPE_FLAG_NONE,
sensor_make_new,
locals_dict, (void *)&sensor_locals_dict
);
STATIC const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zsensor) },

30
ports/zephyr/zephyr_storage.c
View File

@@ -128,13 +128,14 @@ STATIC const mp_rom_map_elem_t zephyr_disk_access_locals_dict_table[] = {
};
STATIC MP_DEFINE_CONST_DICT(zephyr_disk_access_locals_dict, zephyr_disk_access_locals_dict_table);
const mp_obj_type_t zephyr_disk_access_type = {
{ &mp_type_type },
.name = MP_QSTR_DiskAccess,
.print = zephyr_disk_access_print,
.make_new = zephyr_disk_access_make_new,
.locals_dict = (mp_obj_dict_t *)&zephyr_disk_access_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
zephyr_disk_access_type,
MP_QSTR_DiskAccess,
MP_TYPE_FLAG_NONE,
zephyr_disk_access_make_new,
print, zephyr_disk_access_print,
locals_dict, (mp_obj_dict_t *)&zephyr_disk_access_locals_dict
);
#endif // CONFIG_DISK_ACCESS
#ifdef CONFIG_FLASH_MAP
@@ -249,11 +250,12 @@ STATIC const mp_rom_map_elem_t zephyr_flash_area_locals_dict_table[] = {
};
STATIC MP_DEFINE_CONST_DICT(zephyr_flash_area_locals_dict, zephyr_flash_area_locals_dict_table);
const mp_obj_type_t zephyr_flash_area_type = {
{ &mp_type_type },
.name = MP_QSTR_FlashArea,
.print = zephyr_flash_area_print,
.make_new = zephyr_flash_area_make_new,
.locals_dict = (mp_obj_dict_t *)&zephyr_flash_area_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
zephyr_flash_area_type,
MP_QSTR_FlashArea,
MP_TYPE_FLAG_NONE,
zephyr_flash_area_make_new,
print, zephyr_flash_area_print,
locals_dict, (mp_obj_dict_t *)&zephyr_flash_area_locals_dict
);
#endif // CONFIG_FLASH_MAP