Browse Source

eliminate compiler warning

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1501 bbd45198-f89e-11dd-88c7-29a3b14d5316
qiuyiuestc@gmail.com 14 years ago
parent
commit
3d4b5722fc
5 changed files with 15 additions and 7 deletions
  1. 1 1
      bsp/lm3s/application.c
  2. 4 2
      bsp/lm3s/luminaryif.c
  3. 2 2
      bsp/lm3s/project.Uv2
  4. 1 1
      bsp/lm3s/rtconfig.h
  5. 7 1
      bsp/lm3s/startup.c

+ 1 - 1
bsp/lm3s/application.c

@@ -61,7 +61,7 @@ void rt_init_thread_entry(void *parameter)
 #ifdef RT_USING_LWIP
 	{
 		extern void lwip_sys_init(void);
-		
+				
 		/* init lwip system */
 		lwip_sys_init();
 		rt_kprintf("TCP/IP initialized!\n");

+ 4 - 2
bsp/lm3s/luminaryif.c

@@ -125,6 +125,8 @@ void luminaryif_isr(void)
         /* a frame has been received */
         result = eth_device_ready((struct eth_device*)&(luminaryif_dev->parent));
 
+		if(result != RT_EOK) rt_set_errno(-RT_ERROR);
+
         //
         // Disable Ethernet RX Interrupt.
         //
@@ -481,7 +483,7 @@ int rt_hw_luminaryif_init(void)
 	rt_sem_init(&tx_sem, "emac", 1, RT_IPC_FLAG_FIFO);
 
 	result = eth_device_init(&(luminaryif_dev->parent), "E0");
-
-	return RT_EOK;
+	
+	return result;
 }
 

+ 2 - 2
bsp/lm3s/project.Uv2

@@ -119,7 +119,7 @@ File 7,4,<.\Libraries\driverlib\rvmdk\driverlib.lib><driverlib.lib>
 
 
 Options 1,0,0  // Target 'RT-Thread-lm3s'
- Device (LM3S6918)
+ Device (LM3S8962)
  Vendor (Luminary Micro)
  Cpu (IRAM(0x20000000-0x2000FFFF) IROM(0-0x3FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3"))
  FlashUt ()
@@ -200,7 +200,7 @@ Options 1,0,0  // Target 'RT-Thread-lm3s'
  ADSLDMC ( --keep __fsym_* --keep __vsym_*)
  ADSLDIF ()
  ADSLDDW ()
-  OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S6918)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S6918)
+  OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S8962)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S8962)
   OPTDBG 48118,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()
  FLASH1 { 1,0,0,0,1,0,0,0,3,16,0,0,0,0,0,0,0,0,0,0 }
  FLASH2 (BIN\lmidk-agdi.dll)

+ 1 - 1
bsp/lm3s/rtconfig.h

@@ -16,7 +16,7 @@
 
 /* SECTION: RT_DEBUG */
 /* Thread Debug*/
-#define RT_DEBUG
+/* #define RT_DEBUG */
 /* #define RT_THREAD_DEBUG */
 
 /* Using Hook*/

+ 7 - 1
bsp/lm3s/startup.c

@@ -16,6 +16,11 @@
 #include <rtthread.h>
 
 #include "board.h"
+
+#ifdef RT_USING_LWIP
+#include <lwip/sys.h>
+#include <netif/ethernetif.h>
+#endif
 
 /**
  * @addtogroup LM3S
@@ -29,8 +34,9 @@ extern void finsh_system_init(void);
 extern void finsh_set_device(char* device);
 #endif
 
-extern int  rt_application_init(void);
+extern int rt_application_init(void);
 extern void rt_hw_sdcard_init(void);
+extern int rt_hw_luminaryif_init(void);
 
 #ifdef __CC_ARM
 extern int Image$$RW_IRAM1$$ZI$$Limit;