Use MP_DEFINE_CONST_DICT macro to define module dicts.

This is just a clean-up of the code.  Generated code is exactly the
same.

8 files changed, 9 insertions, 81 deletions

diff --git a/stmhal/make-stmconst.py b/stmhal/make-stmconst.py
index ba428395c..03051c557 100644
--- a/stmhal/make-stmconst.py
+++ b/stmhal/make-stmconst.py
@@ -145,23 +145,14 @@ STATIC const mp_map_elem_t stm_%s_globals_table[] = {
 
     print("""};
 
-STATIC const mp_obj_dict_t stm_%s_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = sizeof(stm_%s_globals_table) / sizeof(mp_map_elem_t),
-        .alloc = sizeof(stm_%s_globals_table) / sizeof(mp_map_elem_t),
-        .table = (mp_map_elem_t*)stm_%s_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(stm_%s_globals, stm_%s_globals_table);
 
 const mp_obj_module_t stm_%s_obj = {
     .base = { &mp_type_module },
     .name = MP_QSTR_%s,
     .globals = (mp_obj_dict_t*)&stm_%s_globals,
 };
-""" % (mod_name_lower, mod_name_lower, mod_name_lower, mod_name_lower, mod_name_lower, mod_name_upper, mod_name_lower))
+""" % (mod_name_lower, mod_name_lower, mod_name_lower, mod_name_upper, mod_name_lower))
 
 def main():
     cmd_parser = argparse.ArgumentParser(description='Extract ST constants from a C header file.')
diff --git a/stmhal/modnetwork.c b/stmhal/modnetwork.c
index c6723b182..fd3fee928 100644
--- a/stmhal/modnetwork.c
+++ b/stmhal/modnetwork.c
@@ -79,16 +79,7 @@ STATIC const mp_map_elem_t mp_module_network_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_route), (mp_obj_t)&network_route_obj },
 };
 
-STATIC const mp_obj_dict_t mp_module_network_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(mp_module_network_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_network_globals_table),
-        .table = (mp_map_elem_t*)mp_module_network_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals_table);
 
 const mp_obj_module_t mp_module_network = {
     .base = { &mp_type_module },
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c
index d3ea79797..38c5499b0 100644
--- a/stmhal/modpyb.c
+++ b/stmhal/modpyb.c
@@ -574,16 +574,7 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
 #endif
 };
 
-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 = MP_ARRAY_SIZE(pyb_module_globals_table),
-        .alloc = MP_ARRAY_SIZE(pyb_module_globals_table),
-        .table = (mp_map_elem_t*)pyb_module_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(pyb_module_globals, pyb_module_globals_table);
 
 const mp_obj_module_t pyb_module = {
     .base = { &mp_type_module },
diff --git a/stmhal/modstm.c b/stmhal/modstm.c
index 1196ff82f..960476fa9 100644
--- a/stmhal/modstm.c
+++ b/stmhal/modstm.c
@@ -126,16 +126,7 @@ STATIC const mp_map_elem_t stm_module_globals_table[] = {
 #include "modstmconst.gen.c"
 };
 
-STATIC const mp_obj_dict_t stm_module_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(stm_module_globals_table),
-        .alloc = MP_ARRAY_SIZE(stm_module_globals_table),
-        .table = (mp_map_elem_t*)stm_module_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(stm_module_globals, stm_module_globals_table);
 
 const mp_obj_module_t stm_module = {
     .base = { &mp_type_module },
diff --git a/stmhal/moduos.c b/stmhal/moduos.c
index 95446cdb0..ad0913fae 100644
--- a/stmhal/moduos.c
+++ b/stmhal/moduos.c
@@ -351,16 +351,7 @@ STATIC const mp_map_elem_t os_module_globals_table[] = {
 #endif
 };
 
-STATIC const mp_obj_dict_t os_module_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(os_module_globals_table),
-        .alloc = MP_ARRAY_SIZE(os_module_globals_table),
-        .table = (mp_map_elem_t*)os_module_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
 
 const mp_obj_module_t mp_module_uos = {
     .base = { &mp_type_module },
diff --git a/stmhal/moduselect.c b/stmhal/moduselect.c
index ec5910a71..0d5d6dd4a 100644
--- a/stmhal/moduselect.c
+++ b/stmhal/moduselect.c
@@ -292,16 +292,7 @@ STATIC const mp_map_elem_t mp_module_select_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_poll), (mp_obj_t)&mp_select_poll_obj },
 };
 
-STATIC const mp_obj_dict_t mp_module_select_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(mp_module_select_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_select_globals_table),
-        .table = (mp_map_elem_t*)mp_module_select_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_select_globals, mp_module_select_globals_table);
 
 const mp_obj_module_t mp_module_uselect = {
     .base = { &mp_type_module },
diff --git a/stmhal/modusocket.c b/stmhal/modusocket.c
index bab108703..048f05298 100644
--- a/stmhal/modusocket.c
+++ b/stmhal/modusocket.c
@@ -133,16 +133,7 @@ STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
     */
 };
 
-STATIC const mp_obj_dict_t mp_module_usocket_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(mp_module_usocket_globals_table),
-        .alloc = MP_ARRAY_SIZE(mp_module_usocket_globals_table),
-        .table = (mp_map_elem_t*)mp_module_usocket_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);
 
 const mp_obj_module_t mp_module_usocket = {
     .base = { &mp_type_module },
diff --git a/stmhal/modutime.c b/stmhal/modutime.c
index fd8fbb36a..0bc3245c4 100644
--- a/stmhal/modutime.c
+++ b/stmhal/modutime.c
@@ -344,16 +344,7 @@ STATIC const mp_map_elem_t time_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&time_time_obj },
 };
 
-STATIC const mp_obj_dict_t time_module_globals = {
-    .base = {&mp_type_dict},
-    .map = {
-        .all_keys_are_qstrs = 1,
-        .table_is_fixed_array = 1,
-        .used = MP_ARRAY_SIZE(time_module_globals_table),
-        .alloc = MP_ARRAY_SIZE(time_module_globals_table),
-        .table = (mp_map_elem_t*)time_module_globals_table,
-    },
-};
+STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
 
 const mp_obj_module_t mp_module_utime = {
     .base = { &mp_type_module },