Merge pull request #4737 from mysterywolf/3,1,xformatv3.1.5

[lts 3.1.x] format codes

2 files changed, 183 insertions, 183 deletions

diff --git a/bsp/mini2440/applications/application.c b/bsp/mini2440/applications/application.c
index 194618a925..4412847170 100644
--- a/bsp/mini2440/applications/application.c
+++ b/bsp/mini2440/applications/application.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
- * Date           Author		Notes
- * 2007-11-20     Yi.Qiu		add rtgui application
- * 2008-6-28      Bernard		no rtgui init
+ * Date           Author        Notes
+ * 2007-11-20     Yi.Qiu        add rtgui application
+ * 2008-6-28      Bernard       no rtgui init
  */
 
 /**
  * @addtogroup mini2440
  */
- 
+
 /*@{*/
 
 #include <rtthread.h>
@@ -56,11 +56,11 @@ static char* argv[] = {"ftk", NULL};
 
 void rt_ftk_thread_entry(void *parameter)
 {
-	int FTK_MAIN(int argc, char *argv[]);
+    int FTK_MAIN(int argc, char *argv[]);
 
-	FTK_MAIN(argc, argv);
+    FTK_MAIN(argc, argv);
 
-	return;
+    return;
 }
 
 #endif
@@ -69,180 +69,180 @@ void rt_init_thread_entry(void *parameter)
 {
 /* Filesystem Initialization */
 #ifdef RT_USING_DFS
-	{
-		/* init the device filesystem */
-		dfs_init();
+    {
+        /* init the device filesystem */
+        dfs_init();
 
 #if defined(RT_USING_DFS_ELMFAT)
-		/* init the elm chan FatFs filesystam*/
-		elm_init();
-		/* mount sd card fat partition 1 as root directory */
-		if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
-		{
-			rt_kprintf("File System initialized!\n");
-		}
-		else
-			rt_kprintf("File System initialzation failed!\n");
+        /* init the elm chan FatFs filesystam*/
+        elm_init();
+        /* mount sd card fat partition 1 as root directory */
+        if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
+        {
+            rt_kprintf("File System initialized!\n");
+        }
+        else
+            rt_kprintf("File System initialzation failed!\n");
 #endif
 
 #if defined(RT_USING_DFS_ROMFS)
-		dfs_romfs_init();
-		if (dfs_mount(RT_NULL, "/rom", "rom", 0, &romfs_root) == 0)
-		{
-			rt_kprintf("ROM File System initialized!\n");
-		}
-		else
-			rt_kprintf("ROM File System initialzation failed!\n");
+        dfs_romfs_init();
+        if (dfs_mount(RT_NULL, "/rom", "rom", 0, &romfs_root) == 0)
+        {
+            rt_kprintf("ROM File System initialized!\n");
+        }
+        else
+            rt_kprintf("ROM File System initialzation failed!\n");
 #endif
 
 #if defined(RT_USING_DFS_DEVFS)
-		devfs_init();
-		if (dfs_mount(RT_NULL, "/dev", "devfs", 0, 0) == 0)
-			rt_kprintf("Device File System initialized!\n");
-		else
-			rt_kprintf("Device File System initialzation failed!\n");
+        devfs_init();
+        if (dfs_mount(RT_NULL, "/dev", "devfs", 0, 0) == 0)
+            rt_kprintf("Device File System initialized!\n");
+        else
+            rt_kprintf("Device File System initialzation failed!\n");
 
-		#ifdef RT_USING_NEWLIB
-		/* init libc */
-		libc_system_init("uart0");
-		#endif
+        #ifdef RT_USING_NEWLIB
+        /* init libc */
+        libc_system_init("uart0");
+        #endif
 #endif
 
 #if defined(RT_USING_DFS) && defined(RT_USING_LWIP) && defined(RT_USING_DFS_NFS)
-		/* NFSv3 Initialization */
-		nfs_init();
+        /* NFSv3 Initialization */
+        nfs_init();
 
-		if (dfs_mount(RT_NULL, "/nfs", "nfs", 0, RT_NFS_HOST_EXPORT) == 0)
-			rt_kprintf("NFSv3 File System initialized!\n");
-		else
-			rt_kprintf("NFSv3 File System initialzation failed!\n");
+        if (dfs_mount(RT_NULL, "/nfs", "nfs", 0, RT_NFS_HOST_EXPORT) == 0)
+            rt_kprintf("NFSv3 File System initialized!\n");
+        else
+            rt_kprintf("NFSv3 File System initialzation failed!\n");
 #endif
 
 #if defined(RT_USING_DFS_UFFS)
-		/* init the uffs filesystem */
-		dfs_uffs_init();
+        /* init the uffs filesystem */
+        dfs_uffs_init();
 
-		/* mount flash device as flash directory */
-		if (dfs_mount("nand0", "/nand0", "uffs", 0, 0) == 0)
-			rt_kprintf("UFFS File System initialized!\n");
-		else
-			rt_kprintf("UFFS File System initialzation failed!\n");
+        /* mount flash device as flash directory */
+        if (dfs_mount("nand0", "/nand0", "uffs", 0, 0) == 0)
+            rt_kprintf("UFFS File System initialized!\n");
+        else
+            rt_kprintf("UFFS File System initialzation failed!\n");
 #endif
-	}
+    }
 #endif
 
 #ifdef RT_USING_RTGUI
-	{
-		extern void rtgui_system_server_init(void);
+    {
+        extern void rtgui_system_server_init(void);
+
+        rt_device_t lcd;
+
+        /* init lcd */
+        rt_hw_lcd_init();
 
-		rt_device_t lcd;
-		
-		/* init lcd */
-		rt_hw_lcd_init();
-			
-		/* init touch panel */
-		rtgui_touch_hw_init();	
+        /* init touch panel */
+        rtgui_touch_hw_init();
 
-		/* init keypad */
-		rt_hw_key_init();
+        /* init keypad */
+        rt_hw_key_init();
 
-		/* find lcd device */
-		lcd = rt_device_find("lcd");
+        /* find lcd device */
+        lcd = rt_device_find("lcd");
 
-		/* set lcd device as rtgui graphic driver */		
-		rtgui_graphic_set_device(lcd);
+        /* set lcd device as rtgui graphic driver */
+        rtgui_graphic_set_device(lcd);
 
-		/* initalize rtgui system server */
-		rtgui_system_server_init();
-	}
+        /* initalize rtgui system server */
+        rtgui_system_server_init();
+    }
 #endif
 
 /* LwIP Initialization */
 #ifdef RT_USING_LWIP
-	{
-		extern void lwip_sys_init(void);
-		eth_system_device_init();
+    {
+        extern void lwip_sys_init(void);
+        eth_system_device_init();
 
-		/* register ethernetif device */
-		rt_hw_dm9000_init();
+        /* register ethernetif device */
+        rt_hw_dm9000_init();
 
-		/* init lwip system */
-		lwip_sys_init();
-		rt_kprintf("TCP/IP initialized!\n");
-	}
+        /* init lwip system */
+        lwip_sys_init();
+        rt_kprintf("TCP/IP initialized!\n");
+    }
 #endif
 
 #ifdef RT_USING_FTK
-	{
-		rt_thread_t ftk_thread;
+    {
+        rt_thread_t ftk_thread;
 
-		/* init lcd */
-		rt_hw_lcd_init();
+        /* init lcd */
+        rt_hw_lcd_init();
 
-		/* init touch panel */
-		rtgui_touch_hw_init();	
+        /* init touch panel */
+        rtgui_touch_hw_init();
 
-		/* init keypad */
-		rt_hw_key_init();
+        /* init keypad */
+        rt_hw_key_init();
 
-		/* create ftk thread */
-		ftk_thread = rt_thread_create("ftk",
-									rt_ftk_thread_entry, RT_NULL,
-									10 * 1024, 8, 20);	
+        /* create ftk thread */
+        ftk_thread = rt_thread_create("ftk",
+                                    rt_ftk_thread_entry, RT_NULL,
+                                    10 * 1024, 8, 20);
 
-		/* startup ftk thread */
-		if (ftk_thread != RT_NULL)
-			rt_thread_startup(ftk_thread);		
-	}
+        /* startup ftk thread */
+        if (ftk_thread != RT_NULL)
+            rt_thread_startup(ftk_thread);
+    }
 #endif
 }
 
 void rt_led_thread_entry(void *parameter)
 {
-	while (1)
-	{
-		/* light on leds for one second */
-		rt_hw_led_on(LED2|LED3);
-		rt_hw_led_off(LED1|LED4);
-		rt_thread_delay(100);
+    while (1)
+    {
+        /* light on leds for one second */
+        rt_hw_led_on(LED2|LED3);
+        rt_hw_led_off(LED1|LED4);
+        rt_thread_delay(100);
 
-		/* light off leds for one second */
-		rt_hw_led_off(LED2|LED3);
-		rt_hw_led_on(LED1|LED4);
-		rt_thread_delay(100);
-	}
+        /* light off leds for one second */
+        rt_hw_led_off(LED2|LED3);
+        rt_hw_led_on(LED1|LED4);
+        rt_thread_delay(100);
+    }
 }
 
 int rt_application_init(void)
 {
-	rt_thread_t init_thread;
-	rt_thread_t led_thread;
+    rt_thread_t init_thread;
+    rt_thread_t led_thread;
 
 #if (RT_THREAD_PRIORITY_MAX == 32)
-	init_thread = rt_thread_create("init",
-								rt_init_thread_entry, RT_NULL,
-								RT_INIT_THREAD_STACK_SIZE, 8, 20);
+    init_thread = rt_thread_create("init",
+                                rt_init_thread_entry, RT_NULL,
+                                RT_INIT_THREAD_STACK_SIZE, 8, 20);
 
-	led_thread = rt_thread_create("led",
-								rt_led_thread_entry, RT_NULL,
-								512, 20, 20);
+    led_thread = rt_thread_create("led",
+                                rt_led_thread_entry, RT_NULL,
+                                512, 20, 20);
 #else
-	init_thread = rt_thread_create("init",
-								rt_init_thread_entry, RT_NULL,
-								RT_INIT_THREAD_STACK_SIZE, 80, 20);
+    init_thread = rt_thread_create("init",
+                                rt_init_thread_entry, RT_NULL,
+                                RT_INIT_THREAD_STACK_SIZE, 80, 20);
 
-	led_thread = rt_thread_create("led",
-								rt_led_thread_entry, RT_NULL,
-								512, 200, 20);
+    led_thread = rt_thread_create("led",
+                                rt_led_thread_entry, RT_NULL,
+                                512, 200, 20);
 #endif
 
-	if (init_thread != RT_NULL)
-		rt_thread_startup(init_thread);
+    if (init_thread != RT_NULL)
+        rt_thread_startup(init_thread);
 
-	if (led_thread != RT_NULL)
-		rt_thread_startup(led_thread);
+    if (led_thread != RT_NULL)
+        rt_thread_startup(led_thread);
 
-	return 0;
+    return 0;
 }
 
 /*@}*/
