From 689dae1211b4a3a6384a08ec2d7cdf2bb786d53a Mon Sep 17 00:00:00 2001
From: Damien George
Date: Mon, 4 Sep 2017 17:32:14 +1000
Subject: cc3200: Use standard implementation of keyboard interrupt.

---
 cc3200/misc/mpexception.c | 51 -----------------------------------------------
 cc3200/misc/mpexception.h |  8 --------
 2 files changed, 59 deletions(-)

(limited to 'cc3200/misc')

diff --git a/cc3200/misc/mpexception.c b/cc3200/misc/mpexception.c
index 72b203fae..2dfcbfdef 100644
--- a/cc3200/misc/mpexception.c
+++ b/cc3200/misc/mpexception.c
@@ -32,60 +32,9 @@
 #include "mpexception.h"
 
 
-/******************************************************************************
-DECLARE PRIVATE FUNCTIONS
- ******************************************************************************/
-STATIC void mpexception_set_user_interrupt (int chr, void *data);
-
 /******************************************************************************
 DECLARE EXPORTED DATA
  ******************************************************************************/
 const char mpexception_value_invalid_arguments[]    = "invalid argument(s) value";
 const char mpexception_num_type_invalid_arguments[] = "invalid argument(s) num/type";
 const char mpexception_uncaught[]                   = "uncaught exception";
-
-int   user_interrupt_char = -1;
-
-/******************************************************************************
-DECLARE PRIVATE DATA
- ******************************************************************************/
-STATIC void *user_interrupt_data = NULL;
-
-/******************************************************************************
-DEFINE PUBLIC FUNCTIONS
- ******************************************************************************/
-
-void mpexception_init0 (void) {
-    // Create an exception object for interrupting through the stdin uart
-    MP_STATE_PORT(mp_const_user_interrupt) = mp_obj_new_exception(&mp_type_KeyboardInterrupt);
-    mpexception_set_user_interrupt (-1, MP_STATE_PORT(mp_const_user_interrupt));
-}
-
-void mpexception_set_interrupt_char (int c) {
-    if (c != -1) {
-        mp_obj_exception_clear_traceback(MP_STATE_PORT(mp_const_user_interrupt));
-    }
-    mpexception_set_user_interrupt(c, MP_STATE_PORT(mp_const_user_interrupt));
-}
-
-// Call this function to raise a pending exception during an interrupt.
-// It will try to raise the exception "softly" by setting the
-// mp_pending_exception variable hoping that the VM will notice it.
-void mpexception_nlr_jump (void *o) {
-    if (MP_STATE_PORT(mp_pending_exception) == MP_OBJ_NULL) {
-        MP_STATE_PORT(mp_pending_exception) = o;
-    }
-}
-
-void mpexception_keyboard_nlr_jump (void) {
-    mpexception_nlr_jump (user_interrupt_data);
-}
-
-/******************************************************************************
-DEFINE PRIVATE FUNCTIONS
- ******************************************************************************/
-
-STATIC void mpexception_set_user_interrupt (int chr, void *data) {
-    user_interrupt_char = chr;
-    user_interrupt_data = data;
-}
diff --git a/cc3200/misc/mpexception.h b/cc3200/misc/mpexception.h
index 88134857c..e84a1edb2 100644
--- a/cc3200/misc/mpexception.h
+++ b/cc3200/misc/mpexception.h
@@ -31,12 +31,4 @@ extern const char mpexception_value_invalid_arguments[];
 extern const char mpexception_num_type_invalid_arguments[];
 extern const char mpexception_uncaught[];
 
-extern int        user_interrupt_char;
-
-
-extern void mpexception_init0 (void);
-extern void mpexception_set_interrupt_char (int c);
-extern void mpexception_nlr_jump (void *o);
-extern void mpexception_keyboard_nlr_jump (void);
-
 #endif // MICROPY_INCLUDED_CC3200_MISC_MPEXCEPTION_H
-- 
cgit v1.2.3