diff options
| author | [email protected] <[email protected]> | 2011-06-14 01:09:16 +0000 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2011-06-14 01:09:16 +0000 |
| commit | 3d4b5722fca72bd60d56b3ad97db70597550149a (patch) | |
| tree | ae3e0c6c951cfbe78e9f7f5148d50a828710578d | |
| parent | 28fbe864e448e4d1c00c947333f96603af185ea9 (diff) | |
eliminate compiler warning
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1501 bbd45198-f89e-11dd-88c7-29a3b14d5316
| -rw-r--r-- | bsp/lm3s/application.c | 2 | ||||
| -rw-r--r-- | bsp/lm3s/luminaryif.c | 6 | ||||
| -rw-r--r-- | bsp/lm3s/project.Uv2 | 4 | ||||
| -rw-r--r-- | bsp/lm3s/rtconfig.h | 2 | ||||
| -rw-r--r-- | bsp/lm3s/startup.c | 8 |
5 files changed, 15 insertions, 7 deletions
diff --git a/bsp/lm3s/application.c b/bsp/lm3s/application.c index b697141116..fded03279f 100644 --- a/bsp/lm3s/application.c +++ b/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");
diff --git a/bsp/lm3s/luminaryif.c b/bsp/lm3s/luminaryif.c index f28c3904fa..6038059179 100644 --- a/bsp/lm3s/luminaryif.c +++ b/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;
}
diff --git a/bsp/lm3s/project.Uv2 b/bsp/lm3s/project.Uv2 index 4164d5737b..746a4a1fff 100644 --- a/bsp/lm3s/project.Uv2 +++ b/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)
diff --git a/bsp/lm3s/rtconfig.h b/bsp/lm3s/rtconfig.h index 31169ea56a..c4158624d4 100644 --- a/bsp/lm3s/rtconfig.h +++ b/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*/
diff --git a/bsp/lm3s/startup.c b/bsp/lm3s/startup.c index 412b74c738..5f74e3e426 100644 --- a/bsp/lm3s/startup.c +++ b/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; |