Browse Source

Merge pull request #201 from prife/master

finsh: fix finsh device setting
Bernard Xiong 11 years ago
parent
commit
6c58f80a1d
1 changed files with 7 additions and 2 deletions
  1. 7 2
      components/finsh/shell.c

+ 7 - 2
components/finsh/shell.c

@@ -308,11 +308,16 @@ void finsh_thread_entry(void* parameter)
 	rt_kprintf(FINSH_PROMPT);
 
 	/* set console device as shell device */
-	shell->device = rt_console_get_device();
-	if (shell->device != RT_NULL)
+	if (shell->device == RT_NULL)
 	{
+#ifdef RT_USING_CONSOLE
+		shell->device = rt_console_get_device();
+		RT_ASSERT(shell->device);
 		rt_device_open(shell->device, RT_DEVICE_OFLAG_RDWR);
 		rt_device_set_rx_indicate(shell->device, finsh_rx_ind);
+#else
+		RT_ASSERT(shell->device);
+#endif
 	}
 
 	while (1)