djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zephyr: Rename CONFIG_CONSOLE_PULL to CONFIG_CONSOLE_SUBSYS.

Browse Source 
Following a similar change in the Zephyr Project.
This commit is contained in:
Damien George 2018-06-27 15:33:59 +10:00
parent 11a7a70a6f
commit 05e0103e9e
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/zephyr/prj_base.conf
View File

@ -5,7 +5,7 @@ CONFIG_STDOUT_CONSOLE=y
CONFIG_CONSOLE_HANDLER=y CONFIG_CONSOLE_HANDLER=y
CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS=y CONFIG_UART_CONSOLE_DEBUG_SERVER_HOOKS=y
CONFIG_CONSOLE_PULL=y CONFIG_CONSOLE_SUBSYS=y
CONFIG_CONSOLE_GETCHAR=y CONFIG_CONSOLE_GETCHAR=y
CONFIG_CONSOLE_GETCHAR_BUFSIZE=128 CONFIG_CONSOLE_GETCHAR_BUFSIZE=128
CONFIG_CONSOLE_PUTCHAR_BUFSIZE=128 CONFIG_CONSOLE_PUTCHAR_BUFSIZE=128

2
ports/zephyr/prj_qemu_cortex_m3.conf
View File

@ -1,6 +1,6 @@
# Interrupt-driven UART console has emulation artifacts under QEMU, # Interrupt-driven UART console has emulation artifacts under QEMU,
# disable it # disable it
CONFIG_CONSOLE_PULL=n CONFIG_CONSOLE_SUBSYS=n
# Networking drivers # Networking drivers
# SLIP driver for QEMU # SLIP driver for QEMU

2
ports/zephyr/prj_qemu_x86.conf
View File

@ -1,6 +1,6 @@
# Interrupt-driven UART console has emulation artifacts under QEMU, # Interrupt-driven UART console has emulation artifacts under QEMU,
# disable it # disable it
CONFIG_CONSOLE_PULL=n CONFIG_CONSOLE_SUBSYS=n
# Networking drivers # Networking drivers
# SLIP driver for QEMU # SLIP driver for QEMU

2
ports/zephyr/src/zephyr_start.c
View File

@ -30,7 +30,7 @@
int real_main(void); int real_main(void);
void main(void) { void main(void) {
#ifdef CONFIG_CONSOLE_PULL #ifdef CONFIG_CONSOLE_SUBSYS
console_init(); console_init();
#else #else
zephyr_getchar_init(); zephyr_getchar_init();

4
ports/zephyr/uart_core.c
View File

@ -36,7 +36,7 @@
// Receive single character // Receive single character
int mp_hal_stdin_rx_chr(void) { int mp_hal_stdin_rx_chr(void) {
#ifdef CONFIG_CONSOLE_PULL #ifdef CONFIG_CONSOLE_SUBSYS
return console_getchar(); return console_getchar();
#else #else
return zephyr_getchar(); return zephyr_getchar();
@ -45,7 +45,7 @@ int mp_hal_stdin_rx_chr(void) {
// Send string of given length // Send string of given length
void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) { void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
#ifdef CONFIG_CONSOLE_PULL #ifdef CONFIG_CONSOLE_SUBSYS
while (len--) { while (len--) {
char c = *str++; char c = *str++;
while (console_putchar(c) == -1) { while (console_putchar(c) == -1) {