Merge branch 'master' of https://github.com/RT-Thread/rt-thread

7 files changed, 21 insertions, 11 deletions

diff --git a/components/dfs/filesystems/jffs2/dfs_jffs2.c b/components/dfs/filesystems/jffs2/dfs_jffs2.c
index 3b96295c76..6516797544 100644
--- a/components/dfs/filesystems/jffs2/dfs_jffs2.c
+++ b/components/dfs/filesystems/jffs2/dfs_jffs2.c
@@ -178,6 +178,7 @@ static int dfs_jffs2_mount(struct dfs_filesystem* fs,
 	result = jffs2_mount(NULL, mte);
 	if (result != 0)
 	{	
+		device_partition[index].dev = NULL;
 		return jffs2_result_to_dfs(result);
 	}
 	/* save this pointer */
diff --git a/components/dfs/filesystems/jffs2/src/fs-ecos.c b/components/dfs/filesystems/jffs2/src/fs-ecos.c
index 5f3b5d607c..814d2e3010 100644
--- a/components/dfs/filesystems/jffs2/src/fs-ecos.c
+++ b/components/dfs/filesystems/jffs2/src/fs-ecos.c
@@ -747,7 +747,7 @@ int jffs2_open(cyg_mtab_entry * mte, cyg_dir dir, const char *name,
         }
 
 	// Initialise the file object
-	file->f_flag |= mode & CYG_FILE_MODE_MASK;
+	file->f_flag = mode & CYG_FILE_MODE_MASK;
 	file->f_type = CYG_FILE_TYPE_FILE;
 	file->f_ops = &jffs2_fileops;
 	file->f_offset = (mode & O_APPEND) ? node->i_size : 0;
@@ -1065,6 +1065,7 @@ static int jffs2_opendir(cyg_mtab_entry * mte, cyg_dir dir, const char *name,
 	// Initialize the file object, setting the f_ops field to a
 	// special set of file ops.
 
+	file->f_flag = 0;
 	file->f_type = CYG_FILE_TYPE_FILE;
 	file->f_ops = &jffs2_dirops;
 	file->f_offset = 0;
diff --git a/components/finsh/msh_cmd.c b/components/finsh/msh_cmd.c
index fac90479c8..cffb374c2e 100644
--- a/components/finsh/msh_cmd.c
+++ b/components/finsh/msh_cmd.c
@@ -136,6 +136,7 @@ int cmd_rm(int argc, char** argv)
 }
 FINSH_FUNCTION_EXPORT_ALIAS(cmd_rm, __cmd_rm, "Remove (unlink) the FILE(s).");
 
+#ifdef DFS_USING_WORKDIR
 int cmd_cd(int argc, char** argv)
 {
     if (argc == 1)
@@ -157,6 +158,7 @@ int cmd_pwd(int argc, char** argv)
 	return 0;
 }
 FINSH_FUNCTION_EXPORT_ALIAS(cmd_pwd, __cmd_pwd, Print the name of the current working directory.);
+#endif
 
 int cmd_mkdir(int argc, char** argv)
 {
diff --git a/components/finsh/shell.c b/components/finsh/shell.c
index 19dd93691e..8ff0e89e44 100644
--- a/components/finsh/shell.c
+++ b/components/finsh/shell.c
@@ -131,6 +131,7 @@ void finsh_set_device(const char* device_name)
 		{
 			/* close old finsh device */
 			rt_device_close(shell->device);
+            rt_device_set_rx_indicate(dev, RT_NULL);
 		}
 
 		shell->device = dev;
diff --git a/components/utilities/logtrace/log_file.c b/components/utilities/logtrace/log_file.c
index 72e4724b63..2f4a28b63c 100644
--- a/components/utilities/logtrace/log_file.c
+++ b/components/utilities/logtrace/log_file.c
@@ -121,6 +121,9 @@ void log_trace_set_file(const char *filename)
     log_trace_file_init(filename);
     log_trace_set_device("logfile");
 }
+#ifdef RT_USING_FINSH
+#include <finsh.h>
 FINSH_FUNCTION_EXPORT_ALIAS(log_trace_set_file, log_file, set output filename of log trace);
+#endif
 
 #endif /* RT_USING_DFS */
diff --git a/components/utilities/logtrace/log_trace.c b/components/utilities/logtrace/log_trace.c
index 79d5a21884..cc55b1dd44 100644
--- a/components/utilities/logtrace/log_trace.c
+++ b/components/utilities/logtrace/log_trace.c
@@ -41,7 +41,7 @@ static struct rt_device _log_device;
 static rt_device_t _traceout_device = RT_NULL;
 
 /* define a default lg session. The name is empty. */
-static struct log_trace_session _def_session = {{0}, LOG_TRACE_LEVEL_INFO};
+static struct log_trace_session _def_session = {{"\0"}, LOG_TRACE_LEVEL_INFO};
 static struct log_trace_session *_the_sessions[LOG_TRACE_MAX_SESSION] = {&_def_session};
 /* there is a default session at least */
 static rt_uint16_t _the_sess_nr = 1;
@@ -272,7 +272,7 @@ static void _lg_fmtout(
 
     _trace_buf[0] = ']';
     ptr = &_trace_buf[1];
-    length = vsnprintf(ptr, LOG_TRACE_BUFSZ, fmt, argptr);
+    length = rt_vsnprintf(ptr, LOG_TRACE_BUFSZ, fmt, argptr);
 
     if (length >= LOG_TRACE_BUFSZ)
         length = LOG_TRACE_BUFSZ - 1;
diff --git a/components/utilities/logtrace/log_trace.h b/components/utilities/logtrace/log_trace.h
index d5a028f553..77e1f08b6c 100644
--- a/components/utilities/logtrace/log_trace.h
+++ b/components/utilities/logtrace/log_trace.h
@@ -31,9 +31,10 @@
 #define LOG_TRACE_LEVEL_MASK        0x0f
 #define LOG_TRACE_LEVEL_NOTRACE     0x00
 #define LOG_TRACE_LEVEL_ERROR       0x01
-#define LOG_TRACE_LEVEL_WARNING     0x02
-#define LOG_TRACE_LEVEL_INFO        0x03
-#define LOG_TRACE_LEVEL_DEBUG       0x04
+#define LOG_TRACE_LEVEL_WARNING     0x03
+#define LOG_TRACE_LEVEL_INFO        0x05
+#define LOG_TRACE_LEVEL_VERBOSE     0x07
+#define LOG_TRACE_LEVEL_DEBUG       0x09
 #define LOG_TRACE_LEVEL_ALL         0x0f
 
 #ifndef LOG_TRACE_LEVEL_DEFAULT
@@ -41,9 +42,10 @@
 #endif
 
 #define LOG_TRACE_ERROR             "<1>"
-#define LOG_TRACE_WARNING           "<2>"
-#define LOG_TRACE_INFO              "<3>"
-#define LOG_TRACE_DEBUG             "<4>"
+#define LOG_TRACE_WARNING           "<3>"
+#define LOG_TRACE_INFO              "<5>"
+#define LOG_TRACE_VERBOSE           "<7>"
+#define LOG_TRACE_DEBUG             "<9>"
 
 #define LOG_TRACE_OPT_NOTS          0x10    /* no timestamp */
 #define LOG_TRACE_OPT_LN            0x20    /* terminate the current line */
@@ -140,12 +142,12 @@ rt_err_t log_trace_set_device(const char *device_name);
 
 void log_trace_flush(void);
 
+#ifdef RT_USING_DFS
 /** set the backend to file */
 void log_trace_set_file(const char *filename);
 
-/* log trace for NAND Flash */
-void log_trace_nand_init(const char *nand_device);
 void log_trace_file_init(const char *filename);
+#endif /* RT_USING_DFS */
 
 #endif