esp32/micropython: correction to keyboard interrupts exposure

Author: iwahdan88

esp32/hal/esp32_mphal.h

@@ -29,9 +29,5 @@ void mp_hal_delay_ms(uint32_t delay);
 void mp_hal_set_interrupt_char(int c);
 void mp_hal_set_reset_char(int c);
 void mp_hal_reset_safe_and_boot(bool reset);
-void mp_hal_set_persistent_interrupt_char(int c);
-int mp_hal_get_persistent_interrupt_char(void);
-void mp_hal_set_persistent_reset_char(int c);
-int mp_hal_get_persistent_reset_char(void) ;
 
 #endif // _INCLUDED_MPHAL_H_

lib/utils/interrupt_char.c

@@ -26,14 +26,11 @@
 
 #include "py/obj.h"
 #include "py/mpstate.h"
-#include "readline.h"
 
 #if MICROPY_KBD_EXCEPTION
 
 int mp_interrupt_char;
 int mp_reset_char;
-int mp_persistent_interrupt_char = CHAR_CTRL_C;
-int mp_persistent_reset_char = CHAR_CTRL_F;
 
 void mp_hal_set_interrupt_char(int c) {
     if (c != -1) {
@@ -42,27 +39,10 @@ void mp_hal_set_interrupt_char(int c) {
     mp_interrupt_char = c;
 }
 
-void mp_hal_set_persistent_interrupt_char(int c) {
-
-    mp_persistent_interrupt_char = c;
-}
-
-int mp_hal_get_persistent_interrupt_char(void) {
-    return mp_persistent_interrupt_char;
-}
-
 void mp_hal_set_reset_char(int c) {
     mp_reset_char = c;
 }
 
-void mp_hal_set_persistent_reset_char(int c) {
-    mp_persistent_reset_char = c;
-}
-
-int mp_hal_get_persistent_reset_char(void) {
-    return mp_persistent_reset_char;
-}
-
 void mp_keyboard_interrupt(void) {
     MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
     #if MICROPY_ENABLE_SCHEDULER

lib/utils/interrupt_char.h

@@ -29,11 +29,7 @@
 extern int mp_interrupt_char;
 extern int mp_reset_char;
 void mp_hal_set_interrupt_char(int c);
-void mp_hal_set_persistent_interrupt_char(int c);
-int mp_hal_get_persistent_interrupt_char(void);
 void mp_hal_set_reset_char(int c);
-void mp_hal_set_persistent_reset_char(int c);
-int mp_hal_get_persistent_reset_char(void) ;
 void mp_keyboard_interrupt(void);
 
 #endif // MICROPY_INCLUDED_LIB_UTILS_INTERRUPT_CHAR_H

lib/utils/pyexec.c

@@ -97,11 +97,11 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         }
 
         // execute code
-        mp_hal_set_interrupt_char(mp_hal_get_persistent_interrupt_char()); // allow char interrupt
+        mp_hal_set_interrupt_char(CHAR_CTRL_C); // allow ctrl-C to interrupt us
         start = mp_hal_ticks_ms();
         mp_call_function_0(module_fun);
         mp_hal_set_interrupt_char(-1); // disable interrupt
-        mp_hal_set_reset_char(mp_hal_get_persistent_reset_char()); // enable reset char
+        mp_hal_set_reset_char(CHAR_CTRL_F); // enable reset char
         nlr_pop();
         ret = 1;
         if (exec_flags & EXEC_FLAG_PRINT_EOF) {
@@ -111,6 +111,7 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         // uncaught exception
         // FIXME it could be that an interrupt happens just before we disable it here
         mp_hal_set_interrupt_char(-1); // disable interrupt
+        mp_hal_set_reset_char(CHAR_CTRL_F); // enable reset char, might be wrong here
         // print EOF after normal output
         if (exec_flags & EXEC_FLAG_PRINT_EOF) {
             mp_hal_stdout_tx_strn("\x04", 1);

py/modmicropython.c

@@ -142,31 +142,17 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_alloc_emergency_exception_buf_obj, mp_alloc_
 #if MICROPY_KBD_EXCEPTION
 STATIC mp_obj_t mp_micropython_kbd_intr(size_t n_args, const mp_obj_t *args) {
     int c = mp_obj_get_int(args[0]);
-    mp_hal_set_persistent_interrupt_char(c);
+    mp_hal_set_interrupt_char(c);
     if (n_args == 1) {
         if (c == -1) {
-            mp_hal_set_persistent_reset_char(-1);
+            mp_hal_set_reset_char(-1);
         }
     } else {
-        mp_hal_set_persistent_reset_char(mp_obj_get_int(args[1]));
+        mp_hal_set_reset_char(mp_obj_get_int(args[1]));
     }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_micropython_kbd_intr_obj, 1, 2, mp_micropython_kbd_intr);
-
-STATIC mp_obj_t mp_micropython_get_kbd_intr(void) {
-
-    STATIC const qstr kbd_intr_fields[] = {
-        MP_QSTR_interrupt, MP_QSTR_reset
-    };
-
-    mp_obj_t tuple[2];
-    tuple[0] = mp_obj_new_int(mp_hal_get_persistent_interrupt_char());
-    tuple[1] = mp_obj_new_int(mp_hal_get_persistent_reset_char());
-
-    return mp_obj_new_attrtuple(kbd_intr_fields, 2, tuple);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_get_kbd_intr_obj, mp_micropython_get_kbd_intr);
 #endif
 
 #if MICROPY_ENABLE_SCHEDULER
@@ -209,7 +195,6 @@ STATIC const mp_rom_map_elem_t mp_module_micropython_globals_table[] = {
     #endif
     #if MICROPY_KBD_EXCEPTION
     { MP_ROM_QSTR(MP_QSTR_kbd_intr), MP_ROM_PTR(&mp_micropython_kbd_intr_obj) },
-    { MP_ROM_QSTR(MP_QSTR_get_kbd_intr), MP_ROM_PTR(&mp_micropython_get_kbd_intr_obj) },
     #endif
     #if MICROPY_ENABLE_SCHEDULER
     { MP_ROM_QSTR(MP_QSTR_schedule), MP_ROM_PTR(&mp_micropython_schedule_obj) },