From 52bda78249a04c91f2cafa7ae67951097e755261 Mon Sep 17 00:00:00 2001 From: "bernard.xiong" Date: Fri, 25 Dec 2009 12:20:04 +0000 Subject: [PATCH] remove device file system and lwip feature temporary. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@227 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/mini2440/application.c | 4 +- bsp/mini2440/board.c | 18 +++---- bsp/mini2440/board.h | 2 +- bsp/mini2440/debug.Opt | 4 ++ bsp/mini2440/debug.Uv2 | 2 +- bsp/mini2440/rtconfig.h | 100 ++++++++++++++++++++----------------- bsp/mini2440/rtconfig.py | 6 +-- bsp/mini2440/startup.c | 5 +- 8 files changed, 78 insertions(+), 63 deletions(-) diff --git a/bsp/mini2440/application.c b/bsp/mini2440/application.c index 2b41df4be7..24c62ac67b 100644 --- a/bsp/mini2440/application.c +++ b/bsp/mini2440/application.c @@ -1,11 +1,11 @@ /* - * File : app.c + * File : application.c * This file is part of RT-Thread RTOS * COPYRIGHT (C) 2006, RT-Thread Development Team * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at - * http://openlab.rt-thread.com/license/LICENSE + * http://www.rt-thread.org/license/LICENSE * * Change Logs: * Date Author Notes diff --git a/bsp/mini2440/board.c b/bsp/mini2440/board.c index 347a21f52d..7b6a1d862c 100644 --- a/bsp/mini2440/board.c +++ b/bsp/mini2440/board.c @@ -1,11 +1,11 @@ /* * File : board.c * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006, RT-Thread Develop Team + * COPYRIGHT (C) 2006 - 2009 RT-Thread Develop Team * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at - * http://openlab.rt-thread.com/license/LICENSE + * http://www.rt-thread.org/license/LICENSE * * Change Logs: * Date Author Notes @@ -28,7 +28,7 @@ extern rt_uint32_t PCLK, FCLK, HCLK, UCLK; extern rt_uint8_t asc16_font[]; extern rt_uint16_t _rt_hw_framebuffer[]; - + extern void rt_hw_clock_init(void); extern void rt_hw_lcd_init(void); extern void rt_hw_mmu_init(void); @@ -100,7 +100,7 @@ void rt_hw_uart_init(void) * tx=level,rx=edge,disable timeout int.,enable rx error int., * normal,interrupt or polling */ - uart0.uart_device->ucon = 0x245; + uart0.uart_device->ucon = 0x245; /* Set uart0 bps */ uart0.uart_device->ubrd = (rt_int32_t)(PCLK / (BPS * 16)) - 1; /* output PCLK to UART0/1, PWMTIMER */ @@ -119,12 +119,12 @@ void rt_hw_uart_init(void) * This function will init s3ceb2410 board */ void rt_hw_board_init() -{ - /* initialize the system clock */ +{ + /* initialize the system clock */ rt_hw_clock_init(); - - /* Get the clock */ - rt_hw_get_clock(); + + /* Get the clock */ + rt_hw_get_clock(); /* initialize uart */ rt_hw_uart_init(); diff --git a/bsp/mini2440/board.h b/bsp/mini2440/board.h index c65d42e921..9e16b75db0 100644 --- a/bsp/mini2440/board.h +++ b/bsp/mini2440/board.h @@ -5,7 +5,7 @@ * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at - * http://openlab.rt-thread.com/license/LICENSE + * http://www.rt-thread.org/license/LICENSE * * Change Logs: * Date Author Notes diff --git a/bsp/mini2440/debug.Opt b/bsp/mini2440/debug.Opt index b763e6369d..7ccfba3747 100644 --- a/bsp/mini2440/debug.Opt +++ b/bsp/mini2440/debug.Opt @@ -27,8 +27,12 @@ TARGOPT 1, (RT-Thread Debug) OPTBL 0,(User's Manual) OPTDL (SARM.DLL)()(DARMSS9.DLL)(-pS3C2410A)(SARM.DLL)()(TARMSS9.DLL)(-pS3C2410A) OPTDBG 47614,6,()()()()()()()()()(.\Ext_RAM.ini) (Segger\JLTAgdi.dll)()()() + OPTKEY 0,(DLGTARM)((113=-1,-1,-1,-1,0)(100=90,124,666,445,0)(102=-1,-1,-1,-1,0)(103=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(109=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)) + OPTKEY 0,(JLTAgdi)(-O1070 -J1 -Y1000 -Z1 -FO7 -FD40000000 -FC800 -FN0) + OPTKEY 0,(JLTDLG)() OPTKEY 0,(DLGDARM)((113=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(102=-1,-1,-1,-1,0)(103=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(109=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)) OPTKEY 0,(ARMDBGFLAGS)(-T5F) + OPTMM 1,2,(uart0.uart_device) OPTDF 0x86 OPTLE <> OPTLC <> diff --git a/bsp/mini2440/debug.Uv2 b/bsp/mini2440/debug.Uv2 index d5c472c013..01e8ac5e7c 100644 --- a/bsp/mini2440/debug.Uv2 +++ b/bsp/mini2440/debug.Uv2 @@ -53,7 +53,7 @@ Options 1,0,0 // Target 'RT-Thread Debug' ADSFLGA { 242,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } ACPUTYP (ARM920T) RVDEV () - ADSTFLGA { 0,8,0,0,96,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0 } + ADSTFLGA { 0,8,64,0,96,0,64,64,0,0,0,0,0,0,0,0,0,0,0,0 } OCMADSOCM { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } OCMADSIRAM { 0,0,0,0,64,0,32,0,0 } OCMADSIROM { 0,0,0,0,0,0,0,0,0 } diff --git a/bsp/mini2440/rtconfig.h b/bsp/mini2440/rtconfig.h index 55b3bd4873..2a982a8731 100644 --- a/bsp/mini2440/rtconfig.h +++ b/bsp/mini2440/rtconfig.h @@ -8,57 +8,66 @@ /* RT_ALIGN_SIZE*/ #define RT_ALIGN_SIZE 4 -/* PRIORITY_MAX*/ +/* PRIORITY_MAX */ #define RT_THREAD_PRIORITY_MAX 256 -/* Tick per Second*/ +/* Tick per Second */ #define RT_TICK_PER_SECOND 100 /* SECTION: RT_DEBUG */ -/* Thread Debug*/ +/* Thread Debug */ +#define RT_DEBUG /* #define RT_THREAD_DEBUG */ -/* Using Hook*/ +#define RT_USING_OVERFLOW_CHECK + +/* Using Hook */ #define RT_USING_HOOK +/* Using Software Timer */ +#define RT_USING_TIMER_SOFT +#define RT_TIMER_THREAD_PRIO 8 +#define RT_TIMER_THREAD_STACK_SIZE 512 +#define RT_TIMER_TICK_PER_SECOND 10 + /* SECTION: IPC */ -/* Using Semaphore*/ +/* Using Semaphore */ #define RT_USING_SEMAPHORE -/* Using Mutex*/ +/* Using Mutex */ #define RT_USING_MUTEX -/* Using Event*/ +/* Using Event */ #define RT_USING_EVENT -/* Using MailBox*/ +/* Using MailBox */ #define RT_USING_MAILBOX -/* Using Message Queue*/ +/* Using Message Queue */ #define RT_USING_MESSAGEQUEUE /* SECTION: Memory Management */ /* Using Memory Pool Management*/ #define RT_USING_MEMPOOL -/* Using Dynamic Heap Management*/ +/* Using Dynamic Heap Management */ #define RT_USING_HEAP -/* Using Small MM*/ +/* Using Small MM */ /* #define RT_USING_SMALL_MEM */ -/* Using SLAB Allocator*/ +/* Using SLAB Allocator */ #define RT_USING_SLAB /* SECTION: Device System */ -/* Using Device System*/ +/* Using Device System */ #define RT_USING_DEVICE /* SECTION: Console options */ -/* the buffer size of console*/ +/* the buffer size of console */ #define RT_CONSOLEBUF_SIZE 128 -/* SECTION: FinSH shell options */ +/* SECTION: finsh, a C-Express shell */ /* Using FinSH as Shell*/ #define RT_USING_FINSH /* Using symbol table */ @@ -66,30 +75,29 @@ #define FINSH_USING_DESCRIPTION /* SECTION: a runtime libc library */ -/* a runtime libc library*/ +/* a runtime libc library */ /* #define RT_USING_NEWLIB */ /* SECTION: a mini libc */ -/* Using mini libc library*/ +/* Using mini libc library */ /* #define RT_USING_MINILIBC */ /* SECTION: C++ support */ -/* Using C++ support*/ +/* Using C++ support */ /* #define RT_USING_CPLUSPLUS */ /* SECTION: RTGUI support */ -/* using RTGUI support*/ +/* using RTGUI support */ /* #define RT_USING_RTGUI */ /* SECTION: Device filesystem support */ -/* using DFS support*/ -#define RT_USING_DFS +/* using DFS support */ +/* #define RT_USING_DFS */ #define RT_USING_DFS_EFSL #define RT_USING_DFS_YAFFS2 #define RT_USING_WORKDIR -/* SECTION: DFS options */ /* the max number of mounted filesystem */ #define DFS_FILESYSTEMS_MAX 2 /* the max number of opened files */ @@ -98,82 +106,82 @@ #define DFS_CACHE_MAX_NUM 4 /* SECTION: lwip, a lighwight TCP/IP protocol stack */ -/* Using lighweight TCP/IP protocol stack*/ -#define RT_USING_LWIP +/* Using lighweight TCP/IP protocol stack */ +/* #define RT_USING_LWIP */ #define RT_LWIP_DNS -/* Using webserver goahead support*/ +/* Using webserver goahead support */ #define RT_USING_WEBSERVER -/* Using ftpserver support*/ +/* Using ftpserver support */ #define RT_USING_FTPSERVER -/* Trace LwIP protocol*/ +/* Trace LwIP protocol */ /* #define RT_LWIP_DEBUG */ -/* Enable ICMP protocol*/ +/* Enable ICMP protocol */ #define RT_LWIP_ICMP -/* Enable IGMP protocol*/ +/* Enable IGMP protocol */ #define RT_LWIP_IGMP -/* Enable UDP protocol*/ +/* Enable UDP protocol */ #define RT_LWIP_UDP -/* Enable TCP protocol*/ +/* Enable TCP protocol */ #define RT_LWIP_TCP /* the number of simulatenously active TCP connections*/ #define RT_LWIP_TCP_PCB_NUM 5 -/* TCP sender buffer space*/ +/* TCP sender buffer space */ #define RT_LWIP_TCP_SND_BUF 10240 -/* Enable SNMP protocol*/ +/* Enable SNMP protocol */ /* #define RT_LWIP_SNMP */ -/* Using DHCP*/ +/* Using DHCP */ /* #define RT_LWIP_DHCP */ #define RT_LWIP_DNS -/* ip address of target*/ +/* ip address of target */ #define RT_LWIP_IPADDR0 192 #define RT_LWIP_IPADDR1 168 -#define RT_LWIP_IPADDR2 0 +#define RT_LWIP_IPADDR2 1 #define RT_LWIP_IPADDR3 30 -/* gateway address of target*/ +/* gateway address of target */ #define RT_LWIP_GWADDR0 192 #define RT_LWIP_GWADDR1 168 -#define RT_LWIP_GWADDR2 0 +#define RT_LWIP_GWADDR2 1 #define RT_LWIP_GWADDR3 1 -/* mask address of target*/ +/* mask address of target */ #define RT_LWIP_MSKADDR0 255 #define RT_LWIP_MSKADDR1 255 #define RT_LWIP_MSKADDR2 255 #define RT_LWIP_MSKADDR3 0 -/* the number of blocks for pbuf*/ +/* the number of blocks for pbuf */ #define RT_LWIP_PBUF_NUM 16 -/* thread priority of tcpip thread*/ +/* thread priority of tcpip thread */ #define RT_LWIP_TCPTHREAD_PRIORITY 128 -/* mail box size of tcpip thread to wait for*/ +/* mail box size of tcpip thread to wait for */ #define RT_LWIP_TCPTHREAD_MBOX_SIZE 8 -/* thread stack size of tcpip thread*/ +/* thread stack size of tcpip thread */ #define RT_LWIP_TCPTHREAD_STACKSIZE 4096 -/* thread priority of ethnetif thread*/ +/* thread priority of ethnetif thread */ #define RT_LWIP_ETHTHREAD_PRIORITY 144 -/* mail box size of ethnetif thread to wait for*/ +/* mail box size of ethnetif thread to wait for */ #define RT_LWIP_ETHTHREAD_MBOX_SIZE 32 -/* thread stack size of ethnetif thread*/ +/* thread stack size of ethnetif thread */ #define RT_LWIP_ETHTHREAD_STACKSIZE 1024 #endif diff --git a/bsp/mini2440/rtconfig.py b/bsp/mini2440/rtconfig.py index 6c03502314..5022ccbe4a 100644 --- a/bsp/mini2440/rtconfig.py +++ b/bsp/mini2440/rtconfig.py @@ -4,13 +4,13 @@ RT_USING_FINSH = True # device file system options -RT_USING_DFS = True +RT_USING_DFS = False RT_USING_DFS_EFSL = True RT_USING_DFS_ELMFAT = False RT_USING_DFS_YAFFS2 = False # lwip options -RT_USING_LWIP = True +RT_USING_LWIP = False # rtgui options RT_USING_RTGUI = False @@ -23,7 +23,7 @@ TextBase='0x30000000' #PLATFORM = 'gcc' #EXEC_PATH = 'd:/SourceryGCC/bin' PLATFORM = 'armcc' -EXEC_PATH = 'C:/Keil' +EXEC_PATH = 'E:/Keil' BUILD = 'debug' if PLATFORM == 'gcc': diff --git a/bsp/mini2440/startup.c b/bsp/mini2440/startup.c index e333a0cbff..8fa00c82db 100644 --- a/bsp/mini2440/startup.c +++ b/bsp/mini2440/startup.c @@ -5,7 +5,7 @@ * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at - * http://openlab.rt-thread.com/license/LICENSE + * http://www.rt-thread.org/license/LICENSE * * Change Logs: * Date Author Notes @@ -94,7 +94,10 @@ void rtthread_startup(void) rt_hw_serial_register(&uart0_device, "uart0", RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_STREAM, &uart0); + +#ifdef RT_USING_DFS rt_hw_sdcard_init(); +#endif /*init all registed devices */ rt_device_init_all();