Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

shell: uart0 newlib distinction (workaround) #3690

Merged
merged 2 commits into from
Aug 25, 2015
Merged

shell: uart0 newlib distinction (workaround) #3690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be95b87
make: use uart0 for shell on none-newlib platforms
OlegHahm Aug 4, 2015
9c6ab10
applications: only use uart0 for none-newlib boards
OlegHahm Aug 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,15 @@ ifneq (,$(filter gnrc_pktbuf_%, $(USEMODULE)))
USEMODULE += gnrc_pktbuf # make MODULE_GNRC_PKTBUF macro available for all implementations
endif

ifneq (,$(filter newlib,$(USEMODULE)))
USEMODULE += uart_stdio
else
ifneq (,$(filter shell,$(USEMODULE)))
USEMODULE += uart0
endif
endif


ifneq (,$(filter uart0,$(USEMODULE)))
USEMODULE += posix
endif
Expand Down Expand Up @@ -239,10 +248,6 @@ ifneq (,$(filter cpp11-compat,$(USEMODULE)))
FEATURES_REQUIRED += cpp
endif

ifneq (,$(filter newlib,$(USEMODULE)))
USEMODULE += uart_stdio
endif

ifneq (,$(filter gnrc_netdev_eth,$(USEMODULE)))
USEMODULE += gnrc_pktbuf
endif
Expand Down
14 changes: 11 additions & 3 deletions examples/default/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,14 @@
#include <string.h>

#include "thread.h"
#include "posix_io.h"
#ifdef MODULE_NEWLIB
# include "uart_stdio.h"
#else
# include "posix_io.h"
# include "board_uart0.h"
#endif
#include "shell.h"
#include "shell_commands.h"
#include "board_uart0.h"

#if FEATURE_PERIPH_RTC
#include "periph/rtc.h"
Expand All @@ -42,7 +46,6 @@
int main(void)
{
shell_t shell;
(void) posix_open(uart0_handler_pid, 0);

#ifdef MODULE_LTC4150
ltc4150_start();
Expand All @@ -54,7 +57,12 @@ 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;
Expand Down
17 changes: 13 additions & 4 deletions examples/gnrc_networking/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@

#include <stdio.h>

#include "kernel.h"
#include "shell.h"
#include "board_uart0.h"
#include "posix_io.h"
#ifdef MODULE_NEWLIB
# include "uart_stdio.h"
#else
# include "posix_io.h"
# include "board_uart0.h"
#endif

extern int udp_cmd(int argc, char **argv);

Expand All @@ -39,8 +44,12 @@ int main(void)

/* start shell */
puts("All up, running the shell now");
posix_open(uart0_handler_pid, 0);
shell_init(&shell, shell_commands, UART0_BUFSIZE, uart0_readc, uart0_putc);
#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);

/* should be never reached */
Expand Down
12 changes: 10 additions & 2 deletions tests/driver_at86rf2xx/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@

#include "shell.h"
#include "shell_commands.h"
#include "posix_io.h"
#include "board_uart0.h"
#ifdef MODULE_NEWLIB
# include "uart_stdio.h"
#else
# include "posix_io.h"
# include "board_uart0.h"
#endif
#include "net/gnrc/pktdump.h"
#include "net/gnrc.h"

Expand All @@ -50,8 +54,12 @@ 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;
Expand Down
14 changes: 11 additions & 3 deletions tests/driver_kw2xrf/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@

#include "shell.h"
#include "shell_commands.h"
#include "posix_io.h"
#include "board_uart0.h"
#ifdef MODULE_NEWLIB
# include "uart_stdio.h"
#else
# include "posix_io.h"
# include "board_uart0.h"
#endif
#include "net/gnrc.h"
#include "net/gnrc/pktdump.h"

Expand All @@ -46,9 +50,13 @@ 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);
shell_run(&shell);
#else
shell_init(&shell, NULL, SHELL_BUFSIZE, getchar, putchar);
#endif
shell_run(&shell);

return 0;
}
14 changes: 11 additions & 3 deletions tests/driver_nrfmin/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@
#include <stdio.h>

#include "shell.h"
#include "posix_io.h"
#include "board_uart0.h"
#ifdef MODULE_NEWLIB
# include "uart_stdio.h"
#else
# include "posix_io.h"
# include "board_uart0.h"
#endif
#include "nrfmin.h"
#include "net/gnrc.h"
#include "net/gnrc/nomac.h"
Expand Down Expand Up @@ -51,9 +55,13 @@ int main(void)
gnrc_netreg_register(GNRC_NETTYPE_UNDEF, &netobj);

/* initialize and run the shell */
#ifndef MODULE_NEWLIB
board_uart0_init();
posix_open(uart0_handler_pid, 0);
(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;
Expand Down
14 changes: 11 additions & 3 deletions tests/driver_pcd8544/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@
#include <string.h>
#include <stdlib.h>

#include "posix_io.h"
#include "board_uart0.h"
#ifdef MODULE_NEWLIB
# include "uart_stdio.h"
#else
# include "posix_io.h"
# include "board_uart0.h"
#endif
#include "shell.h"
#include "pcd8544.h"

Expand Down Expand Up @@ -170,8 +174,12 @@ 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);
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;
Expand Down
14 changes: 11 additions & 3 deletions tests/periph_gpio/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@
#include <stdlib.h>

#include "shell.h"
#include "posix_io.h"
#include "board_uart0.h"
#ifdef MODULE_NEWLIB
# include "uart_stdio.h"
#else
# include "posix_io.h"
# include "board_uart0.h"
#endif
#include "periph/gpio.h"
#include "hwtimer.h"

Expand Down Expand Up @@ -247,8 +251,12 @@ 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);
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;
Expand Down
17 changes: 13 additions & 4 deletions tests/periph_i2c/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,16 @@
#include <stdio.h>
#include <stdlib.h>

#include "kernel.h"
#include "periph_conf.h"
#include "periph/i2c.h"
#include "shell.h"
#include "posix_io.h"
#include "board_uart0.h"
#ifdef MODULE_NEWLIB
# include "uart_stdio.h"
#else
# include "posix_io.h"
# include "board_uart0.h"
#endif

#define BUFSIZE (128U)

Expand Down Expand Up @@ -310,12 +315,16 @@ int main(void)

puts("Test for the low-level I2C driver");

#ifndef MODULE_NEWLIB
/* prepare I/O for shell */
board_uart0_init();
posix_open(uart0_handler_pid, 0);
(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

/* define own shell commands */
shell_init(&shell, shell_commands, UART0_BUFSIZE, uart0_readc, uart0_putc);
shell_run(&shell);

return 0;
Expand Down