Shell reorganization.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8913 35acf78f-673a-0410-8e92-d51de3d6d3f4

8 files changed, 403 insertions, 97 deletions

diff --git a/os/various/cpp_wrappers/chcpp.mk b/os/various/cpp_wrappers/chcpp.mk
index 9eb4885bc..64f931586 100644
--- a/os/various/cpp_wrappers/chcpp.mk
+++ b/os/various/cpp_wrappers/chcpp.mk
@@ -1,5 +1,5 @@
 # C++ wrapper files.

-CHCPPSRC = ${CHIBIOS}/os/various/cpp_wrappers/ch.cpp \

-           ${CHIBIOS}/os/various/cpp_wrappers/syscalls_cpp.cpp

+CHCPPSRC = $(CHIBIOS)/os/various/cpp_wrappers/ch.cpp \

+           $(CHIBIOS)/os/various/cpp_wrappers/syscalls_cpp.cpp

 

-CHCPPINC = ${CHIBIOS}/os/various/cpp_wrappers

+CHCPPINC = $(CHIBIOS)/os/various/cpp_wrappers

diff --git a/os/various/fatfs_bindings/fatfs.mk b/os/various/fatfs_bindings/fatfs.mk
index d395db860..b5441d026 100644
--- a/os/various/fatfs_bindings/fatfs.mk
+++ b/os/various/fatfs_bindings/fatfs.mk
@@ -1,7 +1,7 @@
 # FATFS files.

-FATFSSRC = ${CHIBIOS}/os/various/fatfs_bindings/fatfs_diskio.c \

-           ${CHIBIOS}/os/various/fatfs_bindings/fatfs_syscall.c \

-           ${CHIBIOS}/ext/fatfs/src/ff.c \

-           ${CHIBIOS}/ext/fatfs/src/option/unicode.c

+FATFSSRC = $(CHIBIOS)/os/various/fatfs_bindings/fatfs_diskio.c \

+           $(CHIBIOS)/os/various/fatfs_bindings/fatfs_syscall.c \

+           $(CHIBIOS)/ext/fatfs/src/ff.c \

+           $(CHIBIOS)/ext/fatfs/src/option/unicode.c

 

-FATFSINC = ${CHIBIOS}/ext/fatfs/src

+FATFSINC = $(CHIBIOS)/ext/fatfs/src

diff --git a/os/various/lwip_bindings/lwip.mk b/os/various/lwip_bindings/lwip.mk
index afaaf1454..2ab332a09 100644
--- a/os/various/lwip_bindings/lwip.mk
+++ b/os/various/lwip_bindings/lwip.mk
@@ -1,54 +1,54 @@
 # List of the required lwIP files.

-LWIP = 	${CHIBIOS}/ext/lwip

+LWIP = 	$(CHIBIOS)/ext/lwip

 

 LWBINDSRC = \

         $(CHIBIOS)/os/various/lwip_bindings/lwipthread.c \

         $(CHIBIOS)/os/various/lwip_bindings/arch/sys_arch.c

 

 LWNETIFSRC = \

-        ${LWIP}/src/netif/etharp.c

+        $(LWIP)/src/netif/etharp.c

 

 LWCORESRC = \

-        ${LWIP}/src/core/dhcp.c \

-        ${LWIP}/src/core/dns.c \

-        ${LWIP}/src/core/init.c \

-        ${LWIP}/src/core/mem.c \

-        ${LWIP}/src/core/memp.c \

-        ${LWIP}/src/core/netif.c \

-        ${LWIP}/src/core/pbuf.c \

-        ${LWIP}/src/core/raw.c \

-        ${LWIP}/src/core/stats.c \

-        ${LWIP}/src/core/sys.c \

-        ${LWIP}/src/core/tcp.c \

-        ${LWIP}/src/core/tcp_in.c \

-        ${LWIP}/src/core/tcp_out.c \

-        ${LWIP}/src/core/udp.c

+        $(LWIP)/src/core/dhcp.c \

+        $(LWIP)/src/core/dns.c \

+        $(LWIP)/src/core/init.c \

+        $(LWIP)/src/core/mem.c \

+        $(LWIP)/src/core/memp.c \

+        $(LWIP)/src/core/netif.c \

+        $(LWIP)/src/core/pbuf.c \

+        $(LWIP)/src/core/raw.c \

+        $(LWIP)/src/core/stats.c \

+        $(LWIP)/src/core/sys.c \

+        $(LWIP)/src/core/tcp.c \