diff --git a/bsp/mini2440/applications/startup.c b/bsp/mini2440/applications/startup.c
index 162cc8a7b4..3d21949b6c 100644
--- a/bsp/mini2440/applications/startup.c
+++ b/bsp/mini2440/applications/startup.c
@@ -43,17 +43,17 @@ extern struct rt_device uart2_device;
 
 /*@{*/
 #if defined(__CC_ARM)
-	extern int Image$$ER_ZI$$ZI$$Base;
-	extern int Image$$ER_ZI$$ZI$$Length;
-	extern int Image$$ER_ZI$$ZI$$Limit;
+    extern int Image$$ER_ZI$$ZI$$Base;
+    extern int Image$$ER_ZI$$ZI$$Length;
+    extern int Image$$ER_ZI$$ZI$$Limit;
 #elif (defined (__GNUC__))
-	rt_uint8_t _irq_stack_start[1024];
-	rt_uint8_t _fiq_stack_start[1024];
-	rt_uint8_t _undefined_stack_start[512];
-	rt_uint8_t _abort_stack_start[512];
-	rt_uint8_t _svc_stack_start[4096] SECTION(".nobss");
-	extern unsigned char __bss_start;
-	extern unsigned char __bss_end;
+    rt_uint8_t _irq_stack_start[1024];
+    rt_uint8_t _fiq_stack_start[1024];
+    rt_uint8_t _undefined_stack_start[512];
+    rt_uint8_t _abort_stack_start[512];
+    rt_uint8_t _svc_stack_start[4096] SECTION(".nobss");
+    extern unsigned char __bss_start;
+    extern unsigned char __bss_end;
 #endif
 
 #ifdef RT_USING_FINSH
