summaryrefslogtreecommitdiffstatshomepage
path: root/stmhal
diff options
context:
space:
mode:
Diffstat (limited to 'stmhal')
-rw-r--r--stmhal/main.c2
-rw-r--r--stmhal/modpyb.c2
-rw-r--r--stmhal/pyexec.h43
3 files changed, 2 insertions, 45 deletions
diff --git a/stmhal/main.c b/stmhal/main.c
index de52cac8fe..f6d6ada703 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -36,13 +36,13 @@
#include "py/gc.h"
#include "py/mphal.h"
+#include "lib/utils/pyexec.h"
#include "lib/fatfs/ff.h"
#include "systick.h"
#include "pendsv.h"
#include "gccollect.h"
#include "readline.h"
-#include "pyexec.h"
#include "i2c.h"
#include "spi.h"
#include "uart.h"
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c
index b7df53f674..e8dcd57a0f 100644
--- a/stmhal/modpyb.c
+++ b/stmhal/modpyb.c
@@ -33,12 +33,12 @@
#include "py/nlr.h"
#include "py/obj.h"
#include "py/gc.h"
+#include "lib/utils/pyexec.h"
#include "lib/fatfs/ff.h"
#include "lib/fatfs/diskio.h"
#include "gccollect.h"
#include "irq.h"
#include "systick.h"
-#include "pyexec.h"
#include "led.h"
#include "pin.h"
#include "timer.h"
diff --git a/stmhal/pyexec.h b/stmhal/pyexec.h
deleted file mode 100644
index 0728b91333..0000000000
--- a/stmhal/pyexec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-typedef enum {
- PYEXEC_MODE_RAW_REPL,
- PYEXEC_MODE_FRIENDLY_REPL,
-} pyexec_mode_kind_t;
-
-extern pyexec_mode_kind_t pyexec_mode_kind;
-
-#define PYEXEC_FORCED_EXIT (0x100)
-#define PYEXEC_SWITCH_MODE (0x200)
-
-int pyexec_raw_repl(void);
-int pyexec_friendly_repl(void);
-int pyexec_file(const char *filename);
-void pyexec_event_repl_init(void);
-int pyexec_event_repl_process_char(int c);
-
-MP_DECLARE_CONST_FUN_OBJ(pyb_set_repl_info_obj);