lib/utils/interrupt_char: Use core-provided mp_kbd_exception if enabled.

dpgeorge · dpgeorge · commit d89cafd5c30b · 2016-12-15T13:35:54.000+11:00
Ultimately all ports that use lib/utils/interrupt_char would enable
MICROPY_KBD_EXCEPTION, so this is an interim solution.
diff --git a/lib/utils/interrupt_char.c b/lib/utils/interrupt_char.c
@@ -31,11 +31,19 @@ int mp_interrupt_char;
 
 void mp_hal_set_interrupt_char(int c) {
     if (c != -1) {
+        #if MICROPY_KBD_EXCEPTION
+        mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
+        #else
         mp_obj_exception_clear_traceback(MP_STATE_PORT(mp_kbd_exception));
+        #endif
     }
     mp_interrupt_char = c;
 }
 
 void mp_keyboard_interrupt(void) {
+    #if MICROPY_KBD_EXCEPTION
+    MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
+    #else
     MP_STATE_VM(mp_pending_exception) = MP_STATE_PORT(mp_kbd_exception);
+    #endif
 }

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,19 @@ int mp_interrupt_char;`
`31`	`31`
`32`	`32`	`void mp_hal_set_interrupt_char(int c) {`
`33`	`33`	`if (c != -1) {`
	`34`	`+ #if MICROPY_KBD_EXCEPTION`
	`35`	`+ mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));`
	`36`	`+ #else`
`34`	`37`	`mp_obj_exception_clear_traceback(MP_STATE_PORT(mp_kbd_exception));`
	`38`	`+ #endif`
`35`	`39`	`}`
`36`	`40`	`mp_interrupt_char = c;`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`void mp_keyboard_interrupt(void) {`
	`44`	`+ #if MICROPY_KBD_EXCEPTION`
	`45`	`+ MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));`
	`46`	`+ #else`
`40`	`47`	`MP_STATE_VM(mp_pending_exception) = MP_STATE_PORT(mp_kbd_exception);`
	`48`	`+ #endif`
`41`	`49`	`}`