diff options
| author | yygg_you <[email protected]> | 2017-10-06 08:58:24 +0800 |
|---|---|---|
| committer | yygg_you <[email protected]> | 2017-10-06 08:58:24 +0800 |
| commit | 2e01bafa71dc0309abfca352edae8872d27038fc (patch) | |
| tree | a4208429d31866a5938ee6484ae25b525d0180d7 /components/net | |
| parent | ad1d3375f222c5746514ab16003dc18c0df83dad (diff) | |
| parent | a15d90a6865fa05e2420205556df7cece5f5c134 (diff) | |
Merge branch 'master' of https://github.com/yygg/rt-thread
Diffstat (limited to 'components/net')
| -rw-r--r-- | components/net/lwip-2.0.0/src/arch/sys_arch.c | 2 | ||||
| -rw-r--r-- | components/net/lwip-2.0.2/src/arch/sys_arch.c | 4 | ||||
| -rw-r--r-- | components/net/lwip-2.0.2/src/netif/ethernetif.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/net/lwip-2.0.0/src/arch/sys_arch.c b/components/net/lwip-2.0.0/src/arch/sys_arch.c index 7db873f130..c5b4dbbf47 100644 --- a/components/net/lwip-2.0.0/src/arch/sys_arch.c +++ b/components/net/lwip-2.0.0/src/arch/sys_arch.c @@ -600,7 +600,7 @@ u32_t sys_now(void) return rt_tick_get() * (1000 / RT_TICK_PER_SECOND); } -WEAK +RT_WEAK void mem_init(void) { } diff --git a/components/net/lwip-2.0.2/src/arch/sys_arch.c b/components/net/lwip-2.0.2/src/arch/sys_arch.c index cd76a73abe..bb809ac6ad 100644 --- a/components/net/lwip-2.0.2/src/arch/sys_arch.c +++ b/components/net/lwip-2.0.2/src/arch/sys_arch.c @@ -177,7 +177,7 @@ int lwip_system_init(void) return 0; } -//INIT_COMPONENT_EXPORT(lwip_system_init); +INIT_COMPONENT_EXPORT(lwip_system_init); void sys_init(void) { @@ -602,7 +602,7 @@ u32_t sys_now(void) } -WEAK +RT_WEAK void mem_init(void) { } diff --git a/components/net/lwip-2.0.2/src/netif/ethernetif.c b/components/net/lwip-2.0.2/src/netif/ethernetif.c index c648dcf1a9..5b82649662 100644 --- a/components/net/lwip-2.0.2/src/netif/ethernetif.c +++ b/components/net/lwip-2.0.2/src/netif/ethernetif.c @@ -451,7 +451,7 @@ int eth_system_device_init(void) return (int)result; } -//INIT_DEVICE_EXPORT(eth_system_device_init); +INIT_DEVICE_EXPORT(eth_system_device_init); #ifdef RT_USING_FINSH #include <finsh.h> |