+        $(LWIP)/src/core/tcp_in.c \

+        $(LWIP)/src/core/tcp_out.c \

+        $(LWIP)/src/core/udp.c

 

 LWIPV4SRC = \

-        ${LWIP}/src/core/ipv4/autoip.c \

-        ${LWIP}/src/core/ipv4/icmp.c \

-        ${LWIP}/src/core/ipv4/igmp.c \

-        ${LWIP}/src/core/ipv4/inet.c \

-        ${LWIP}/src/core/ipv4/inet_chksum.c \

-        ${LWIP}/src/core/ipv4/ip.c \

-        ${LWIP}/src/core/ipv4/ip_addr.c \

-        ${LWIP}/src/core/ipv4/ip_frag.c \

-        ${LWIP}/src/core/def.c \

-        ${LWIP}/src/core/timers.c

+        $(LWIP)/src/core/ipv4/autoip.c \

+        $(LWIP)/src/core/ipv4/icmp.c \

+        $(LWIP)/src/core/ipv4/igmp.c \

+        $(LWIP)/src/core/ipv4/inet.c \

+        $(LWIP)/src/core/ipv4/inet_chksum.c \

+        $(LWIP)/src/core/ipv4/ip.c \

+        $(LWIP)/src/core/ipv4/ip_addr.c \

+        $(LWIP)/src/core/ipv4/ip_frag.c \

+        $(LWIP)/src/core/def.c \

+        $(LWIP)/src/core/timers.c

 

 LWAPISRC = \

-        ${LWIP}/src/api/api_lib.c \

-        ${LWIP}/src/api/api_msg.c \

-        ${LWIP}/src/api/err.c \

-        ${LWIP}/src/api/netbuf.c \

-        ${LWIP}/src/api/netdb.c \

-        ${LWIP}/src/api/netifapi.c \

-        ${LWIP}/src/api/sockets.c \

-        ${LWIP}/src/api/tcpip.c

+        $(LWIP)/src/api/api_lib.c \

+        $(LWIP)/src/api/api_msg.c \

+        $(LWIP)/src/api/err.c \

+        $(LWIP)/src/api/netbuf.c \

+        $(LWIP)/src/api/netdb.c \

+        $(LWIP)/src/api/netifapi.c \

+        $(LWIP)/src/api/sockets.c \

+        $(LWIP)/src/api/tcpip.c

 

 LWSRC = $(LWBINDSRC) $(LWNETIFSRC) $(LWCORESRC) $(LWIPV4SRC) $(LWAPISRC)

 

 LWINC = \

         $(CHIBIOS)/os/various/lwip_bindings \

-        ${LWIP}/src/include \

-        ${LWIP}/src/include/ipv4

+        $(LWIP)/src/include \

+        $(LWIP)/src/include/ipv4

diff --git a/os/various/shell.c b/os/various/shell/shell.c
index a60f9b479..379b6ddf0 100644
--- a/os/various/shell.c
+++ b/os/various/shell/shell.c
@@ -27,13 +27,34 @@
 #include "ch.h"

 #include "hal.h"

 #include "shell.h"

+#include "shell_cmd.h"

 #include "chprintf.h"

 

+/*===========================================================================*/

+/* Module local definitions.                                                 */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module exported variables.                                                */

+/*===========================================================================*/

+

 /**

  * @brief   Shell termination event source.

  */

 event_source_t shell_terminated;

 

+/*===========================================================================*/

+/* Module local types.                                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module local variables.                                                   */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module local functions.                                                   */

+/*===========================================================================*/

+

 static char *_strtok(char *str, const char *delim, char **saveptr) {

   char *token;

   if (str)

@@ -64,57 +85,6 @@ static void list_commands(BaseSequentialStream *chp, const ShellCommand *scp) {
   }

 }

 

-static void cmd_info(BaseSequentialStream *chp, int argc, char *argv[]) {

-

-  (void)argv;

-  if (argc > 0) {

-    usage(chp, "info");

-    return;

-  }

-

-  chprintf(chp, "Kernel:       %s\r\n", CH_KERNEL_VERSION);

-#ifdef PORT_COMPILER_NAME

-  chprintf(chp, "Compiler:     %s\r\n", PORT_COMPILER_NAME);

-#endif

-  chprintf(chp, "Architecture: %s\r\n", PORT_ARCHITECTURE_NAME);

-#ifdef PORT_CORE_VARIANT_NAME

-  chprintf(chp, "Core Variant: %s\r\n", PORT_CORE_VARIANT_NAME);

-#endif

-#ifdef PORT_INFO

-  chprintf(chp, "Port Info:    %s\r\n", PORT_INFO);

-#endif

-#ifdef PLATFORM_NAME

-  chprintf(chp, "Platform:     %s\r\n", PLATFORM_NAME);

-#endif

-#ifdef BOARD_NAME

-  chprintf(chp, "Board:        %s\r\n", BOARD_NAME);

-#endif

-#ifdef __DATE__

-#ifdef __TIME__

-  chprintf(chp, "Build time:   %s%s%s\r\n", __DATE__, " - ", __TIME__);

-#endif

-#endif

-}

