Re-normalizing the repo

8 files changed, 313 insertions, 313 deletions

diff --git a/bsp/lpc2478/SConscript b/bsp/lpc2478/SConscript
index a425264923..fe0ae941ae 100644
--- a/bsp/lpc2478/SConscript
+++ b/bsp/lpc2478/SConscript
@@ -1,14 +1,14 @@
-# for module compiling

-import os

-Import('RTT_ROOT')

-

-cwd = str(Dir('#'))

-objs = []

-list = os.listdir(cwd)

-

-for d in list:

-    path = os.path.join(cwd, d)

-    if os.path.isfile(os.path.join(path, 'SConscript')):

-        objs = objs + SConscript(os.path.join(d, 'SConscript'))

-

-Return('objs')

+# for module compiling
+import os
+Import('RTT_ROOT')
+
+cwd = str(Dir('#'))
+objs = []
+list = os.listdir(cwd)
+
+for d in list:
+    path = os.path.join(cwd, d)
+    if os.path.isfile(os.path.join(path, 'SConscript')):
+        objs = objs + SConscript(os.path.join(d, 'SConscript'))
+
+Return('objs')
diff --git a/bsp/lpc2478/SConstruct b/bsp/lpc2478/SConstruct
index beaeb46b5a..b80592ba29 100644
--- a/bsp/lpc2478/SConstruct
+++ b/bsp/lpc2478/SConstruct
@@ -1,32 +1,32 @@
-import os

-import sys

-import rtconfig

-

-if os.getenv('RTT_ROOT'):

-    RTT_ROOT = os.getenv('RTT_ROOT')

-else:

-    RTT_ROOT = os.path.normpath(os.getcwd() + '/../..')

-

-sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]

-from building import *

-

-TARGET = 'rtthread-lpc24xx.' + rtconfig.TARGET_EXT

-

-env = Environment(tools = ['mingw'],

-	AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,

-	CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,

-	AR = rtconfig.AR, ARFLAGS = '-rc',

-	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)

-env.PrependENVPath('PATH', rtconfig.EXEC_PATH)

-

-Export('RTT_ROOT')

-Export('rtconfig')

-

-# prepare building environment

-objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)

-

-# build program 

-env.Program(TARGET, objs)

-

-# end building 

-EndBuilding(TARGET)

+import os
+import sys
+import rtconfig
+
+if os.getenv('RTT_ROOT'):
+    RTT_ROOT = os.getenv('RTT_ROOT')
+else:
+    RTT_ROOT = os.path.normpath(os.getcwd() + '/../..')
+
+sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
+from building import *
+
+TARGET = 'rtthread-lpc24xx.' + rtconfig.TARGET_EXT
+
+env = Environment(tools = ['mingw'],
+	AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
+	CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+	AR = rtconfig.AR, ARFLAGS = '-rc',
+	LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
+env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
+
+Export('RTT_ROOT')
+Export('rtconfig')
+
+# prepare building environment
+objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
+
+# build program 
+env.Program(TARGET, objs)
+
+# end building 
+EndBuilding(TARGET)
diff --git a/bsp/lpc2478/applications/SConscript b/bsp/lpc2478/applications/SConscript
index 591734409c..01eb940dfb 100644
--- a/bsp/lpc2478/applications/SConscript
+++ b/bsp/lpc2478/applications/SConscript
@@ -1,11 +1,11 @@
-Import('RTT_ROOT')

-Import('rtconfig')

-from building import *

-

-cwd     = os.path.join(str(Dir('#')), 'applications')

-src	= Glob('*.c')

-CPPPATH = [cwd, str(Dir('#'))]

-

-group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)

-

-Return('group')