@@ -65,97 +65,97 @@ extern int finsh_system_init(void);
  */
 void rtthread_startup(void)
 {
-	/* enable cpu cache */
-	rt_hw_cpu_icache_enable();
-	rt_hw_cpu_dcache_enable();
+    /* enable cpu cache */
+    rt_hw_cpu_icache_enable();
+    rt_hw_cpu_dcache_enable();
 
-	/* init hardware interrupt */
-	rt_hw_interrupt_init();
+    /* init hardware interrupt */
+    rt_hw_interrupt_init();
 
-	/* init board */
-	rt_hw_board_init();
+    /* init board */
+    rt_hw_board_init();
 
-	/* show version */
-	rt_show_version();
+    /* show version */
+    rt_show_version();
 
-	/* init tick */
-	rt_system_tick_init();
+    /* init tick */
+    rt_system_tick_init();
 
-	/* init kernel object */
-	rt_system_object_init();
+    /* init kernel object */
+    rt_system_object_init();
 
-	/* init timer system */
-	rt_system_timer_init();
+    /* init timer system */
+    rt_system_timer_init();
 
-	/* init heap memory system */
+    /* init heap memory system */
 #ifdef __CC_ARM
-	rt_system_heap_init((void*)&Image$$ER_ZI$$ZI$$Limit, (void*)0x33F00000);
+    rt_system_heap_init((void*)&Image$$ER_ZI$$ZI$$Limit, (void*)0x33F00000);
 #else
-	rt_system_heap_init((void*)&__bss_end, (void*)0x33F00000);
+    rt_system_heap_init((void*)&__bss_end, (void*)0x33F00000);
 #endif
 
 #ifdef RT_USING_MODULE
-	/* init module system*/
-	rt_system_module_init();
+    /* init module system*/
+    rt_system_module_init();
 #endif
 
-	/* init scheduler system */
-	rt_system_scheduler_init();
+    /* init scheduler system */
+    rt_system_scheduler_init();
 
 #ifdef RT_USING_DEVICE
-	/* register uart0 */
-	rt_hw_serial_register(&uart0_device, "uart0",
-		RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
-		&uart0);
+    /* register uart0 */
+    rt_hw_serial_register(&uart0_device, "uart0",
+        RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
+        &uart0);
 
-	/* register uart2, used for RTI debug */
-	rt_hw_serial_register(&uart2_device, "uart2",
-		RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
-		&uart2);
+    /* register uart2, used for RTI debug */
+    rt_hw_serial_register(&uart2_device, "uart2",
+        RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM,
+        &uart2);
 
 #ifdef RT_USING_DFS
-	rt_hw_sdcard_init();
+    rt_hw_sdcard_init();
 #ifdef RT_USING_DFS_UFFS
-	rt_hw_nand_init();
+    rt_hw_nand_init();
 #endif
 #endif
 
-	/* rtc init */
-	rt_hw_rtc_init();
+    /* rtc init */
+    rt_hw_rtc_init();
 #endif
 
-	/* init application */
-	rt_application_init();
+    /* init application */
+    rt_application_init();
 
 #ifdef RT_USING_FINSH
-	/* init finsh */
-	finsh_system_init();
+    /* init finsh */
+    finsh_system_init();
 #ifdef RT_USING_DEVICE
-	finsh_set_device("uart0");
+    finsh_set_device("uart0");
 #endif
 #endif
 
-	rt_system_timer_thread_init();
+    rt_system_timer_thread_init();
 
-	/* init idle thread */
-	rt_thread_idle_init();
+    /* init idle thread */
+    rt_thread_idle_init();
 
-	/* start scheduler */
-	rt_system_scheduler_start();
+    /* start scheduler */
+    rt_system_scheduler_start();
 
-	/* never reach here */
-	return ;
+    /* never reach here */
+    return ;
 }
 
 int main(void)
 {
-	/* disable interrupt first */
-	rt_hw_interrupt_disable();
+    /* disable interrupt first */
+    rt_hw_interrupt_disable();
 
-	/* startup RT-Thread RTOS */
-	rtthread_startup();
+    /* startup RT-Thread RTOS */
+    rtthread_startup();
 
-	return 0;
+    return 0;
 }
 
 /*@}*/