Change the const prefix to right position.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2294 bbd45198-f89e-11dd-88c7-29a3b14d5316

5 files changed, 98 insertions, 98 deletions

diff --git a/components/finsh/SConscript b/components/finsh/SConscript
index ee9ded92e8..3fd0961f72 100644
--- a/components/finsh/SConscript
+++ b/components/finsh/SConscript
@@ -1,14 +1,14 @@
-Import('rtconfig')

-from building import *

-

-cwd     = GetCurrentDir()

-src     = Glob('*.c')

-CPPPATH = [cwd]

-if rtconfig.CROSS_TOOL == 'keil':

-    LINKFLAGS = ' --keep __fsym_* --keep __vsym_* '

-else:

-    LINKFLAGS = '' 

-

-group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS)

-

-Return('group')

+Import('rtconfig')
+from building import *
+
+cwd     = GetCurrentDir()
+src     = Glob('*.c')
+CPPPATH = [cwd]
+if rtconfig.CROSS_TOOL == 'keil':
+    LINKFLAGS = ' --keep __fsym_* --keep __vsym_* '
+else:
+    LINKFLAGS = '' 
+
+group = DefineGroup('finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH, LINKFLAGS = LINKFLAGS)
+
+Return('group')
diff --git a/components/finsh/cmd.c b/components/finsh/cmd.c
index b46fd0ac30..d33cdebda8 100644
--- a/components/finsh/cmd.c
+++ b/components/finsh/cmd.c
@@ -376,7 +376,7 @@ static long _list_device(struct rt_list_node *list)
 {
     struct rt_device *device;
     struct rt_list_node *node;
-    const char *device_type_str[] =
+    char * const device_type_str[] =
     {
         "Character Device",
         "Block Device",
@@ -385,7 +385,7 @@ static long _list_device(struct rt_list_node *list)
         "CAN Device",
         "RTC",
         "Sound Device",
-        "Graphic Device",

+        "Graphic Device",
         "I2C Bus",
         "USB Slave Device",
         "USB Host Bus",
diff --git a/components/finsh/finsh_error.c b/components/finsh/finsh_error.c
index 9a8ef631fd..05cb8534f0 100644
--- a/components/finsh/finsh_error.c
+++ b/components/finsh/finsh_error.c
@@ -15,7 +15,7 @@
 
 u_char global_errno;
 
-static const char* finsh_error_string_table[] =
+static const char * finsh_error_string_table[] =
 {
     "No error",
 	"Invalid token",
diff --git a/components/finsh/finsh_heap.c b/components/finsh/finsh_heap.c
index 0936ee8f47..811a111f8e 100644
--- a/components/finsh/finsh_heap.c
+++ b/components/finsh/finsh_heap.c
@@ -15,7 +15,7 @@
 
 #include "finsh_var.h"
 
-ALIGN(RT_ALIGN_SIZE)

+ALIGN(RT_ALIGN_SIZE)
 u_char finsh_heap[FINSH_HEAP_MAX];
 struct finsh_block_header
 {
diff --git a/components/finsh/shell.h b/components/finsh/shell.h
index 84ebb7e197..e99f3fd3c4 100644
--- a/components/finsh/shell.h
+++ b/components/finsh/shell.h
@@ -1,80 +1,80 @@
-/*

- * File      : shell.h

- * This file is part of RT-Thread RTOS

- * COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team

- *

- * The license and distribution terms for this file may be

- * found in the file LICENSE in this distribution or at

- * http://www.rt-thread.org/license/LICENSE

- *

- * Change Logs:

- * Date           Author       Notes

- * 2011-06-02     Bernard      Add finsh_get_prompt function declaration

- */

-

-#ifndef __SHELL_H__

-#define __SHELL_H__

-

-#include <rtthread.h>

-

-#define FINSH_USING_HISTORY

-#ifndef FINSH_THREAD_PRIORITY

-#define FINSH_THREAD_PRIORITY 20

-#endif

-#ifndef FINSH_THREAD_STACK_SIZE

-#define FINSH_THREAD_STACK_SIZE 2048

-#endif

-#define FINSH_CMD_SIZE		80

-

-#define FINSH_OPTION_ECHO	0x01

-#if defined(RT_USING_DFS) && defined(DFS_USING_WORKDIR)

-#define FINSH_PROMPT		finsh_get_prompt()

-const char* finsh_get_prompt(void);

-#else

-#define FINSH_PROMPT		"finsh>>"

-#endif

-

-#ifdef FINSH_USING_HISTORY

-enum input_stat

-{

-	WAIT_NORMAL,

-	WAIT_SPEC_KEY,

-	WAIT_FUNC_KEY,

-};

-	#ifndef FINSH_HISTORY_LINES

-		#define FINSH_HISTORY_LINES 5

-	#endif

-#endif

-

-struct finsh_shell

-{

-	struct rt_semaphore rx_sem;

-

-	enum input_stat stat;

-

-	rt_uint8_t echo_mode:1;

-	rt_uint8_t use_history:1;

-

-#ifdef FINSH_USING_HISTORY

-	rt_uint8_t current_history;

-	rt_uint16_t history_count;

-

-	char cmd_history[FINSH_HISTORY_LINES][FINSH_CMD_SIZE];

-#endif

-

-	struct finsh_parser parser;

-

-	char line[FINSH_CMD_SIZE];

-	rt_uint8_t line_position;

-

-	rt_device_t device;

-};

-

-void finsh_set_echo(rt_uint32_t echo);

-rt_uint32_t finsh_get_echo(void);

-

-void finsh_system_init(void);

-void finsh_set_device(const char* device_name);

-const char* finsh_get_device(void);

-

-#endif

+/*
+ * File      : shell.h
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2006 - 2011, RT-Thread Development Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2011-06-02     Bernard      Add finsh_get_prompt function declaration
+ */
+
+#ifndef __SHELL_H__
+#define __SHELL_H__
+
+#include <rtthread.h>
+
+#define FINSH_USING_HISTORY
+#ifndef FINSH_THREAD_PRIORITY
+#define FINSH_THREAD_PRIORITY 20
+#endif
+#ifndef FINSH_THREAD_STACK_SIZE
+#define FINSH_THREAD_STACK_SIZE 2048
+#endif
+#define FINSH_CMD_SIZE		80
+
+#define FINSH_OPTION_ECHO	0x01
+#if defined(RT_USING_DFS) && defined(DFS_USING_WORKDIR)
+#define FINSH_PROMPT		finsh_get_prompt()
+const char* finsh_get_prompt(void);
+#else
+#define FINSH_PROMPT		"finsh>>"
+#endif
+
+#ifdef FINSH_USING_HISTORY
+enum input_stat
+{
+	WAIT_NORMAL,
+	WAIT_SPEC_KEY,
+	WAIT_FUNC_KEY,
+};
+	#ifndef FINSH_HISTORY_LINES
+		#define FINSH_HISTORY_LINES 5
+	#endif
+#endif
+
+struct finsh_shell
+{
+	struct rt_semaphore rx_sem;
+
+	enum input_stat stat;
+
+	rt_uint8_t echo_mode:1;
+	rt_uint8_t use_history:1;
+
+#ifdef FINSH_USING_HISTORY
+	rt_uint8_t current_history;
+	rt_uint16_t history_count;
+
+	char cmd_history[FINSH_HISTORY_LINES][FINSH_CMD_SIZE];
+#endif
+
+	struct finsh_parser parser;
+
+	char line[FINSH_CMD_SIZE];
+	rt_uint8_t line_position;
+
+	rt_device_t device;
+};
+
+void finsh_set_echo(rt_uint32_t echo);
+rt_uint32_t finsh_get_echo(void);
+
+void finsh_system_init(void);
+void finsh_set_device(const char* device_name);
+const char* finsh_get_device(void);
+
+#endif