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

15
ports/esp8266/machine_adc.c
View File

@@ -89,10 +89,11 @@ STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
};
STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
const mp_obj_type_t machine_adc_type = {
{ &mp_type_type },
.name = MP_QSTR_ADC,
.print = machine_adc_print,
.make_new = machine_adc_make_new,
.locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
machine_adc_type,
MP_QSTR_ADC,
MP_TYPE_FLAG_NONE,
machine_adc_make_new,
print, machine_adc_print,
locals_dict, (mp_obj_dict_t *)&machine_adc_locals_dict
);

17
ports/esp8266/machine_hspi.c
View File

@@ -175,13 +175,14 @@ STATIC const mp_machine_spi_p_t machine_hspi_p = {
.transfer = machine_hspi_transfer,
};
const mp_obj_type_t machine_hspi_type = {
{ &mp_type_type },
.name = MP_QSTR_HSPI,
.print = machine_hspi_print,
.make_new = machine_hspi_make_new,
.protocol = &machine_hspi_p,
.locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
machine_hspi_type,
MP_QSTR_HSPI,
MP_TYPE_FLAG_NONE,
machine_hspi_make_new,
print, machine_hspi_print,
protocol, &machine_hspi_p,
locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
);
#endif // MICROPY_PY_MACHINE_SPI

33
ports/esp8266/machine_pin.c
View File

@@ -450,15 +450,16 @@ STATIC const mp_pin_p_t pin_pin_p = {
.ioctl = pin_ioctl,
};
const mp_obj_type_t pyb_pin_type = {
{ &mp_type_type },
.name = MP_QSTR_Pin,
.print = pyb_pin_print,
.make_new = mp_pin_make_new,
.call = pyb_pin_call,
.protocol = &pin_pin_p,
.locals_dict = (mp_obj_dict_t *)&pyb_pin_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
pyb_pin_type,
MP_QSTR_Pin,
MP_TYPE_FLAG_NONE,
mp_pin_make_new,
print, pyb_pin_print,
call, pyb_pin_call,
protocol, &pin_pin_p,
locals_dict, (mp_obj_dict_t *)&pyb_pin_locals_dict
);
/******************************************************************************/
// Pin IRQ object
@@ -509,11 +510,13 @@ STATIC const mp_rom_map_elem_t pin_irq_locals_dict_table[] = {
STATIC MP_DEFINE_CONST_DICT(pin_irq_locals_dict, pin_irq_locals_dict_table);
STATIC const mp_obj_type_t pin_irq_type = {
{ &mp_type_type },
.name = MP_QSTR_IRQ,
.call = pin_irq_call,
.locals_dict = (mp_obj_dict_t *)&pin_irq_locals_dict,
};
STATIC MP_DEFINE_CONST_OBJ_TYPE(
pin_irq_type,
MP_QSTR_IRQ,
MP_TYPE_FLAG_NONE,
MP_TYPE_NULL_MAKE_NEW,
call, pin_irq_call,
locals_dict, (mp_obj_dict_t *)&pin_irq_locals_dict
);
MP_REGISTER_ROOT_POINTER(mp_obj_t pin_irq_handler[16]);

13
ports/esp8266/machine_rtc.c
View File

@@ -262,9 +262,10 @@ STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
};
STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
const mp_obj_type_t pyb_rtc_type = {
{ &mp_type_type },
.name = MP_QSTR_RTC,
.make_new = pyb_rtc_make_new,
.locals_dict = (mp_obj_dict_t *)&pyb_rtc_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
pyb_rtc_type,
MP_QSTR_RTC,
MP_TYPE_FLAG_NONE,
pyb_rtc_make_new,
locals_dict, (mp_obj_dict_t *)&pyb_rtc_locals_dict
);

21
ports/esp8266/machine_uart.c
View File

@@ -343,15 +343,16 @@ STATIC const mp_stream_p_t uart_stream_p = {
.is_text = false,
};
const mp_obj_type_t pyb_uart_type = {
{ &mp_type_type },
.name = MP_QSTR_UART,
.print = pyb_uart_print,
.make_new = pyb_uart_make_new,
.getiter = mp_identity_getiter,
.iternext = mp_stream_unbuffered_iter,
.protocol = &uart_stream_p,
.locals_dict = (mp_obj_dict_t *)&pyb_uart_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
pyb_uart_type,
MP_QSTR_UART,
MP_TYPE_FLAG_NONE,
pyb_uart_make_new,
print, pyb_uart_print,
getiter, mp_identity_getiter,
iternext, mp_stream_unbuffered_iter,
protocol, &uart_stream_p,
locals_dict, (mp_obj_dict_t *)&pyb_uart_locals_dict
);
MP_REGISTER_ROOT_POINTER(byte * uart0_rxbuf);

13
ports/esp8266/machine_wdt.c
View File

@@ -69,9 +69,10 @@ STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
};
STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
const mp_obj_type_t esp_wdt_type = {
{ &mp_type_type },
.name = MP_QSTR_WDT,
.make_new = machine_wdt_make_new,
.locals_dict = (mp_obj_dict_t *)&machine_wdt_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
esp_wdt_type,
MP_QSTR_WDT,
MP_TYPE_FLAG_NONE,
machine_wdt_make_new,
locals_dict, (mp_obj_dict_t *)&machine_wdt_locals_dict
);

15
ports/esp8266/modmachine.c
View File

@@ -337,13 +337,14 @@ STATIC const mp_rom_map_elem_t esp_timer_locals_dict_table[] = {
};
STATIC MP_DEFINE_CONST_DICT(esp_timer_locals_dict, esp_timer_locals_dict_table);
const mp_obj_type_t esp_timer_type = {
{ &mp_type_type },
.name = MP_QSTR_Timer,
.print = esp_timer_print,
.make_new = esp_timer_make_new,
.locals_dict = (mp_obj_dict_t *)&esp_timer_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
esp_timer_type,
MP_QSTR_Timer,
MP_TYPE_FLAG_NONE,
esp_timer_make_new,
print, esp_timer_print,
locals_dict, (mp_obj_dict_t *)&esp_timer_locals_dict
);
// this bit is unused in the Xtensa PS register
#define ETS_LOOP_ITER_BIT (12)

12
ports/esp8266/modnetwork.c
View File

@@ -510,11 +510,13 @@ STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
STATIC MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
const mp_obj_type_t wlan_if_type = {
{ &mp_type_type },
.name = MP_QSTR_WLAN,
.locals_dict = (mp_obj_dict_t *)&wlan_if_locals_dict,
};
MP_DEFINE_CONST_OBJ_TYPE(
wlan_if_type,
MP_QSTR_WLAN,
MP_TYPE_FLAG_NONE,
MP_TYPE_NULL_MAKE_NEW,
locals_dict, (mp_obj_dict_t *)&wlan_if_locals_dict
);
STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
if (n_args == 0) {