aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2016-12-13 08:47:45 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2016-12-13 08:47:45 +0000
commit37d751510ab37cc36fc0ab2dcf50d2aa08ae6d08 (patch)
treef52ed508457e5a27283aec4dd5da8adad354b13f
parenta91bd824fc2468f17828daa94859b24594ed6519 (diff)
downloadChibiOS-37d751510ab37cc36fc0ab2dcf50d2aa08ae6d08.tar.gz
ChibiOS-37d751510ab37cc36fc0ab2dcf50d2aa08ae6d08.tar.bz2
ChibiOS-37d751510ab37cc36fc0ab2dcf50d2aa08ae6d08.zip
Fixed bug #797.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9956 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/various/shell/shell_cmd.c2
-rw-r--r--os/various/shell/shell_cmd.h2
-rw-r--r--readme.txt4
3 files changed, 5 insertions, 3 deletions
diff --git a/os/various/shell/shell_cmd.c b/os/various/shell/shell_cmd.c
index 724d83351..fd28aa89a 100644
--- a/os/various/shell/shell_cmd.c
+++ b/os/various/shell/shell_cmd.c
@@ -197,7 +197,7 @@ static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {
/**
* @brief Array of the default commands.
*/
-ShellCommand shell_local_commands[] = {
+const ShellCommand shell_local_commands[] = {
#if (SHELL_CMD_EXIT_ENABLED == TRUE) && !defined(_CHIBIOS_NIL_)
{"exit", cmd_exit},
#endif
diff --git a/os/various/shell/shell_cmd.h b/os/various/shell/shell_cmd.h
index 4eac1a122..2fd454d7d 100644
--- a/os/various/shell/shell_cmd.h
+++ b/os/various/shell/shell_cmd.h
@@ -94,7 +94,7 @@
/*===========================================================================*/
#if !defined(__DOXYGEN__)
-extern ShellCommand shell_local_commands[];
+extern const ShellCommand shell_local_commands[];
#endif
#ifdef __cplusplus
diff --git a/readme.txt b/readme.txt
index ba28664e2..fc680eec7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -150,7 +150,9 @@
- RT: Merged RT4.
- NIL: Merged NIL2.
- NIL: Added STM32F7 demo.
-- HAL: Fixed double empty lines in HAL (bug #794)backported to 16.1.6,
+- VAR: Fixed missing const qualifier in local shell commands array (bug #797)
+ (backported to 16.1.6, 3.0.6, 2.6.10).
+- HAL: Fixed double empty lines in HAL (bug #794)(backported to 16.1.6,
3.0.6, 2.6.10).
- RT: Fixed double empty lines in RT (bug #793)(backported to 16.1.6, 3.0.6).
- HAL: Fixed wrong entries in STM32L4 registry (bug #792)(backported to