codal_port: Update to build with latest micropython.

Signed-off-by: Damien George <damien@micropython.org>

Author: dpgeorge

.gitignore

@@ -1,4 +1,3 @@
 src/build
 src/MICROBIT.hex
 src/codal_port/build
-src/codal_port/libmicropython.a

src/codal.patch

@@ -20,6 +20,6 @@ index b89e1d0..b53224b 100644
 +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PROJECT_SOURCE_DIR}/../../src/codal_port/filesystem.ld")
 +add_library(micropython STATIC IMPORTED)
 +set_target_properties(micropython PROPERTIES
-+    IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../../src/codal_port/libmicropython.a"
++    IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../../src/codal_port/build/libmicropython.a"
 +)
 +target_link_libraries("MICROBIT" micropython)

src/codal_port/Makefile

@@ -14,6 +14,13 @@ QSTR_DEFS = qstrdefsport.h
 
 # Include py core make definitions.
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
+
+# The micropython-lib submodule is not needed by this project, but the MicroPython
+# build system requires it if FROZEN_MANIFEST is set (which it is below).  To avoid
+# needing to check out the micropython-lib submodule, point MPY_LIB_DIR to a dummy
+# location that has a README.md file.
+MPY_LIB_DIR = $(TOP)
 
 MP_VER_FILE = $(HEADER_BUILD)/mpversion.h
 MBIT_VER_FILE = $(HEADER_BUILD)/microbitversion.h
@@ -107,7 +114,7 @@ SRC_C += \
 	$(abspath $(LOCAL_LIB_DIR)/sam/debug.c) \
 
 SRC_O += \
-	shared/runtime/gchelper_m3.o \
+	shared/runtime/gchelper_thumb2.o \
 
 OBJ = $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_O))
@@ -138,5 +145,3 @@ $(BUILD)/py/stackctrl.o: CWARN += -Wno-dangling-pointer
 $(BUILD)/$(abspath $(LOCAL_LIB_DIR))/sam/sam.o: CWARN += -Wno-array-bounds
 
 include $(TOP)/py/mkrules.mk
-
-CLEAN_EXTRA += $(LIBMICROPYTHON)

src/codal_port/drv_display.c

@@ -192,3 +192,5 @@ void microbit_display_animate(mp_obj_t iterable, mp_int_t delay, bool clear, boo
         wait_for_event();
     }
 }
+
+MP_REGISTER_ROOT_POINTER(void *display_data);

src/codal_port/drv_radio.c

@@ -283,3 +283,5 @@ void microbit_radio_pop(void) {
     // Re-enable the radio IRQ.
     NVIC_EnableIRQ(RADIO_IRQn);
 }
+
+MP_REGISTER_ROOT_POINTER(uint8_t *radio_buf);

src/codal_port/drv_softtimer.c

@@ -98,3 +98,5 @@ uint32_t microbit_soft_timer_get_ms_to_next_expiry(void) {
     }
     return dt;
 }
+
+MP_REGISTER_ROOT_POINTER(struct _microbit_soft_timer_entry_t *soft_timer_heap);

src/codal_port/iters.c

@@ -42,12 +42,12 @@ static mp_obj_t microbit_repeat_iter_next(mp_obj_t iter_in) {
     return mp_obj_subscr(iter->iterable, MP_OBJ_NEW_SMALL_INT(iter->index), MP_OBJ_SENTINEL);
 }
 
-const mp_obj_type_t microbit_repeat_iterator_type = {
-    .base = { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = microbit_repeat_iter_next,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    microbit_repeat_iterator_type,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
+    iter, microbit_repeat_iter_next
+    );
 
 mp_obj_t microbit_repeat_iterator(mp_obj_t iterable) {
     repeat_iterator_t *result = m_new_obj(repeat_iterator_t);

src/codal_port/microbit_accelerometer.c

@@ -199,11 +199,12 @@ STATIC const mp_rom_map_elem_t microbit_accelerometer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(microbit_accelerometer_locals_dict, microbit_accelerometer_locals_dict_table);
 
-const mp_obj_type_t microbit_accelerometer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_MicroBitAccelerometer,
-    .locals_dict = (mp_obj_dict_t *)&microbit_accelerometer_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    microbit_accelerometer_type,
+    MP_QSTR_MicroBitAccelerometer,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &microbit_accelerometer_locals_dict
+    );
 
 const microbit_accelerometer_obj_t microbit_accelerometer_obj = {
     { &microbit_accelerometer_type },

src/codal_port/microbit_button.c

@@ -64,11 +64,12 @@ STATIC const mp_map_elem_t microbit_button_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(microbit_button_locals_dict, microbit_button_locals_dict_table);
 
-const mp_obj_type_t microbit_button_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_MicroBitButton,
-    .locals_dict = (mp_obj_dict_t *)&microbit_button_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    microbit_button_type,
+    MP_QSTR_MicroBitButton,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &microbit_button_locals_dict
+    );
 
 const microbit_button_obj_t microbit_button_a_obj = {
     .base = { &microbit_button_type },

src/codal_port/microbit_compass.c

@@ -100,11 +100,12 @@ STATIC const mp_rom_map_elem_t microbit_compass_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(microbit_compass_locals_dict, microbit_compass_locals_dict_table);
 
-STATIC const mp_obj_type_t microbit_compass_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_MicroBitCompass,
-    .locals_dict = (mp_obj_dict_t *)&microbit_compass_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    microbit_compass_type,
+    MP_QSTR_MicroBitCompass,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &microbit_compass_locals_dict
+    );
 
 const microbit_compass_obj_t microbit_compass_obj = {
     { &microbit_compass_type },