mimxrt: Adapt for PR8813 - Optimise mp_obj_type_t storage.

robert-hh · robert-hh · commit 1bc7211eb556 · 2022-10-11T20:22:58.000+02:00
diff --git a/ports/mimxrt/machine_encoder.c b/ports/mimxrt/machine_encoder.c
@@ -568,13 +568,15 @@ STATIC const mp_rom_map_elem_t machine_encoder_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_encoder_locals_dict, machine_encoder_locals_dict_table);
 
-const mp_obj_type_t machine_encoder_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Encoder,
-    .print = mp_machine_encoder_print,
-    .make_new = mp_machine_encoder_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_encoder_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_encoder_type,
+    MP_QSTR_Encoder,
+    MP_TYPE_FLAG_NONE,
+    make_new, mp_machine_encoder_make_new,
+    print, mp_machine_encoder_print,
+    locals_dict, &machine_encoder_locals_dict
+    );
+
 
 // --- Counter class code ----------
 
@@ -693,12 +695,13 @@ STATIC const mp_rom_map_elem_t machine_counter_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_counter_locals_dict, machine_counter_locals_dict_table);
 
-const mp_obj_type_t machine_counter_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Counter,
-    .print = mp_machine_encoder_print,
-    .make_new = mp_machine_counter_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_counter_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_counter_type,
+    MP_QSTR_Counter,
+    MP_TYPE_FLAG_NONE,
+    make_new, mp_machine_counter_make_new,
+    print, mp_machine_encoder_print,
+    locals_dict, &machine_counter_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_QECNT
