From 448e90ba3a9015c075ec22fbddbf2f9f81b571aa Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Wed, 26 Aug 2015 19:59:45 +0200 Subject: [PATCH] Revert "applications: only use uart0 for none-newlib boards" This reverts commit 9c6ab1007b68331f3caed6f75b68ddc087f0f7e0. --- examples/default/main.c | 14 +++----------- examples/gnrc_networking/main.c | 15 +++------------ tests/driver_at86rf2xx/main.c | 12 ++---------- tests/driver_kw2xrf/main.c | 14 +++----------- tests/driver_nrfmin/main.c | 14 +++----------- tests/driver_pcd8544/main.c | 12 ++---------- tests/periph_gpio/main.c | 12 ++---------- tests/periph_i2c/main.c | 15 +++------------ 8 files changed, 21 insertions(+), 87 deletions(-) diff --git a/examples/default/main.c b/examples/default/main.c index 8fddc04f40..df24568dce 100644 --- a/examples/default/main.c +++ b/examples/default/main.c @@ -26,14 +26,10 @@ #include #include "thread.h" -#ifdef MODULE_NEWLIB -# include "uart_stdio.h" -#else -# include "posix_io.h" -# include "board_uart0.h" -#endif +#include "posix_io.h" #include "shell.h" #include "shell_commands.h" +#include "board_uart0.h" #if FEATURE_PERIPH_RTC #include "periph/rtc.h" @@ -46,6 +42,7 @@ int main(void) { shell_t shell; + (void) posix_open(uart0_handler_pid, 0); #ifdef MODULE_LTC4150 ltc4150_start(); @@ -57,12 +54,7 @@ int main(void) (void) puts("Welcome to RIOT!"); -#ifndef MODULE_NEWLIB - (void) posix_open(uart0_handler_pid, 0); shell_init(&shell, NULL, UART0_BUFSIZE, uart0_readc, uart0_putc); -#else - shell_init(&shell, NULL, UART0_BUFSIZE, getchar, putchar); -#endif shell_run(&shell); return 0; diff --git a/examples/gnrc_networking/main.c b/examples/gnrc_networking/main.c index 1508e6769e..b686ad97e2 100644 --- a/examples/gnrc_networking/main.c +++ b/examples/gnrc_networking/main.c @@ -20,14 +20,9 @@ #include -#include "kernel.h" #include "shell.h" -#ifdef MODULE_NEWLIB -# include "uart_stdio.h" -#else -# include "posix_io.h" -# include "board_uart0.h" -#endif +#include "board_uart0.h" +#include "posix_io.h" extern int udp_cmd(int argc, char **argv); @@ -44,12 +39,8 @@ int main(void) /* start shell */ puts("All up, running the shell now"); -#ifndef MODULE_NEWLIB - (void) posix_open(uart0_handler_pid, 0); + posix_open(uart0_handler_pid, 0); shell_init(&shell, shell_commands, UART0_BUFSIZE, uart0_readc, uart0_putc); -#else - shell_init(&shell, shell_commands, UART0_BUFSIZE, getchar, putchar); -#endif shell_run(&shell); /* should be never reached */ diff --git a/tests/driver_at86rf2xx/main.c b/tests/driver_at86rf2xx/main.c index e15a4f0da8..40efb9bbd3 100644 --- a/tests/driver_at86rf2xx/main.c +++ b/tests/driver_at86rf2xx/main.c @@ -22,12 +22,8 @@ #include "shell.h" #include "shell_commands.h" -#ifdef MODULE_NEWLIB -# include "uart_stdio.h" -#else -# include "posix_io.h" -# include "board_uart0.h" -#endif +#include "posix_io.h" +#include "board_uart0.h" #include "net/gnrc/pktdump.h" #include "net/gnrc.h" @@ -54,12 +50,8 @@ int main(void) /* start the shell */ puts("Initialization successful - starting the shell now"); -#ifndef MODULE_NEWLIB (void) posix_open(uart0_handler_pid, 0); shell_init(&shell, NULL, SHELL_BUFSIZE, uart0_readc, uart0_putc); -#else - shell_init(&shell, NULL, SHELL_BUFSIZE, getchar, putchar); -#endif shell_run(&shell); return 0; diff --git a/tests/driver_kw2xrf/main.c b/tests/driver_kw2xrf/main.c index 180c5c2d3b..f3047dfd2b 100644 --- a/tests/driver_kw2xrf/main.c +++ b/tests/driver_kw2xrf/main.c @@ -21,12 +21,8 @@ #include "shell.h" #include "shell_commands.h" -#ifdef MODULE_NEWLIB -# include "uart_stdio.h" -#else -# include "posix_io.h" -# include "board_uart0.h" -#endif +#include "posix_io.h" +#include "board_uart0.h" #include "net/gnrc.h" #include "net/gnrc/pktdump.h" @@ -50,13 +46,9 @@ int main(void) /* start the shell */ puts("Initialization successful - starting the shell now"); -#ifndef MODULE_NEWLIB (void) posix_open(uart0_handler_pid, 0); shell_init(&shell, NULL, SHELL_BUFSIZE, uart0_readc, uart0_putc); -#else - shell_init(&shell, NULL, SHELL_BUFSIZE, getchar, putchar); -#endif - shell_run(&shell); + shell_run(&shell); return 0; } diff --git a/tests/driver_nrfmin/main.c b/tests/driver_nrfmin/main.c index 33ae63c133..3ad26ecb69 100644 --- a/tests/driver_nrfmin/main.c +++ b/tests/driver_nrfmin/main.c @@ -21,12 +21,8 @@ #include #include "shell.h" -#ifdef MODULE_NEWLIB -# include "uart_stdio.h" -#else -# include "posix_io.h" -# include "board_uart0.h" -#endif +#include "posix_io.h" +#include "board_uart0.h" #include "nrfmin.h" #include "net/gnrc.h" #include "net/gnrc/nomac.h" @@ -55,13 +51,9 @@ int main(void) gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &netobj); /* initialize and run the shell */ -#ifndef MODULE_NEWLIB board_uart0_init(); - (void) posix_open(uart0_handler_pid, 0); + posix_open(uart0_handler_pid, 0); shell_init(&shell, NULL, SHELL_BUFSIZE, uart0_readc, uart0_putc); -#else - shell_init(&shell, NULL, SHELL_BUFSIZE, getchar, putchar); -#endif shell_run(&shell); return 0; diff --git a/tests/driver_pcd8544/main.c b/tests/driver_pcd8544/main.c index d77799eb6f..56bbcf2ca6 100644 --- a/tests/driver_pcd8544/main.c +++ b/tests/driver_pcd8544/main.c @@ -35,12 +35,8 @@ #include #include -#ifdef MODULE_NEWLIB -# include "uart_stdio.h" -#else -# include "posix_io.h" -# include "board_uart0.h" -#endif +#include "posix_io.h" +#include "board_uart0.h" #include "shell.h" #include "pcd8544.h" @@ -174,12 +170,8 @@ int main(void) /* run shell */ puts("All OK, running shell now"); -#ifndef MODULE_NEWLIB (void) posix_open(uart0_handler_pid, 0); shell_init(&shell, shell_commands, SHELL_BUFSIZE, uart0_readc, uart0_putc); -#else - shell_init(&shell, shell_commands, SHELL_BUFSIZE, getchar, putchar); -#endif shell_run(&shell); return 0; diff --git a/tests/periph_gpio/main.c b/tests/periph_gpio/main.c index c0939944d5..b34f65d98f 100644 --- a/tests/periph_gpio/main.c +++ b/tests/periph_gpio/main.c @@ -22,12 +22,8 @@ #include #include "shell.h" -#ifdef MODULE_NEWLIB -# include "uart_stdio.h" -#else -# include "posix_io.h" -# include "board_uart0.h" -#endif +#include "posix_io.h" +#include "board_uart0.h" #include "periph/gpio.h" #include "hwtimer.h" @@ -251,12 +247,8 @@ int main(void) " behavior for not existing ports/pins is not defined!"); /* start the shell */ -#ifndef MODULE_NEWLIB (void) posix_open(uart0_handler_pid, 0); shell_init(&shell, shell_commands, SHELL_BUFSIZE, uart0_readc, uart0_putc); -#else - shell_init(&shell, shell_commands, SHELL_BUFSIZE, getchar, putchar); -#endif shell_run(&shell); return 0; diff --git a/tests/periph_i2c/main.c b/tests/periph_i2c/main.c index 714be61ffc..a01780fff4 100644 --- a/tests/periph_i2c/main.c +++ b/tests/periph_i2c/main.c @@ -21,16 +21,11 @@ #include #include -#include "kernel.h" #include "periph_conf.h" #include "periph/i2c.h" #include "shell.h" -#ifdef MODULE_NEWLIB -# include "uart_stdio.h" -#else -# include "posix_io.h" -# include "board_uart0.h" -#endif +#include "posix_io.h" +#include "board_uart0.h" #define BUFSIZE (128U) @@ -315,16 +310,12 @@ int main(void) puts("Test for the low-level I2C driver"); -#ifndef MODULE_NEWLIB /* prepare I/O for shell */ board_uart0_init(); (void) posix_open(uart0_handler_pid, 0); - shell_init(&shell, shell_commands, UART0_BUFSIZE, uart0_readc, uart0_putc); -#else - shell_init(&shell, shell_commands, UART0_BUFSIZE, getchar, putchar); -#endif /* define own shell commands */ + shell_init(&shell, shell_commands, UART0_BUFSIZE, uart0_readc, uart0_putc); shell_run(&shell); return 0;