+Import('RTT_ROOT')
+Import('rtconfig')
+from building import *
+
+cwd     = os.path.join(str(Dir('#')), 'applications')
+src	= Glob('*.c')
+CPPPATH = [cwd, str(Dir('#'))]
+
+group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
+
+Return('group')
diff --git a/bsp/lpc2478/applications/startup.c b/bsp/lpc2478/applications/startup.c
index 642d90f66a..036a61f4d7 100644
--- a/bsp/lpc2478/applications/startup.c
+++ b/bsp/lpc2478/applications/startup.c
@@ -94,14 +94,14 @@ void rtthread_startup(void)
 	
 	/* never reach here */
 	return ;
-}

-

+}
+
 #ifdef __CC_ARM
 int main(void)
-{

-	/* disable interrupt first */

-	rt_hw_interrupt_disable();

-

+{
+	/* disable interrupt first */
+	rt_hw_interrupt_disable();
+
 	/* invoke rtthread_startup */
 	rtthread_startup();
 	
diff --git a/bsp/lpc2478/drivers/SConscript b/bsp/lpc2478/drivers/SConscript
index 245bc46b05..a630c8a7c4 100644
--- a/bsp/lpc2478/drivers/SConscript
+++ b/bsp/lpc2478/drivers/SConscript
@@ -1,22 +1,22 @@
-import copy

-Import('RTT_ROOT')

-Import('rtconfig')

-from building import *

-

-cwd     = GetCurrentDir()

-src	= Glob('*.c')

-

-# remove no need file.

-if GetDepend('RT_USING_LWIP') == False:

-    src_need_remove = ['dm9000.c'] # need remove file list.

-    SrcRemove(src, src_need_remove)

-

-if GetDepend('RT_USING_DFS') == False:

-    src_need_remove = ['sd.c'] # need remove file list.

-    SrcRemove(src, src_need_remove)

-

-CPPPATH = [cwd]

-

-group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)

-

-Return('group')

+import copy
+Import('RTT_ROOT')
+Import('rtconfig')
+from building import *
+
+cwd     = GetCurrentDir()
+src	= Glob('*.c')
+
+# remove no need file.
+if GetDepend('RT_USING_LWIP') == False:
+    src_need_remove = ['dm9000.c'] # need remove file list.
+    SrcRemove(src, src_need_remove)
+
+if GetDepend('RT_USING_DFS') == False:
+    src_need_remove = ['sd.c'] # need remove file list.
+    SrcRemove(src, src_need_remove)
+
+CPPPATH = [cwd]
+
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
+
+Return('group')
diff --git a/bsp/lpc2478/drivers/board.c b/bsp/lpc2478/drivers/board.c
index 9ed24d28bd..b29fcc8d7d 100644
--- a/bsp/lpc2478/drivers/board.c
+++ b/bsp/lpc2478/drivers/board.c
@@ -18,7 +18,7 @@
 #include <LPC24xx.h>
 #include "board.h"
 
-#define DATA_COUNT 14400000/RT_TICK_PER_SECOND	/* T0MR0 = delayInMs * (Fpclk / 1000); */

+#define DATA_COUNT 14400000/RT_TICK_PER_SECOND	/* T0MR0 = delayInMs * (Fpclk / 1000); */
 
 extern void rt_hw_serial_init(void);
 
@@ -39,11 +39,11 @@ void rt_timer_handler(int vector)
  */
 void rt_hw_board_init()
 {
-#if defined(RT_USING_DEVICE) && defined(RT_USING_UART1)

-	rt_hw_serial_init();

-	rt_console_set_device("uart1");

-#endif

-

+#if defined(RT_USING_DEVICE) && defined(RT_USING_UART1)
+	rt_hw_serial_init();
+	rt_console_set_device("uart1");
+#endif
+
 	T0IR 	= 0xff; 
 	T0TC 	= 0;
 	T0MCR 	= 0x03; 
diff --git a/bsp/lpc2478/rtconfig.h b/bsp/lpc2478/rtconfig.h
index d1a5d9d521..c35691aa80 100644
--- a/bsp/lpc2478/rtconfig.h
+++ b/bsp/lpc2478/rtconfig.h
@@ -1,122 +1,122 @@
-/* RT-Thread config file */

-#ifndef __RTTHREAD_CFG_H__

-#define __RTTHREAD_CFG_H__

-

-/* RT_NAME_MAX*/

-#define RT_NAME_MAX	8

-

-/* RT_ALIGN_SIZE*/

-#define RT_ALIGN_SIZE	4

-

-/* PRIORITY_MAX*/

-#define RT_THREAD_PRIORITY_MAX	256

-

-/* Tick per Second*/

-#define RT_TICK_PER_SECOND	100

-

-#define RT_TIMER_THREAD_STACK_SIZE	   512

-

-#define RT_TIMER_THREAD_PRIO       1

- /*     Rate at which timer management task runs (Hz)            */

-#define RT_TIMER_EX_TICKS_PER_SEC   10   

-

-

-/* SECTION: RT_DEBUG */

-/* Thread Debug*/

-/* #define RT_THREAD_DEBUG */

-

-/* Using Hook*/

-#define RT_USING_HOOK

-

-/* SECTION: IPC */

-/* Using Semaphore*/

-#define RT_USING_SEMAPHORE

-

-/* Using Mutex*/

-#define RT_USING_MUTEX

-

-/* Using Event*/

-#define RT_USING_EVENT

-

-/* Using Faset Event*/

-/* #define RT_USING_FASTEVENT */

-

-/* Using MailBox*/

-#define RT_USING_MAILBOX

-

-/* Using Message Queue*/

-#define RT_USING_MESSAGEQUEUE

-

-/* SECTION: Memory Management */

-/* Using Memory Pool Management*/

-#define RT_USING_MEMPOOL

-

-/* Using Dynamic Heap Management*/

-#define RT_USING_HEAP

-

-/* Using Small MM*/

-#define RT_USING_SMALL_MEM

-

-/* Using SLAB Allocator*/

-/* #define RT_USING_SLAB */

-

-/* SECTION: Device System */

-/* Using Device System*/

-#define RT_USING_DEVICE

-

-/* SECTION: Console options */

-#define RT_USING_CONSOLE

-/* the buffer size of console*/

-#define RT_CONSOLEBUF_SIZE	128

-

-/* SECTION: FinSH shell options */

-/* Using FinSH as Shell*/

-#define RT_USING_FINSH

-/* Using symbol table */

-#define FINSH_USING_SYMTAB

-#define FINSH_USING_DESCRIPTION

-

-/* SECTION: lwip, a lighwight TCP/IP protocol stack */

-/* Using lighweight TCP/IP protocol stack*/

-/* #define RT_USING_LWIP */

-

-/* Trace LwIP protocol*/

-/* #define RT_LWIP_DEBUG */

-

-/* Enable ICMP protocol*/

-#define RT_LWIP_ICMP

-

-/* Enable IGMP protocol*/

-#define RT_LWIP_IGMP

-

-/* Enable UDP protocol*/

-#define RT_LWIP_UDP

-

-/* Enable TCP protocol*/

-#define RT_LWIP_TCP

-

-/* Enable SNMP protocol*/

-/* #define RT_LWIP_SNMP */

-

-/* Using DHCP*/

-/* #define RT_LWIP_DHCP */

-

-/* ip address of target*/

-#define RT_LWIP_IPADDR0	192

-#define RT_LWIP_IPADDR1	168

-#define RT_LWIP_IPADDR2	0

-#define RT_LWIP_IPADDR3	30

-

-/* gateway address of target*/

-#define RT_LWIP_GWADDR0	192

-#define RT_LWIP_GWADDR1	168

-#define RT_LWIP_GWADDR2	0

-#define RT_LWIP_GWADDR3	1

-

-/* mask address of target*/

-#define RT_LWIP_MSKADDR0	255

-#define RT_LWIP_MSKADDR1	255

-#define RT_LWIP_MSKADDR2	255

-#define RT_LWIP_MSKADDR3	0

-

-#endif

+/* RT-Thread config file */
+#ifndef __RTTHREAD_CFG_H__
+#define __RTTHREAD_CFG_H__
+
+/* RT_NAME_MAX*/
+#define RT_NAME_MAX	8
+
+/* RT_ALIGN_SIZE*/
+#define RT_ALIGN_SIZE	4
+
+/* PRIORITY_MAX*/
+#define RT_THREAD_PRIORITY_MAX	256
+
+/* Tick per Second*/
+#define RT_TICK_PER_SECOND	100
+
+#define RT_TIMER_THREAD_STACK_SIZE	   512
+
+#define RT_TIMER_THREAD_PRIO       1
+ /*     Rate at which timer management task runs (Hz)            */
+#define RT_TIMER_EX_TICKS_PER_SEC   10   
+
+
+/* SECTION: RT_DEBUG */
+/* Thread Debug*/
+/* #define RT_THREAD_DEBUG */
+
+/* Using Hook*/
+#define RT_USING_HOOK
+
+/* SECTION: IPC */
+/* Using Semaphore*/
+#define RT_USING_SEMAPHORE
+
+/* Using Mutex*/
+#define RT_USING_MUTEX
+
+/* Using Event*/
+#define RT_USING_EVENT
+
+/* Using Faset Event*/
+/* #define RT_USING_FASTEVENT */
+
+/* Using MailBox*/
+#define RT_USING_MAILBOX
+
+/* Using Message Queue*/
+#define RT_USING_MESSAGEQUEUE
+
+/* SECTION: Memory Management */
+/* Using Memory Pool Management*/
+#define RT_USING_MEMPOOL
+
+/* Using Dynamic Heap Management*/
+#define RT_USING_HEAP
+
+/* Using Small MM*/
+#define RT_USING_SMALL_MEM
+
+/* Using SLAB Allocator*/
+/* #define RT_USING_SLAB */
+
+/* SECTION: Device System */
+/* Using Device System*/
+#define RT_USING_DEVICE
+
+/* SECTION: Console options */
+#define RT_USING_CONSOLE
+/* the buffer size of console*/
+#define RT_CONSOLEBUF_SIZE	128
+
+/* SECTION: FinSH shell options */
+/* Using FinSH as Shell*/
+#define RT_USING_FINSH
+/* Using symbol table */
+#define FINSH_USING_SYMTAB
+#define FINSH_USING_DESCRIPTION
+
+/* SECTION: lwip, a lighwight TCP/IP protocol stack */
+/* Using lighweight TCP/IP protocol stack*/
+/* #define RT_USING_LWIP */
+
+/* Trace LwIP protocol*/
+/* #define RT_LWIP_DEBUG */
+
+/* Enable ICMP protocol*/
+#define RT_LWIP_ICMP
+
+/* Enable IGMP protocol*/
+#define RT_LWIP_IGMP
+
+/* Enable UDP protocol*/
+#define RT_LWIP_UDP
+
+/* Enable TCP protocol*/
+#define RT_LWIP_TCP
+
+/* Enable SNMP protocol*/
+/* #define RT_LWIP_SNMP */
+
+/* Using DHCP*/
+/* #define RT_LWIP_DHCP */
+
+/* ip address of target*/
+#define RT_LWIP_IPADDR0	192
+#define RT_LWIP_IPADDR1	168
+#define RT_LWIP_IPADDR2	0
+#define RT_LWIP_IPADDR3	30
+
+/* gateway address of target*/
+#define RT_LWIP_GWADDR0	192
+#define RT_LWIP_GWADDR1	168
+#define RT_LWIP_GWADDR2	0
+#define RT_LWIP_GWADDR3	1
+
+/* mask address of target*/
+#define RT_LWIP_MSKADDR0	255
+#define RT_LWIP_MSKADDR1	255
+#define RT_LWIP_MSKADDR2	255
+#define RT_LWIP_MSKADDR3	0
+
+#endif
diff --git a/bsp/lpc2478/rtconfig.py b/bsp/lpc2478/rtconfig.py
index 71ad51da25..05398aff4b 100644
--- a/bsp/lpc2478/rtconfig.py
+++ b/bsp/lpc2478/rtconfig.py
@@ -1,100 +1,100 @@
-import os

-

-# toolchains options

-ARCH='arm'

-CPU='lpc24xx'

-CROSS_TOOL='keil'

-

-if os.getenv('RTT_CC'):

-	CROSS_TOOL = os.getenv('RTT_CC')

-

-if  CROSS_TOOL == 'gcc':

-	PLATFORM 	= 'gcc'

-	EXEC_PATH 	= 'E:/Program Files/CodeSourcery/Sourcery G++ Lite/bin'

-elif CROSS_TOOL == 'keil':

-	PLATFORM 	= 'armcc'

-	EXEC_PATH 	= 'C:/Keil'

-elif CROSS_TOOL == 'iar':

-    print '================ERROR============================'

-    print 'Not support iar yet!'

-    print '================================================='

-    exit(0)

-

-if os.getenv('RTT_EXEC_PATH'):

-	EXEC_PATH = os.getenv('RTT_EXEC_PATH')

-

-BUILD = 'debug'

-

-if PLATFORM == 'gcc':

-    # toolchains

-    PREFIX = 'arm-none-eabi-'

-    CC = PREFIX + 'gcc'

-    CXX = PREFIX + 'g++'

-    AS = PREFIX + 'gcc'

-    AR = PREFIX + 'ar'

-    LINK = PREFIX + 'gcc'

-    TARGET_EXT = 'axf'

-    SIZE = PREFIX + 'size'

-    OBJDUMP = PREFIX + 'objdump'

-    OBJCPY = PREFIX + 'objcopy'

-

-    DEVICE = ' -mcpu=arm7tdmi-s'

-    CFLAGS = DEVICE + ' -DRT_USING_MINILIBC'

-    AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'

-    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-lpc2478.map,-cref,-u,Reset_Handler -T lpc2478_rom.lds'

-

-    CPATH = ''

-    LPATH = ''

-

-    if BUILD == 'debug':

-        CFLAGS += ' -O0 -gdwarf-2'

-        AFLAGS += ' -gdwarf-2'

-    else:

-        CFLAGS += ' -O2'

-

-    POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'

-

-elif PLATFORM == 'armcc':

-    # toolchains

-    CC = 'armcc'

-    CXX = 'armcc'    

-    AS = 'armasm'

-    AR = 'armar'

-    LINK = 'armlink'

-    TARGET_EXT = 'axf'

-

-    DEVICE = ' --device DARMP'

-    CFLAGS = DEVICE + ' --apcs=interwork'

-    AFLAGS = DEVICE

-    LFLAGS = DEVICE + ' --info sizes --info totals --info unused --info veneers --list rtthread-lpc2478.map --scatter lpc2478_rom.sct'

-

-    CFLAGS += ' -I' + EXEC_PATH + '/ARM/RV31/INC'

-    LFLAGS += ' --libpath ' + EXEC_PATH + '/ARM/RV31/LIB'

-

-    EXEC_PATH += '/arm/bin40/'

-

-    if BUILD == 'debug':

-        CFLAGS += ' -g -O0'

-        AFLAGS += ' -g'

-    else:

-        CFLAGS += ' -O2'

-

-    POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'

-

-elif PLATFORM == 'iar':

-    # toolchains

-    CC = 'iccarm'

-    AS = 'iasmarm'

-    AR = 'iarchive'

-    LINK = 'ilinkarm'

-    TARGET_EXT = 'out'

-

-    DEVICE = ' --cpu DARMP'

-

-    CFLAGS = ''

-    AFLAGS = ''

-    LFLAGS = ' --config lpc24xx_flash.icf'

-

-    EXEC_PATH += '/arm/bin/'

-    RT_USING_MINILIBC = False

-    POST_ACTION = ''

+import os
+
+# toolchains options
+ARCH='arm'
+CPU='lpc24xx'
+CROSS_TOOL='keil'
+
+if os.getenv('RTT_CC'):
+	CROSS_TOOL = os.getenv('RTT_CC')
+
+if  CROSS_TOOL == 'gcc':
+	PLATFORM 	= 'gcc'
+	EXEC_PATH 	= 'E:/Program Files/CodeSourcery/Sourcery G++ Lite/bin'
+elif CROSS_TOOL == 'keil':
+	PLATFORM 	= 'armcc'
+	EXEC_PATH 	= 'C:/Keil'
+elif CROSS_TOOL == 'iar':
+    print '================ERROR============================'
+    print 'Not support iar yet!'
+    print '================================================='
+    exit(0)
+
+if os.getenv('RTT_EXEC_PATH'):
+	EXEC_PATH = os.getenv('RTT_EXEC_PATH')
+
+BUILD = 'debug'
+
+if PLATFORM == 'gcc':
+    # toolchains
+    PREFIX = 'arm-none-eabi-'
+    CC = PREFIX + 'gcc'
+    CXX = PREFIX + 'g++'
+    AS = PREFIX + 'gcc'
+    AR = PREFIX + 'ar'
+    LINK = PREFIX + 'gcc'
+    TARGET_EXT = 'axf'
+    SIZE = PREFIX + 'size'
+    OBJDUMP = PREFIX + 'objdump'
+    OBJCPY = PREFIX + 'objcopy'
+
+    DEVICE = ' -mcpu=arm7tdmi-s'
+    CFLAGS = DEVICE + ' -DRT_USING_MINILIBC'
+    AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp'
+    LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread-lpc2478.map,-cref,-u,Reset_Handler -T lpc2478_rom.lds'
+
+    CPATH = ''
+    LPATH = ''
+
+    if BUILD == 'debug':
+        CFLAGS += ' -O0 -gdwarf-2'
+        AFLAGS += ' -gdwarf-2'
+    else:
+        CFLAGS += ' -O2'
+
+    POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
+
+elif PLATFORM == 'armcc':
+    # toolchains
+    CC = 'armcc'
+    CXX = 'armcc'    
+    AS = 'armasm'
+    AR = 'armar'
+    LINK = 'armlink'
+    TARGET_EXT = 'axf'
+
+    DEVICE = ' --device DARMP'
+    CFLAGS = DEVICE + ' --apcs=interwork'
+    AFLAGS = DEVICE
+    LFLAGS = DEVICE + ' --info sizes --info totals --info unused --info veneers --list rtthread-lpc2478.map --scatter lpc2478_rom.sct'
+
+    CFLAGS += ' -I' + EXEC_PATH + '/ARM/RV31/INC'
+    LFLAGS += ' --libpath ' + EXEC_PATH + '/ARM/RV31/LIB'
+
+    EXEC_PATH += '/arm/bin40/'
+
+    if BUILD == 'debug':
+        CFLAGS += ' -g -O0'
+        AFLAGS += ' -g'
+    else:
+        CFLAGS += ' -O2'
+
+    POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
+
+elif PLATFORM == 'iar':
+    # toolchains
+    CC = 'iccarm'
+    AS = 'iasmarm'
+    AR = 'iarchive'
+    LINK = 'ilinkarm'
+    TARGET_EXT = 'out'
+
+    DEVICE = ' --cpu DARMP'
+
+    CFLAGS = ''
+    AFLAGS = ''
+    LFLAGS = ' --config lpc24xx_flash.icf'
+
+    EXEC_PATH += '/arm/bin/'
+    RT_USING_MINILIBC = False
+    POST_ACTION = ''