stmhal: Make pybstdio usable by other ports, and use it.

Now all ports can use pybstdio.c to provide sys.stdin/stdout/stderr, so
long as they implement mp_hal_stdin_* and mp_hal_stdout_* functions.

9 files changed, 92 insertions, 130 deletions

diff --git a/stmhal/input.c b/stmhal/input.c
index b1c8c1f78..07e7ba35c 100644
--- a/stmhal/input.c
+++ b/stmhal/input.c
@@ -27,7 +27,6 @@
 #include "py/nlr.h"
 #include "py/obj.h"
 #include "readline.h"
-#include "usb.h"
 
 STATIC mp_obj_t mp_builtin_input(uint n_args, const mp_obj_t *args) {
     if (n_args == 1) {
diff --git a/stmhal/main.c b/stmhal/main.c
index 2cb25d864..a53fd05ca 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -57,8 +57,8 @@
 #include "accel.h"
 #include "servo.h"
 #include "dac.h"
-#include "pybstdio.h"
 #include "modnetwork.h"
+#include MICROPY_HAL_H
 
 void SystemClock_Config(void);
 
@@ -86,8 +86,8 @@ void NORETURN __fatal_error(const char *msg) {
     led_state(2, 1);
     led_state(3, 1);
     led_state(4, 1);
-    stdout_tx_strn("\nFATAL ERROR:\n", 14);
-    stdout_tx_strn(msg, strlen(msg));
+    mp_hal_stdout_tx_strn("\nFATAL ERROR:\n", 14);
+    mp_hal_stdout_tx_strn(msg, strlen(msg));
     for (uint i = 0;;) {
         led_toggle(((i++) & 3) + 1);
         for (volatile uint delay = 0; delay < 10000000; delay++) {
@@ -383,7 +383,7 @@ soft_reset:
             MP_OBJ_NEW_SMALL_INT(PYB_UART_6),
             MP_OBJ_NEW_SMALL_INT(115200),
         };
-        pyb_stdio_uart = pyb_uart_type.make_new((mp_obj_t)&pyb_uart_type, MP_ARRAY_SIZE(args), 0, args);
+        MP_STATE_PORT(pyb_stdio_uart) = pyb_uart_type.make_new((mp_obj_t)&pyb_uart_type, MP_ARRAY_SIZE(args), 0, args);
     }
 #else
     MP_STATE_PORT(pyb_stdio_uart) = NULL;
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c
index 179f66fca..40189c1e7 100644
--- a/stmhal/modpyb.c
+++ b/stmhal/modpyb.c
@@ -56,7 +56,6 @@
 #include "dac.h"
 #include "lcd.h"
 #include "usb.h"
-#include "pybstdio.h"
 #include "ff.h"
 #include "diskio.h"
 #include "fsusermount.h"
diff --git a/stmhal/mphal.c b/stmhal/mphal.c
index 093690d59..73df2e626 100644
--- a/stmhal/mphal.c
+++ b/stmhal/mphal.c
@@ -1,8 +1,9 @@
 #include <errno.h>
+#include <string.h>
 
-#include "py/nlr.h"
-#include "py/obj.h"
+#include "py/mpstate.h"
 #include "usb.h"
+#include "uart.h"
 #include "mphal.h"
 
 // this table converts from HAL_StatusTypeDef to POSIX errno
@@ -20,3 +21,51 @@ NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
 void mp_hal_set_interrupt_char(int c) {
     usb_vcp_set_interrupt_char(c);
 }
+
+int mp_hal_stdin_rx_chr(void) {
+    for (;;) {
+#if 0
+#ifdef USE_HOST_MODE
+        pyb_usb_host_process();
+        int c = pyb_usb_host_get_keyboard();
+        if (c != 0) {
+            return c;
+        }
+#endif
+#endif
+
+        byte c;
+        if (usb_vcp_recv_byte(&c) != 0) {
+            return c;
+        } else if (MP_STATE_PORT(pyb_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(pyb_stdio_uart))) {
+            return uart_rx_char(MP_STATE_PORT(pyb_stdio_uart));
+        }
+        __WFI();
+    }
+}
+
+void mp_hal_stdout_tx_str(const char *str) {
+    mp_hal_stdout_tx_strn(str, strlen(str));
+}
+
+void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
+        uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
+    }
+#if 0 && defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
+    lcd_print_strn(str, len);
+#endif
+    if (usb_vcp_is_enabled()) {
+        usb_vcp_send_strn(str, len);
+    }
+}
+
+void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
+    // send stdout to UART and USB CDC VCP
+    if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
+        uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len);
+    }
+    if (usb_vcp_is_enabled()) {
+        usb_vcp_send_strn_cooked(str, len);
+    }
+}
diff --git a/stmhal/mphal.h b/stmhal/mphal.h
index fb567d141..b705facc4 100644
--- a/stmhal/mphal.h
+++ b/stmhal/mphal.h
@@ -11,3 +11,8 @@ extern const byte mp_hal_status_to_errno_table[4];
 
 NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
 void mp_hal_set_interrupt_char(int c); // -1 to disable
