From 2ab55174a7b8cf4e38a9e251545fe649544b780a Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 6 Feb 2014 12:29:02 +0100 Subject: [PATCH 1/5] model uart dependency on posix --- Makefile.dep | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.dep b/Makefile.dep index 43a8c4831f..c4acbeb2a2 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -20,6 +20,9 @@ ifneq (,$(findstring uart0,$(USEMODULE))) ifeq (,$(findstring lib,$(USEMODULE))) USEMODULE += lib endif + ifeq (,$(findstring posix,$(USEMODULE))) + USEMODULE += posix + endif endif ifneq (,$(findstring cc110x,$(USEMODULE))) From 87a7211e599e556b4b374c4d764419e49162d964 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 6 Feb 2014 12:29:18 +0100 Subject: [PATCH 2/5] remove trailing newlines --- sys/uart0/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/uart0/Makefile b/sys/uart0/Makefile index 4d873e0393..04f1ef49f3 100644 --- a/sys/uart0/Makefile +++ b/sys/uart0/Makefile @@ -1,5 +1,3 @@ -MODULE =uart0 +MODULE = uart0 include $(MAKEBASE)/Makefile.base - - From c6be9ad3fc864e57e7a683a069e730dc93012484 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 6 Feb 2014 12:31:06 +0100 Subject: [PATCH 3/5] remove superfluous uart USEMODULEs from examples --- examples/ccn-lite-client/Makefile | 1 - examples/ccn-lite-relay/Makefile | 1 - examples/default/Makefile | 1 - examples/rpl_udp/Makefile | 1 - 4 files changed, 4 deletions(-) diff --git a/examples/ccn-lite-client/Makefile b/examples/ccn-lite-client/Makefile index 4d981d5359..b7b843db84 100644 --- a/examples/ccn-lite-client/Makefile +++ b/examples/ccn-lite-client/Makefile @@ -36,7 +36,6 @@ export QUIET ?= 1 USEMODULE += config USEMODULE += shell USEMODULE += shell_commands -USEMODULE += uart0 USEMODULE += posix USEMODULE += ps USEMODULE += auto_init diff --git a/examples/ccn-lite-relay/Makefile b/examples/ccn-lite-relay/Makefile index 4c0e61113f..6bff29cfa9 100644 --- a/examples/ccn-lite-relay/Makefile +++ b/examples/ccn-lite-relay/Makefile @@ -34,7 +34,6 @@ export QUIET ?= 1 # Modules to include: USEMODULE += config -USEMODULE += uart0 USEMODULE += posix USEMODULE += auto_init USEMODULE += hwtimer diff --git a/examples/default/Makefile b/examples/default/Makefile index 372aeb2a0f..336ad79fe1 100644 --- a/examples/default/Makefile +++ b/examples/default/Makefile @@ -34,7 +34,6 @@ export QUIET ?= 1 # Modules to include: USEMODULE += posix -USEMODULE += uart0 USEMODULE += shell USEMODULE += shell_commands USEMODULE += ps diff --git a/examples/rpl_udp/Makefile b/examples/rpl_udp/Makefile index 96dd0621a5..f6c82e3e29 100644 --- a/examples/rpl_udp/Makefile +++ b/examples/rpl_udp/Makefile @@ -39,7 +39,6 @@ CFLAGS += "-Wno-cpp" USEMODULE += auto_init USEMODULE += shell USEMODULE += shell_commands -USEMODULE += uart0 USEMODULE += posix USEMODULE += ps USEMODULE += vtimer From 8815d223908c7c9d601cbd1068d2f455e7365c60 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 6 Feb 2014 12:33:44 +0100 Subject: [PATCH 4/5] remove superfluous uart USEMODULEs from test --- tests/test_irq/Makefile | 1 - tests/test_shell/Makefile | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/test_irq/Makefile b/tests/test_irq/Makefile index e68aaf89ec..aadfbd61d3 100644 --- a/tests/test_irq/Makefile +++ b/tests/test_irq/Makefile @@ -18,7 +18,6 @@ else USEMODULE += auto_init USEMODULE += hwtimer -USEMODULE += uart0 USEMODULE += posix include $(RIOTBASE)/Makefile.include diff --git a/tests/test_shell/Makefile b/tests/test_shell/Makefile index 81de89a770..d09f7efc12 100644 --- a/tests/test_shell/Makefile +++ b/tests/test_shell/Makefile @@ -12,7 +12,6 @@ export RIOTBASE = $(CURDIR)/../.. USEMODULE += shell USEMODULE += shell_commands USEMODULE += ps -USEMODULE += uart0 USEMODULE += posix include $(RIOTBASE)/Makefile.include From b6c8ceb57cf86a742ddf66d8abfee9a38f8935ae Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Thu, 6 Feb 2014 12:34:42 +0100 Subject: [PATCH 5/5] update test_shell/ReadMe.txt --- tests/test_shell/ReadMe.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_shell/ReadMe.txt b/tests/test_shell/ReadMe.txt index 130c898e6c..55266ba493 100644 --- a/tests/test_shell/ReadMe.txt +++ b/tests/test_shell/ReadMe.txt @@ -1,13 +1,13 @@ This project shows how to use own or the system shell commands. In order to use the system shell commands: -1. Additionally to the module: shell, shell_commands, uart0 and posix, +1. Additionally to the module: shell, shell_commands and posix, the module for the corresponding system command is to include, e.g. module ps for the ps command (cf. the Makefile in the project root directory). 2. The shell must be initialized as follows: 2.1 shell_t sys_shell; - 2.2 shell_init(&shell, shell_commands, shell_bufsize shell_readc, + 2.2 shell_init(&shell, shell_commands, shell_bufsize, shell_readc, shell_putchar); or shell_init(&sys_shell, NULL, shell_bufsize, shell_readc, shell_putchar);