update rtc driver

add webserver support

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@295 bbd45198-f89e-11dd-88c7-29a3b14d5316

bsp/mini2440/SConstruct

@@ -35,6 +35,9 @@ if rtconfig.RT_USING_LWIP:
 	objs = objs + SConscript(RTT_ROOT + '/net/lwip/SConscript', variant_dir='build/net/lwip', duplicate=0)
 	objs = objs + SConscript(RTT_ROOT + '/net/apps/SConscript', variant_dir='build/net/apps', duplicate=0)
 
+if rtconfig.RT_USING_WEBSERVER:
+	objs = objs + SConscript(RTT_ROOT + '/net/webserver/SConscript', variant_dir='build/net/webserver', duplicate=0)
+
 if rtconfig.RT_USING_RTGUI:
 	objs = objs + SConscript(RTT_ROOT + '/rtgui/SConscript', variant_dir='build/rtgui', duplicate=0)
 

bsp/mini2440/rtconfig.h

@@ -90,14 +90,14 @@
 
 /* SECTION: Device filesystem support */
 /* using DFS support */
-/* #define RT_USING_DFS */
+#define RT_USING_DFS
 #define RT_USING_DFS_EFSL
 #define RT_USING_DFS_YAFFS2
 
 #define RT_USING_WORKDIR
 
 /* the max number of mounted filesystem */
-#define DFS_FILESYSTEMS_MAX			2
+#define DFS_FILESYSTEMS_MAX		2
 /* the max number of opened files 		*/
 #define DFS_FD_MAX					16
 /* the max number of cached sector 		*/
@@ -127,7 +127,10 @@
 #define RT_LWIP_TCP_PCB_NUM	5
 
 /* TCP sender buffer space */
-#define RT_LWIP_TCP_SND_BUF	10240
+#define RT_LWIP_TCP_SND_BUF	1024*10
+
+/* TCP receive window. */
+#define RT_LWIP_TCP_WND	1024
 
 /* Enable SNMP protocol */
 /* #define RT_LWIP_SNMP */

bsp/mini2440/rtconfig.py

@@ -11,6 +11,7 @@ RT_USING_DFS_YAFFS2 = False
 
 # lwip options
 RT_USING_LWIP = True
+RT_USING_WEBSERVER = False
 
 # rtgui options
 RT_USING_RTGUI = True
@@ -77,6 +78,9 @@ elif PLATFORM == 'armcc':
 
     EXEC_PATH += '/arm/bin40/'
 
+    if RT_USING_WEBSERVER:
+        CFLAGS +=  ' -DWEBS -DUEMF -DRTT -D__NO_FCNTL=1'
+
     if BUILD == 'debug':
         CFLAGS += ' -g -O0'
         AFLAGS += ' -g'

bsp/mini2440/startup.c

@@ -25,6 +25,7 @@
 
 extern void rt_hw_interrupt_init(void);
 extern void rt_hw_board_init(void);
+extern void rt_hw_rtc_init(void);
 extern void rt_serial_init(void);
 extern void rt_system_timer_init(void);
 extern void rt_system_scheduler_init(void);
@@ -102,6 +103,9 @@ void rtthread_startup(void)
 	rt_hw_sdcard_init();
 #endif
 
+	/* rtc init */
+	rt_hw_rtc_init();
+
 	/*init all registed devices */
 	rt_device_init_all();
 #endif

bsp/stm3210/rtconfig.py

@@ -17,10 +17,10 @@ RT_USING_RTGUI = False
 # toolchains options
 ARCH='arm'
 CPU='stm32'
-#PLATFORM = 'gcc'
-#EXEC_PATH = 'd:/codesourcery/bin'
-PLATFORM = 'armcc'
-EXEC_PATH = 'C:/Keil'
+PLATFORM = 'gcc'
+EXEC_PATH = 'E:/Program Files/CodeSourcery/Sourcery G++ Lite/bin'
+#PLATFORM = 'armcc'
+#EXEC_PATH = 'C:/Keil'
 #PLATFORM = 'iar'
 #EXEC_PATH = 'E:/Program Files/IAR Systems/Embedded Workbench 5.4/'
 BUILD = 'debug'

finsh/finsh.h

@@ -62,15 +62,15 @@ typedef unsigned int size_t;
 #define strlen	rt_strlen
 #define strncpy	rt_strncpy
 #define strncmp	rt_strncmp
-#else
-#include <string.h>
-#endif
 
 int strcmp (const char *s1, const char *s2);
 char *strdup(const char *s);
 
 int isalpha( int ch );
 int atoi(const char* s);
+#else
+#include <string.h>
+#endif
 #endif
 
 #define FINSH_VERSION_MAJOR			0

net/lwip/src/lwipopts.h

@@ -189,7 +189,11 @@
 #define TCP_SNDLOWAT                (TCP_SND_BUF/2)
 
 /* TCP receive window. */
-#define TCP_WND                     1500
+#ifdef RT_LWIP_TCP_WND
+#define TCP_WND                 RT_LWIP_TCP_WND
+#else
+#define TCP_WND                 1500
+#endif
 
 /* Maximum number of retransmissions of data segments. */
 #define TCP_MAXRTX                  12