-

-static void cmd_systime(BaseSequentialStream *chp, int argc, char *argv[]) {

-

-  (void)argv;

-  if (argc > 0) {

-    usage(chp, "systime");

-    return;

-  }

-  chprintf(chp, "%lu\r\n", (unsigned long)chVTGetSystemTime());

-}

-

-/**

- * @brief   Array of the default commands.

- */

-static ShellCommand local_commands[] = {

-  {"info", cmd_info},

-  {"systime", cmd_systime},

-  {NULL, NULL}

-};

-

 static bool cmdexec(const ShellCommand *scp, BaseSequentialStream *chp,

                       char *name, int argc, char *argv[]) {

 

@@ -128,6 +98,10 @@ static bool cmdexec(const ShellCommand *scp, BaseSequentialStream *chp,
   return true;

 }

 

+/*===========================================================================*/

+/* Module exported functions.                                                */

+/*===========================================================================*/

+

 /**

  * @brief   Shell thread function.

  *

@@ -174,12 +148,12 @@ THD_FUNCTION(shellThread, p) {
           continue;

         }

         chprintf(chp, "Commands: help exit ");

-        list_commands(chp, local_commands);

+        list_commands(chp, shell_local_commands);

         if (scp != NULL)

           list_commands(chp, scp);

         chprintf(chp, "\r\n");

       }

-      else if (cmdexec(local_commands, chp, cmd, n, args) &&

+      else if (cmdexec(shell_local_commands, chp, cmd, n, args) &&

           ((scp == NULL) || cmdexec(scp, chp, cmd, n, args))) {

         chprintf(chp, "%s", cmd);

         chprintf(chp, " ?\r\n");

diff --git a/os/various/shell.h b/os/various/shell/shell.h
index 9ee73d4dc..f6607cb43 100644
--- a/os/various/shell.h
+++ b/os/various/shell/shell.h
@@ -25,6 +25,14 @@
 #ifndef _SHELL_H_

 #define _SHELL_H_

 

+/*===========================================================================*/

+/* Module constants.                                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module pre-compile time settings.                                         */

+/*===========================================================================*/

+

 /**

  * @brief   Shell maximum input line length.

  */

@@ -39,6 +47,14 @@
 #define SHELL_MAX_ARGUMENTS         4

 #endif

 

+/*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module data structures and types.                                         */

+/*===========================================================================*/

+

 /**

  * @brief   Command handler function type.

  */

@@ -62,6 +78,14 @@ typedef struct {
                                                  table.                     */

 } ShellConfig;

 

+/*===========================================================================*/

+/* Module macros.                                                            */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

 #if !defined(__DOXYGEN__)

 extern event_source_t shell_terminated;

 #endif

@@ -77,6 +101,10 @@ extern "C" {
 }

 #endif

 

+/*===========================================================================*/

+/* Module inline functions.                                                  */

+/*===========================================================================*/

+

 #endif /* _SHELL_H_ */

 

 /** @} */

diff --git a/os/various/shell/shell.mk b/os/various/shell/shell.mk
new file mode 100644
index 000000000..de735d516
--- /dev/null
+++ b/os/various/shell/shell.mk
@@ -0,0 +1,5 @@
+# RT Shell files.

+SHELLSRC = $(CHIBIOS)/os/various/shell/shell.c \

+           $(CHIBIOS)/os/various/shell/shell_cmd.c

+

+SHELLINC = $(CHIBIOS)/os/various/shell

diff --git a/os/various/shell/shell_cmd.c b/os/various/shell/shell_cmd.c
new file mode 100644
index 000000000..1a8bba4a4
--- /dev/null
+++ b/os/various/shell/shell_cmd.c
@@ -0,0 +1,193 @@
+/*

+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+

+/**

+ * @file    shell_cmd.c

+ * @brief   Simple CLI shell common commands code.

+ *

+ * @addtogroup SHELL

+ * @{

+ */

+

+#include <string.h>

+

+#include "ch.h"

+#include "hal.h"

+#include "shell.h"

+#include "shell_cmd.h"

+#include "chprintf.h"

+

+#if (SHELL_CMD_TEST_ENABLED == TRUE) || defined(__DOXYGEN__)

+#include "test.h"

+#endif

+

+/*===========================================================================*/

+/* Module local definitions.                                                 */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module exported variables.                                                */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module local types.                                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module local variables.                                                   */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module local functions.                                                   */

+/*===========================================================================*/

+

+static void usage(BaseSequentialStream *chp, char *p) {

+

+  chprintf(chp, "Usage: %s\r\n", p);

+}

+

+#if (SHELL_CMD_INFO_ENABLED == TRUE) || defined(__DOXYGEN__)

+static void cmd_info(BaseSequentialStream *chp, int argc, char *argv[]) {

+

+  (void)argv;

+  if (argc > 0) {

+    usage(chp, "info");

+    return;

+  }

+

+  chprintf(chp, "Kernel:       %s\r\n", CH_KERNEL_VERSION);

+#ifdef PORT_COMPILER_NAME

+  chprintf(chp, "Compiler:     %s\r\n", PORT_COMPILER_NAME);

+#endif

+  chprintf(chp, "Architecture: %s\r\n", PORT_ARCHITECTURE_NAME);

+#ifdef PORT_CORE_VARIANT_NAME

+  chprintf(chp, "Core Variant: %s\r\n", PORT_CORE_VARIANT_NAME);

+#endif

+#ifdef PORT_INFO

+  chprintf(chp, "Port Info:    %s\r\n", PORT_INFO);

+#endif

+#ifdef PLATFORM_NAME

+  chprintf(chp, "Platform:     %s\r\n", PLATFORM_NAME);

+#endif

+#ifdef BOARD_NAME

+  chprintf(chp, "Board:        %s\r\n", BOARD_NAME);

+#endif

+#ifdef __DATE__

+#ifdef __TIME__

+  chprintf(chp, "Build time:   %s%s%s\r\n", __DATE__, " - ", __TIME__);

+#endif

+#endif

+}

+#endif

+

+#if (SHELL_CMD_SYSTIME_ENABLED == TRUE) || defined(__DOXYGEN__)

+static void cmd_systime(BaseSequentialStream *chp, int argc, char *argv[]) {

+

+  (void)argv;

+  if (argc > 0) {

+    usage(chp, "systime");

+    return;

+  }

+  chprintf(chp, "%lu\r\n", (unsigned long)chVTGetSystemTime());

+}

+#endif

+

+#if (SHELL_CMD_MEM_ENABLED == TRUE) || defined(__DOXYGEN__)

+static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {

+  size_t n, total, largest;

+

+  (void)argv;

+  if (argc > 0) {

+    chprintf(chp, "Usage: mem\r\n");

+    return;

+  }

+  n = chHeapStatus(NULL, &total, &largest);

+  chprintf(chp, "core free memory : %u bytes\r\n", chCoreGetStatusX());

+  chprintf(chp, "heap fragments   : %u\r\n", n);

+  chprintf(chp, "heap free total  : %u bytes\r\n", total);

+  chprintf(chp, "heap free largest: %u bytes\r\n", largest);

+}

+#endif

+

+#if (SHELL_CMD_THREADS_ENABLED == TRUE) || defined(__DOXYGEN__)

+static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {

+  static const char *states[] = {CH_STATE_NAMES};

+  thread_t *tp;

+

+  (void)argv;

+  if (argc > 0) {

+    chprintf(chp, "Usage: threads\r\n");

+    return;

+  }

+  chprintf(chp, "stklimit    stack     addr prio     state         name\r\n");

+  tp = chRegFirstThread();

+  do {

+    chprintf(chp, "%08lx %08lx %08lx %4lu %9s %12s\r\n",

+             (uint32_t)tp->stklimit, (uint32_t)tp->ctx.r13, (uint32_t)tp,

+             (uint32_t)tp->prio, states[tp->state],

+             tp->name == NULL ? "" : tp->name);

+    tp = chRegNextThread(tp);

+  } while (tp != NULL);

+}

+#endif

+

+#if (SHELL_CMD_TEST_ENABLED == TRUE) || defined(__DOXYGEN__)

+static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {

+  thread_t *tp;

+

+  (void)argv;

+  if (argc > 0) {

+    chprintf(chp, "Usage: test\r\n");

+    return;

+  }

+  tp = chThdCreateFromHeap(NULL, SHELL_CMD_TEST_WA_SIZE, chThdGetPriorityX(),

+                           TestThread, chp);

+  if (tp == NULL) {

+    chprintf(chp, "out of memory\r\n");

+    return;

+  }

+  chThdWait(tp);

+  chThdFreeToHeap(tp);

+}

+#endif

+

+/*===========================================================================*/

+/* Module exported functions.                                                */

+/*===========================================================================*/

+

+/**

+ * @brief   Array of the default commands.

+ */

+ShellCommand shell_local_commands[] = {

+#if SHELL_CMD_INFO_ENABLED == TRUE

+  {"info", cmd_info},

+#endif

+#if SHELL_CMD_SYSTIME_ENABLED == TRUE

+  {"systime", cmd_systime},

+#endif

+#if SHELL_CMD_MEM_ENABLED == TRUE

+  {"mem", cmd_mem},

+#endif

+#if SHELL_CMD_THREADS_ENABLED == TRUE

+  {"threads", cmd_threads},

+#endif

+#if SHELL_CMD_TEST_ENABLED == TRUE

+  {"test", cmd_test},

+#endif

+  {NULL, NULL}

+};

+

+/** @} */

diff --git a/os/various/shell/shell_cmd.h b/os/various/shell/shell_cmd.h
new file mode 100644
index 000000000..36e6c0728
--- /dev/null
+++ b/os/various/shell/shell_cmd.h
@@ -0,0 +1,106 @@
+/*

+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+

+/**

+ * @file    shell_cmd.h

+ * @brief   Simple CLI shell common commands header.

+ *

+ * @addtogroup SHELL

+ * @{

+ */

+

+#ifndef _SHELLCMD_H_

+#define _SHELLCMD_H_

+

+/*===========================================================================*/

+/* Module constants.                                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module pre-compile time settings.                                         */

+/*===========================================================================*/

+

+#if !defined(SHELL_CMD_INFO_ENABLED) || defined(__DOXYGEN__)

+#define SHELL_CMD_INFO_ENABLED              TRUE

+#endif

+

+#if !defined(SHELL_CMD_SYSTIME_ENABLED) || defined(__DOXYGEN__)

+#define SHELL_CMD_SYSTIME_ENABLED           TRUE

+#endif

+

+#if !defined(SHELL_CMD_MEM_ENABLED) || defined(__DOXYGEN__)

+#define SHELL_CMD_MEM_ENABLED               TRUE

+#endif

+

+#if !defined(SHELL_CMD_THREADS_ENABLED) || defined(__DOXYGEN__)

+#define SHELL_CMD_THREADS_ENABLED           TRUE

+#endif

+

+#if !defined(SHELL_CMD_TEST_ENABLED) || defined(__DOXYGEN__)

+#define SHELL_CMD_TEST_ENABLED              TRUE

+#endif

+

+#if !defined(SHELL_CMD_TEST_WA_SIZE) || defined(__DOXYGEN__)

+#define SHELL_CMD_TEST_WA_SIZE              THD_WORKING_AREA_SIZE(256)

+#endif

+

+/*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+#if (SHELL_CMD_MEM_ENABLED == TRUE) && (CH_CFG_USE_MEMCORE == FALSE)

+#error "SHELL_CMD_MEM_ENABLED requires CH_CFG_USE_MEMCORE"

+#endif

+

+#if (SHELL_CMD_MEM_ENABLED == TRUE) && (CH_CFG_USE_HEAP == FALSE)

+#error "SHELL_CMD_MEM_ENABLED requires CH_CFG_USE_HEAP"

+#endif

+

+#if (SHELL_CMD_THREADS_ENABLED == TRUE) && (CH_CFG_USE_REGISTRY == FALSE)

+#error "SHELL_CMD_THREADS_ENABLED requires CH_CFG_USE_REGISTRY"

+#endif

+

+/*===========================================================================*/

+/* Module data structures and types.                                         */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Module macros.                                                            */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#if !defined(__DOXYGEN__)

+extern ShellCommand shell_local_commands[];

+#endif

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+#ifdef __cplusplus

+}

+#endif

+

+/*===========================================================================*/

+/* Module inline functions.                                                  */

+/*===========================================================================*/

+

+#endif /* _SHELLCMD_H_ */

+

+/** @} */