update stm32 project and remove 107 eth driver from 10x

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

bsp/stm32f10x/SConscript

@@ -12,10 +12,7 @@ if GetDepend('RT_USING_DFS'):
 		src_drv += ['msd.c']
 
 if GetDepend('RT_USING_LWIP'):
-	if rtconfig.STM32_TYPE == 'STM32F10X_CL':
+	src_drv += ['enc28j60.c'] + ['dm9000a.c']
-		src_drv += ['stm32_eth.c']
-	else:
-		src_drv += ['enc28j60.c'] + ['dm9000a.c']
 
 if GetDepend('RT_USING_RTGUI'):
     src_drv += ['key.c', 'touch.c', 'calibration.c']

bsp/stm32f10x/SConstruct

@@ -27,7 +27,7 @@ Export('rtconfig')
 objs = PrepareBuilding(env, RTT_ROOT)
 
 # STM32 firemare library building script
-objs = objs + SConscript(RTT_ROOT + '/bsp/stm32f10x/Libraries/SConscript', variant_dir='build/bsp/Libraries', duplicate=0)
+objs = objs + SConscript( GetCurrentDir() + '/Libraries/SConscript', variant_dir='build/bsp/Libraries', duplicate=0)
 
 if GetDepend('RT_USING_RTGUI'):
     objs = objs + SConscript(RTT_ROOT + '/examples/gui/SConscript', variant_dir='build/examples/gui', duplicate=0)

bsp/stm32f10x/application.c

@@ -1,3 +1,4 @@
+
 /*
  * File      : application.c
  * This file is part of RT-Thread RTOS
@@ -35,6 +36,13 @@
 #include <netif/ethernetif.h>
 #endif
 
+#ifdef RT_USING_RTGUI
+#include <rtgui/rtgui.h>
+#include <rtgui/rtgui_server.h>
+#include <rtgui/rtgui_system.h>
+#include <rtgui/driver.h>
+#endif
+
 #include "led.h"
 
 ALIGN(RT_ALIGN_SIZE)
@@ -118,6 +126,11 @@ void rt_init_thread_entry(void* parameter)
 
 #ifdef RT_USING_RTGUI
 	{
+	    extern void rtgui_startup();
+	    extern void rt_hw_lcd_init();
+	    extern void rtgui_touch_hw_init(void);
+	    extern void rt_hw_key_init(void);
+
 		rt_device_t lcd;
 
 		/* init lcd */