+
+int mp_hal_stdin_rx_chr(void);
+void mp_hal_stdout_tx_str(const char *str);
+void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len);
+void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len);
diff --git a/stmhal/printf.c b/stmhal/printf.c
index f7a4f1038..7af4f659d 100644
--- a/stmhal/printf.c
+++ b/stmhal/printf.c
@@ -30,14 +30,14 @@
 
 #include "py/obj.h"
 #include "py/pfenv.h"
-#include "pybstdio.h"
+#include MICROPY_HAL_H
 
 #if MICROPY_PY_BUILTINS_FLOAT
 #include "py/formatfloat.h"
 #endif
 
 STATIC void stdout_print_strn(void *dummy_env, const char *str, mp_uint_t len) {
-    stdout_tx_strn_cooked(str, len);
+    mp_hal_stdout_tx_strn_cooked(str, len);
 }
 
 STATIC const pfenv_t pfenv_stdout = {0, stdout_print_strn};
diff --git a/stmhal/pybstdio.c b/stmhal/pybstdio.c
index d8ccc1be0..6b9904981 100644
--- a/stmhal/pybstdio.c
+++ b/stmhal/pybstdio.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2013, 2014, 2015 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
@@ -25,70 +25,17 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 
-#include "py/mpstate.h"
 #include "py/obj.h"
 #include "py/stream.h"
-#include "usb.h"
-#include "uart.h"
-#include "pybstdio.h"
 #include MICROPY_HAL_H
 
 // TODO make stdin, stdout and stderr writable objects so they can
 // be changed by Python code.  This requires some changes, as these
 // objects are in a read-only module (py/modsys.c).
 
-void stdout_tx_str(const char *str) {
-    stdout_tx_strn(str, strlen(str));
-}
-
-void stdout_tx_strn(const char *str, mp_uint_t len) {
-    if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
-        uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
-    }
-#if 0 && defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
-    lcd_print_strn(str, len);
-#endif
-    if (usb_vcp_is_enabled()) {
-        usb_vcp_send_strn(str, len);
-    }
-}
-
-void stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
-    // send stdout to UART and USB CDC VCP
-    if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
-        uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len);
-    }
-    if (usb_vcp_is_enabled()) {
-        usb_vcp_send_strn_cooked(str, len);
-    }
-}
-
-int stdin_rx_chr(void) {
-    for (;;) {
-#if 0
-#ifdef USE_HOST_MODE
-        pyb_usb_host_process();
-        int c = pyb_usb_host_get_keyboard();
-        if (c != 0) {
-            return c;
-        }
-#endif
-#endif
-
-        byte c;
-        if (usb_vcp_recv_byte(&c) != 0) {
-            return c;
-        } else if (MP_STATE_PORT(pyb_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(pyb_stdio_uart))) {
-            return uart_rx_char(MP_STATE_PORT(pyb_stdio_uart));
-        }
-        __WFI();
-    }
-}
-
 /******************************************************************************/
 // Micro Python bindings
 
