From 8b0535e23fb1c646103a060a4ae17e9ee6d5e887 Mon Sep 17 00:00:00 2001 From: Damien George Date: Sat, 5 Apr 2014 21:53:54 +0100 Subject: py: Change module globals from mp_map_t* to mp_obj_dict_t*. Towards addressing issue #424. Had a small increase to ROM usage (order 60 bytes). --- stm/pybmodule.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'stm/pybmodule.c') diff --git a/stm/pybmodule.c b/stm/pybmodule.c index 5ae65ad22..40275949f 100644 --- a/stm/pybmodule.c +++ b/stm/pybmodule.c @@ -273,16 +273,19 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_Exti), (mp_obj_t)&exti_obj_type }, }; -STATIC const mp_map_t pyb_module_globals = { - .all_keys_are_qstrs = 1, - .table_is_fixed_array = 1, - .used = sizeof(pyb_module_globals_table) / sizeof(mp_map_elem_t), - .alloc = sizeof(pyb_module_globals_table) / sizeof(mp_map_elem_t), - .table = (mp_map_elem_t*)pyb_module_globals_table, +STATIC const mp_obj_dict_t pyb_module_globals = { + .base = {&mp_type_dict}, + .map = { + .all_keys_are_qstrs = 1, + .table_is_fixed_array = 1, + .used = sizeof(pyb_module_globals_table) / sizeof(mp_map_elem_t), + .alloc = sizeof(pyb_module_globals_table) / sizeof(mp_map_elem_t), + .table = (mp_map_elem_t*)pyb_module_globals_table, + }, }; const mp_obj_module_t pyb_module = { .base = { &mp_type_module }, .name = MP_QSTR_pyb, - .globals = (mp_map_t*)&pyb_module_globals, + .globals = (mp_obj_dict_t*)&pyb_module_globals, }; -- cgit v1.2.3