aboutsummaryrefslogtreecommitdiff
path: root/cc3200
diff options
context:
space:
mode:
Diffstat (limited to 'cc3200')
-rw-r--r--cc3200/application.mk2
-rw-r--r--cc3200/hal/cc3200_hal.c42
-rw-r--r--cc3200/hal/cc3200_hal.h5
-rw-r--r--cc3200/misc/FreeRTOSHooks.c1
-rw-r--r--cc3200/misc/mperror.c7
-rw-r--r--cc3200/mods/modpyb.c1
-rw-r--r--cc3200/mods/modwlan.c1
-rw-r--r--cc3200/mods/pybstdio.c174
-rw-r--r--cc3200/mods/pybstdio.h31
-rw-r--r--cc3200/mods/pybuart.c1
-rw-r--r--cc3200/mptask.c1
-rw-r--r--cc3200/telnet/telnet.c1
12 files changed, 50 insertions, 217 deletions
diff --git a/cc3200/application.mk b/cc3200/application.mk
index d8e7a1ee1..fb6756fc0 100644
--- a/cc3200/application.mk
+++ b/cc3200/application.mk
@@ -91,7 +91,6 @@ APP_MODS_SRC_C = $(addprefix mods/,\
pybextint.c \
pybpin.c \
pybrtc.c \
- pybstdio.c \
pybsystick.c \
pybuart.c \
)
@@ -144,6 +143,7 @@ APP_STM_SRC_C = $(addprefix stmhal/,\
moduselect.c \
printf.c \
pyexec.c \
+ pybstdio.c \
string0.c \
)
diff --git a/cc3200/hal/cc3200_hal.c b/cc3200/hal/cc3200_hal.c
index 8424065c5..cae936776 100644
--- a/cc3200/hal/cc3200_hal.c
+++ b/cc3200/hal/cc3200_hal.c
@@ -30,11 +30,12 @@
******************************************************************************/
#include <stdio.h>
#include <stdint.h>
+#include <string.h>
#include "inc/hw_types.h"
#include "inc/hw_ints.h"
#include "inc/hw_nvic.h"
#include "hw_memmap.h"
-#include "mpconfig.h"
+#include "py/mpstate.h"
#include MICROPY_HAL_H
#include "rom_map.h"
#include "interrupt.h"
@@ -43,6 +44,8 @@
#include "sdhost.h"
#include "pin.h"
#include "mpexception.h"
+#include "telnet.h"
+#include "pybuart.h"
#ifdef USE_FREERTOS
#include "FreeRTOS.h"
@@ -126,6 +129,43 @@ void mp_hal_set_interrupt_char (int c) {
mpexception_set_interrupt_char (c);
}
+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);
+ }
+ // and also to telnet
+ if (telnet_is_active()) {
+ telnet_tx_strn(str, len);
+ }
+}
+
+void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
+ // send stdout to UART
+ if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
+ uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len);
+ }
+ // and also to telnet
+ if (telnet_is_active()) {
+ telnet_tx_strn_cooked(str, len);
+ }
+}
+
+int mp_hal_stdin_rx_chr(void) {
+ for ( ;; ) {
+ if (telnet_rx_any()) {
+ return telnet_rx_char();
+ }
+ 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));
+ }
+ HAL_Delay(1);
+ }
+}
+
/******************************************************************************
DEFINE PRIVATE FUNCTIONS
******************************************************************************/
diff --git a/cc3200/hal/cc3200_hal.h b/cc3200/hal/cc3200_hal.h
index 9562c827e..b738ff669 100644
--- a/cc3200/hal/cc3200_hal.h
+++ b/cc3200/hal/cc3200_hal.h
@@ -63,4 +63,9 @@ extern uint32_t HAL_GetTick(void);
extern void HAL_Delay(uint32_t delay);
extern void mp_hal_set_interrupt_char (int c);
+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);
+
#endif /* CC3200_LAUNCHXL_HAL_CC3200_HAL_H_ */
diff --git a/cc3200/misc/FreeRTOSHooks.c b/cc3200/misc/FreeRTOSHooks.c
index 85dc2f373..4fd5b02ad 100644
--- a/cc3200/misc/FreeRTOSHooks.c
+++ b/cc3200/misc/FreeRTOSHooks.c
@@ -35,7 +35,6 @@
#include "obj.h"
#include "inc/hw_memmap.h"
#include "pybuart.h"
-#include "pybstdio.h"
#include "osi.h"
diff --git a/cc3200/misc/mperror.c b/cc3200/misc/mperror.c
index d85881340..12fd3d8ad 100644
--- a/cc3200/misc/mperror.c
+++ b/cc3200/misc/mperror.c
@@ -37,7 +37,6 @@
#include "obj.h"
#include "inc/hw_memmap.h"
#include "pybuart.h"
-#include "pybstdio.h"
#include "utils.h"
@@ -45,9 +44,9 @@ void NORETURN __fatal_error(const char *msg) {
if (msg != NULL) {
// wait for 20ms
UtilsDelay(UTILS_DELAY_US_TO_COUNT(20000));
- stdout_tx_str("\r\nFATAL ERROR:");
- stdout_tx_str(msg);
- stdout_tx_str("\r\n");
+ mp_hal_stdout_tx_str("\r\nFATAL ERROR:");
+ mp_hal_stdout_tx_str(msg);
+ mp_hal_stdout_tx_str("\r\n");
}
for ( ;; ) {__WFI();}
}
diff --git a/cc3200/mods/modpyb.c b/cc3200/mods/modpyb.c
index fe6ccc561..869adc761 100644
--- a/cc3200/mods/modpyb.c
+++ b/cc3200/mods/modpyb.c
@@ -48,7 +48,6 @@
#include "pyexec.h"
#include "pybuart.h"
#include "pybpin.h"
-#include "pybstdio.h"
#include "pybrtc.h"
#include "pybsystick.h"
#include "simplelink.h"
diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c
index 22b8cae9c..4a1920568 100644
--- a/cc3200/mods/modwlan.c
+++ b/cc3200/mods/modwlan.c
@@ -42,7 +42,6 @@
#include "modwlan.h"
#include "pybioctl.h"
#include "pybuart.h"
-#include "pybstdio.h"
#include "osi.h"
#include "debug.h"
#include "serverstask.h"
diff --git a/cc3200/mods/pybstdio.c b/cc3200/mods/pybstdio.c
deleted file mode 100644
index 2d6a1c07b..000000000
--- a/cc3200/mods/pybstdio.c
+++ /dev/null
@@ -1,174 +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
- * Copyright (c) 2015 Daniel Campora
- *
- * 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.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-
-#include "py/mpstate.h"
-#include "mpconfig.h"
-#include "misc.h"
-#include "qstr.h"
-#include "misc.h"
-#include "obj.h"
-#include "stream.h"
-#include MICROPY_HAL_H
-#include "pybuart.h"
-#include "telnet.h"
-#include "pybstdio.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);
- }
- // and also to telnet
- if (telnet_is_active()) {
- telnet_tx_strn(str, len);
- }
-}
-
-void stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
- // send stdout to UART
- if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
- uart_tx_strn_cooked(MP_STATE_PORT(pyb_stdio_uart), str, len);
- }
- // and also to telnet
- if (telnet_is_active()) {
- telnet_tx_strn_cooked(str, len);
- }
-}
-
-int stdin_rx_chr(void) {
- for ( ;; ) {
- if (telnet_rx_any()) {
- return telnet_rx_char();
- }
- 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));
- }
- HAL_Delay(1);
- }
-}
-
-/******************************************************************************/
-// Micro Python bindings
-
-#define STDIO_FD_IN (0)
-#define STDIO_FD_OUT (1)
-#define STDIO_FD_ERR (2)
-
-typedef struct _pyb_stdio_obj_t {
- mp_obj_base_t base;
- int fd;
-} pyb_stdio_obj_t;
-
-void stdio_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
- pyb_stdio_obj_t *self = self_in;
- print(env, "<io.FileIO %d>", self->fd);
-}
-
-STATIC mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
- 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();
- if (c == '\r') {
- c = '\n';
- }
- ((byte*)buf)[i] = c;
- }
- return size;
- } else {
- *errcode = EPERM;
- return MP_STREAM_ERROR;
- }
-}
-
-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);
- return size;
- } else {
- *errcode = EPERM;
- return MP_STREAM_ERROR;
- }
-}
-
-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__);
-
-// TODO gc hook to close the file if not already closed
-
-STATIC const mp_map_elem_t stdio_locals_dict_table[] = {
- { MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&mp_stream_read_obj },
- { MP_OBJ_NEW_QSTR(MP_QSTR_readall), (mp_obj_t)&mp_stream_readall_obj },
- { MP_OBJ_NEW_QSTR(MP_QSTR_readline), (mp_obj_t)&mp_stream_unbuffered_readline_obj},
- { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&mp_stream_write_obj },
- { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&mp_identity_obj },
- { MP_OBJ_NEW_QSTR(MP_QSTR___del__), (mp_obj_t)&mp_identity_obj },
- { MP_OBJ_NEW_QSTR(MP_QSTR___enter__), (mp_obj_t)&mp_identity_obj },
- { MP_OBJ_NEW_QSTR(MP_QSTR___exit__), (mp_obj_t)&stdio_obj___exit___obj },
-};
-
-STATIC MP_DEFINE_CONST_DICT(stdio_locals_dict, stdio_locals_dict_table);
-
-STATIC const mp_stream_p_t stdio_obj_stream_p = {
- .read = stdio_read,
- .write = stdio_write,
- .is_text = true,
-};
-
-STATIC const mp_obj_type_t stdio_obj_type = {
- { &mp_type_type },
- .name = MP_QSTR_FileIO,
- // TODO .make_new?
- .print = stdio_obj_print,
- .getiter = mp_identity,
- .iternext = mp_stream_unbuffered_iter,
- .stream_p = &stdio_obj_stream_p,
- .locals_dict = (mp_obj_t)&stdio_locals_dict,
-};
-
-/// \moduleref sys
-/// \constant stdin - standard input (connected to UART0, or to telnet, configurable)
-/// \constant stdout - standard output (connected to UART0, and optionally to telnet)
-/// \constant stderr - standard error (connected to UART0, and optionally to telnet)
-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/cc3200/mods/pybstdio.h b/cc3200/mods/pybstdio.h
deleted file mode 100644
index f987e8bc4..000000000
--- a/cc3200/mods/pybstdio.h
+++ /dev/null
@@ -1,31 +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
- * Copyright (c) 2015 Daniel Campora
- *
- * 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.
- */
-
-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/cc3200/mods/pybuart.c b/cc3200/mods/pybuart.c
index 359d97d70..b612295c3 100644
--- a/cc3200/mods/pybuart.c
+++ b/cc3200/mods/pybuart.c
@@ -53,7 +53,6 @@
#include "pin.h"
#include "pybuart.h"
#include "pybioctl.h"
-#include "pybstdio.h"
#include "mpexception.h"
#include "osi.h"
diff --git a/cc3200/mptask.c b/cc3200/mptask.c
index 03cac6ed3..78eaa76f0 100644
--- a/cc3200/mptask.c
+++ b/cc3200/mptask.c
@@ -44,7 +44,6 @@
#include "pybuart.h"
#include "pybpin.h"
#include "pybrtc.h"
-#include "pybstdio.h"
#include "pyexec.h"
#include "gccollect.h"
#include "gchelper.h"
diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c
index 64c480580..5ea72b280 100644
--- a/cc3200/telnet/telnet.c
+++ b/cc3200/telnet/telnet.c
@@ -39,7 +39,6 @@
#include "debug.h"
#include "mpexception.h"
#include "serverstask.h"
-#include "pybstdio.h"
#include "genhdr/py-version.h"
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-17 20:00:53 +0000