@@ -110,7 +57,7 @@ STATIC mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *er
     pyb_stdio_obj_t *self = self_in;
     if (self->fd == STDIO_FD_IN) {
         for (uint i = 0; i < size; i++) {
-            int c = stdin_rx_chr();
+            int c = mp_hal_stdin_rx_chr();
             if (c == '\r') {
                 c = '\n';
             }
@@ -126,7 +73,7 @@ STATIC mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *er
 STATIC mp_uint_t stdio_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     pyb_stdio_obj_t *self = self_in;
     if (self->fd == STDIO_FD_OUT || self->fd == STDIO_FD_ERR) {
-        stdout_tx_strn_cooked(buf, size);
+        mp_hal_stdout_tx_strn_cooked(buf, size);
         return size;
     } else {
         *errcode = EPERM;
@@ -134,10 +81,10 @@ STATIC mp_uint_t stdio_write(mp_obj_t self_in, const void *buf, mp_uint_t size,
     }
 }
 
-mp_obj_t stdio_obj___exit__(mp_uint_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t stdio_obj___exit__(mp_uint_t n_args, const mp_obj_t *args) {
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stdio_obj___exit___obj, 4, 4, stdio_obj___exit__);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stdio_obj___exit___obj, 4, 4, stdio_obj___exit__);
 
 // TODO gc hook to close the file if not already closed
 
@@ -171,10 +118,6 @@ STATIC const mp_obj_type_t stdio_obj_type = {
     .locals_dict = (mp_obj_t)&stdio_locals_dict,
 };
 
-/// \moduleref sys
-/// \constant stdin - standard input (connected to USB VCP, and optional UART object)
-/// \constant stdout - standard output (connected to USB VCP, and optional UART object)
-/// \constant stderr - standard error (connected to USB VCP, and optional UART object)
 const pyb_stdio_obj_t mp_sys_stdin_obj = {{&stdio_obj_type}, .fd = STDIO_FD_IN};
 const pyb_stdio_obj_t mp_sys_stdout_obj = {{&stdio_obj_type}, .fd = STDIO_FD_OUT};
 const pyb_stdio_obj_t mp_sys_stderr_obj = {{&stdio_obj_type}, .fd = STDIO_FD_ERR};
diff --git a/stmhal/pybstdio.h b/stmhal/pybstdio.h
deleted file mode 100644
index 08a2d0363..000000000
--- a/stmhal/pybstdio.h
+++ /dev/null
@@ -1,32 +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.
- */
-
-extern struct _pyb_uart_obj_t *pyb_stdio_uart;
-
-void stdout_tx_str(const char *str);
-void stdout_tx_strn(const char *str, mp_uint_t len);
-void stdout_tx_strn_cooked(const char *str, mp_uint_t len);
-int stdin_rx_chr(void);
diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c
index 992462dd0..27c206ce3 100644
--- a/stmhal/pyexec.c
+++ b/stmhal/pyexec.c
@@ -39,7 +39,6 @@
 #endif
 #include "readline.h"
 #include "pyexec.h"
-#include "pybstdio.h"
 #include "genhdr/py-version.h"
 
 pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
@@ -73,7 +72,7 @@ STATIC int parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t input_ki
         nlr_pop();
         ret = 1;
         if (exec_flags & EXEC_FLAG_PRINT_EOF) {
-            stdout_tx_strn("\x04", 1);
+            mp_hal_stdout_tx_strn("\x04", 1);
         }
     } else {
         // uncaught exception
@@ -81,7 +80,7 @@ STATIC int parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t input_ki
         mp_hal_set_interrupt_char(-1); // disable interrupt
         // print EOF after normal output
         if (exec_flags & EXEC_FLAG_PRINT_EOF) {
-            stdout_tx_strn("\x04", 1);
+            mp_hal_stdout_tx_strn("\x04", 1);
         }
         // check for SystemExit
         if (mp_obj_is_subclass_fast(mp_obj_get_type((mp_obj_t)nlr.ret_val), &mp_type_SystemExit)) {
@@ -110,7 +109,7 @@ STATIC int parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t input_ki
     }
 
     if (exec_flags & EXEC_FLAG_PRINT_EOF) {
-        stdout_tx_strn("\x04", 1);
+        mp_hal_stdout_tx_strn("\x04", 1);
     }
 
     return ret;
@@ -121,19 +120,19 @@ int pyexec_raw_repl(void) {
     vstr_init(&line, 32);
 
 raw_repl_reset:
-    stdout_tx_str("raw REPL; CTRL-B to exit\r\n");
+    mp_hal_stdout_tx_str("raw REPL; CTRL-B to exit\r\n");
 
     for (;;) {
         vstr_reset(&line);
-        stdout_tx_str(">");
+        mp_hal_stdout_tx_str(">");
         for (;;) {
-            int c = stdin_rx_chr();
+            int c = mp_hal_stdin_rx_chr();
             if (c == CHAR_CTRL_A) {
                 // reset raw REPL
                 goto raw_repl_reset;
             } else if (c == CHAR_CTRL_B) {
                 // change to friendly REPL
-                stdout_tx_str("\r\n");
+                mp_hal_stdout_tx_str("\r\n");
                 vstr_clear(&line);
                 pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
                 return 0;
@@ -150,11 +149,11 @@ raw_repl_reset:
         }
 
         // indicate reception of command
-        stdout_tx_str("OK");
+        mp_hal_stdout_tx_str("OK");
 
         if (line.len == 0) {
             // exit for a soft reset
-            stdout_tx_str("\r\n");
+            mp_hal_stdout_tx_str("\r\n");
             vstr_clear(&line);
             return PYEXEC_FORCED_EXIT;
         }
@@ -184,7 +183,7 @@ void pyexec_friendly_repl_init(void) {
     vstr_init(&repl.line, 32);
     repl.cont_line = false;
     readline_init(&repl.line);
-    stdout_tx_str(">>> ");
+    mp_hal_stdout_tx_str(">>> ");
 }
 
 void pyexec_friendly_repl_reset() {
@@ -201,20 +200,20 @@ int pyexec_friendly_repl_process_char(int c) {
         if (ret == CHAR_CTRL_A) {
             // change to raw REPL
             pyexec_mode_kind = PYEXEC_MODE_RAW_REPL;
-            stdout_tx_str("\r\n");
+            mp_hal_stdout_tx_str("\r\n");
             vstr_clear(&repl.line);
             return PYEXEC_SWITCH_MODE;
         } else if (ret == CHAR_CTRL_B) {
             // reset friendly REPL
-            stdout_tx_str("\r\n");
+            mp_hal_stdout_tx_str("\r\n");
             goto friendly_repl_reset;
         } else if (ret == CHAR_CTRL_C) {
             // break
-            stdout_tx_str("\r\n");
+            mp_hal_stdout_tx_str("\r\n");
             goto input_restart;
         } else if (ret == CHAR_CTRL_D) {
             // exit for a soft reset
-            stdout_tx_str("\r\n");
+            mp_hal_stdout_tx_str("\r\n");
             vstr_clear(&repl.line);
             return PYEXEC_FORCED_EXIT;
         } else if (vstr_len(&repl.line) == 0) {
@@ -231,7 +230,7 @@ int pyexec_friendly_repl_process_char(int c) {
 
         vstr_add_byte(&repl.line, '\n');
         repl.cont_line = true;
-        stdout_tx_str("... ");
+        mp_hal_stdout_tx_str("... ");
         readline_note_newline();
         return 0;
 
@@ -239,7 +238,7 @@ int pyexec_friendly_repl_process_char(int c) {
 
         if (ret == CHAR_CTRL_C) {
                 // cancel everything
-                stdout_tx_str("\r\n");
+                mp_hal_stdout_tx_str("\r\n");
                 repl.cont_line = false;
                 goto input_restart;
         } else if (ret == CHAR_CTRL_D) {
@@ -253,7 +252,7 @@ int pyexec_friendly_repl_process_char(int c) {
 
         if (mp_repl_continue_with_input(vstr_null_terminated_str(&repl.line))) {
             vstr_add_byte(&repl.line, '\n');
-            stdout_tx_str("... ");
+            mp_hal_stdout_tx_str("... ");
             readline_note_newline();
             return 0;
         }
@@ -272,7 +271,7 @@ exec: ;
 friendly_repl_reset: // TODO
 input_restart:
         pyexec_friendly_repl_reset();
-        stdout_tx_str(">>> ");
+        mp_hal_stdout_tx_str(">>> ");
         return 0;
     }
 }
@@ -290,8 +289,8 @@ int pyexec_friendly_repl(void) {
 #endif
 
 friendly_repl_reset:
-    stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
-    stdout_tx_str("Type \"help()\" for more information.\r\n");
+    mp_hal_stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
+    mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n");
 
     // to test ctrl-C
     /*
@@ -318,21 +317,21 @@ friendly_repl_reset:
 
         if (ret == CHAR_CTRL_A) {
             // change to raw REPL
-            stdout_tx_str("\r\n");
+            mp_hal_stdout_tx_str("\r\n");
             vstr_clear(&line);
             pyexec_mode_kind = PYEXEC_MODE_RAW_REPL;
             return 0;
         } else if (ret == CHAR_CTRL_B) {
             // reset friendly REPL
-            stdout_tx_str("\r\n");
+            mp_hal_stdout_tx_str("\r\n");
             goto friendly_repl_reset;
         } else if (ret == CHAR_CTRL_C) {
             // break
-            stdout_tx_str("\r\n");
+            mp_hal_stdout_tx_str("\r\n");
             continue;
         } else if (ret == CHAR_CTRL_D) {
             // exit for a soft reset
-            stdout_tx_str("\r\n");
+            mp_hal_stdout_tx_str("\r\n");
             vstr_clear(&line);
             return PYEXEC_FORCED_EXIT;
         } else if (vstr_len(&line) == 0) {
@@ -344,7 +343,7 @@ friendly_repl_reset:
             ret = readline(&line, "... ");
             if (ret == CHAR_CTRL_C) {
                 // cancel everything
-                stdout_tx_str("\r\n");
+                mp_hal_stdout_tx_str("\r\n");
                 goto input_restart;
             } else if (ret == CHAR_CTRL_D) {
                 // stop entering compound statement