merge bsp/simlinux into bsp/simulator

2 files changed, 4 insertions, 4 deletions

diff --git a/bsp/simlinux/drivers/board.c b/bsp/simlinux/drivers/board.c
index c39053e5da..f497561bcb 100755
--- a/bsp/simlinux/drivers/board.c
+++ b/bsp/simlinux/drivers/board.c
@@ -71,8 +71,8 @@ void rt_hw_exit(void)
     /* *
      * getchar reads key from buffer, while finsh need an non-buffer getchar
      * in windows, getch is such an function, in linux, we had to change 
-     * the behaviour of terminal to get an non-buffer getchar. 
-     * in usart_sim.c, set_stty is called to do this work 
+     * the behaviour of terminal to get an non-buffer getchar.
+     * in usart_sim.c, set_stty is called to do this work
      * */
     {
         extern void restore_stty(void);
diff --git a/bsp/simlinux/drivers/usart_sim.c b/bsp/simlinux/drivers/usart_sim.c
index 0e9c528efe..2cbb1ed345 100755
--- a/bsp/simlinux/drivers/usart_sim.c
+++ b/bsp/simlinux/drivers/usart_sim.c
@@ -123,7 +123,7 @@ static int savekey(unsigned char key)
 
         serial_device.rx_indicate(&serial_device, rx_length);
     }
-    return 0; 
+    return 0;
 }
 #ifdef _WIN32
 static DWORD WINAPI ThreadforKeyGet(LPVOID lpParam)
@@ -131,7 +131,7 @@ static DWORD WINAPI ThreadforKeyGet(LPVOID lpParam)
 
 static struct termios oldt, newt;
 /*simulate windows' getch(), it works!!*/
-void set_stty(void) 
+void set_stty(void)
 {
 	/* get terminal input's attribute */
     tcgetattr(STDIN_FILENO, &oldt);