libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2413 from liruncong/errorwarn 

部分警告及问题修改
This commit is contained in:
Bernard Xiong 2019-03-10 13:02:59 +08:00 committed by GitHub
parent 59d04452ce 4f108dbadf
commit 1cf890c1bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 94 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/cplusplus/crt_init.c
View File

@ -13,10 +13,10 @@
#include <rtthread.h> #include <rtthread.h>
#ifdef __CC_ARM #if defined(__CC_ARM) || defined(__CLANG_ARM)
extern void $Super$$__cpp_initialize__aeabi_(void); extern void $Super$$__cpp_initialize__aeabi_(void);
/* we need to change the cpp_initialize order */ /* we need to change the cpp_initialize order */
void $Sub$$__cpp_initialize__aeabi_(void) RT_WEAK void $Sub$$__cpp_initialize__aeabi_(void)
{ {
/* empty */ /* empty */
} }
@ -34,19 +34,9 @@ RT_WEAK void *__dso_handle = 0;
#endif #endif
RT_WEAK RT_WEAK int cplusplus_system_init(void)
int cplusplus_system_init(void)
{ {
#if defined(__GNUC__) && !defined(__CC_ARM) #if defined(__CC_ARM) || defined(__CLANG_ARM)
typedef void (*pfunc) ();
extern pfunc __ctors_start__[];
extern pfunc __ctors_end__[];
pfunc *p;
for (p = __ctors_start__; p < __ctors_end__; p++)
(*p)();
#elif defined(__CC_ARM)
/* If there is no SHT$$INIT_ARRAY, calling /* If there is no SHT$$INIT_ARRAY, calling
* $Super$$__cpp_initialize__aeabi_() will cause fault. At least until Keil5.12 * $Super$$__cpp_initialize__aeabi_() will cause fault. At least until Keil5.12
* the problem still exists. So we have to initialize the C++ runtime by ourself. * the problem still exists. So we have to initialize the C++ runtime by ourself.
@ -63,9 +53,16 @@ int cplusplus_system_init(void)
PROC *proc = (PROC*)((const char*)base + *base); PROC *proc = (PROC*)((const char*)base + *base);
(*proc)(); (*proc)();
} }
#elif defined(__GNUC__)
typedef void(*pfunc) ();
extern pfunc __ctors_start__[];
extern pfunc __ctors_end__[];
pfunc *p;
for (p = __ctors_start__; p < __ctors_end__; p++)
(*p)();
#endif #endif
return 0; return 0;
} }
INIT_COMPONENT_EXPORT(cplusplus_system_init); INIT_COMPONENT_EXPORT(cplusplus_system_init);

2
components/libc/compilers/armlibc/SConscript
View File

@ -14,7 +14,7 @@ if GetDepend('RT_USING_DFS') == False:
if GetDepend('RT_USING_MODULE') == False: if GetDepend('RT_USING_MODULE') == False:
SrcRemove(src, ['libc_syms.c']) SrcRemove(src, ['libc_syms.c'])
if rtconfig.PLATFORM == 'armcc': if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang':
group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'],
CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)

2
components/libc/compilers/armlibc/stubs.c
View File

@ -251,7 +251,7 @@ void _ttywrch(int ch)
#endif #endif
} }
void _sys_exit(int return_code) RT_WEAK void _sys_exit(int return_code)
{ {
/* TODO: perhaps exit the thread which is invoking this function */ /* TODO: perhaps exit the thread which is invoking this function */
while (1); while (1);

40
components/net/lwip-1.4.1/src/include/netif/ethernetif.h
View File

@ -17,27 +17,35 @@
struct eth_device struct eth_device
{ {
/* inherit from rt_device */ /* inherit from rt_device */
struct rt_device parent; struct rt_device parent;
/* network interface for lwip */ /* network interface for lwip */
struct netif *netif; struct netif *netif;
struct rt_semaphore tx_ack; struct rt_semaphore tx_ack;
rt_uint16_t flags; rt_uint16_t flags;
rt_uint8_t link_changed; rt_uint8_t link_changed;
rt_uint8_t link_status; rt_uint8_t link_status;
/* eth device interface */ /* eth device interface */
struct pbuf* (*eth_rx)(rt_device_t dev); struct pbuf* (*eth_rx)(rt_device_t dev);
rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p); rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p);
}; };
rt_err_t eth_device_ready(struct eth_device* dev); #ifdef __cplusplus
rt_err_t eth_device_init(struct eth_device * dev, char *name); extern "C" {
rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flag); #endif
rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
int eth_system_device_init(void); rt_err_t eth_device_ready(struct eth_device* dev);
rt_err_t eth_device_init(struct eth_device * dev, const char *name);
rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flag);
rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
int eth_system_device_init(void);
#ifdef __cplusplus
}
#endif
#endif /* __NETIF_ETHERNETIF_H__ */ #endif /* __NETIF_ETHERNETIF_H__ */

4
components/net/lwip-1.4.1/src/netif/ethernetif.c
View File

@ -177,7 +177,7 @@ static err_t eth_netif_device_init(struct netif *netif)
} }
/* Keep old drivers compatible in RT-Thread */ /* Keep old drivers compatible in RT-Thread */
rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flags) rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flags)
{ {
struct netif* netif; struct netif* netif;
@ -242,7 +242,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16
return RT_EOK; return RT_EOK;
} }
rt_err_t eth_device_init(struct eth_device * dev, char *name) rt_err_t eth_device_init(struct eth_device * dev, const char *name)
{ {
rt_uint16_t flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP; rt_uint16_t flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP;

40
components/net/lwip-2.0.2/src/include/netif/ethernetif.h
View File

@ -17,27 +17,35 @@
struct eth_device struct eth_device
{ {
/* inherit from rt_device */ /* inherit from rt_device */
struct rt_device parent; struct rt_device parent;
/* network interface for lwip */ /* network interface for lwip */
struct netif *netif; struct netif *netif;
struct rt_semaphore tx_ack; struct rt_semaphore tx_ack;
rt_uint16_t flags; rt_uint16_t flags;
rt_uint8_t link_changed; rt_uint8_t link_changed;
rt_uint8_t link_status; rt_uint8_t link_status;
/* eth device interface */ /* eth device interface */
struct pbuf* (*eth_rx)(rt_device_t dev); struct pbuf* (*eth_rx)(rt_device_t dev);
rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p); rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p);
}; };
rt_err_t eth_device_ready(struct eth_device* dev); #ifdef __cplusplus
rt_err_t eth_device_init(struct eth_device * dev, char *name); extern "C" {
rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flag); #endif
rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
int eth_system_device_init(void); rt_err_t eth_device_ready(struct eth_device* dev);
rt_err_t eth_device_init(struct eth_device * dev, const char *name);
rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flag);
rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
int eth_system_device_init(void);
#ifdef __cplusplus
}
#endif
#endif /* __NETIF_ETHERNETIF_H__ */ #endif /* __NETIF_ETHERNETIF_H__ */

4
components/net/lwip-2.0.2/src/netif/ethernetif.c
View File

@ -205,7 +205,7 @@ static err_t eth_netif_device_init(struct netif *netif)
} }
/* Keep old drivers compatible in RT-Thread */ /* Keep old drivers compatible in RT-Thread */
rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flags) rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flags)
{ {
struct netif* netif; struct netif* netif;
@ -269,7 +269,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16
return RT_EOK; return RT_EOK;
} }
rt_err_t eth_device_init(struct eth_device * dev, char *name) rt_err_t eth_device_init(struct eth_device * dev, const char *name)
{ {
rt_uint16_t flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP; rt_uint16_t flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP;

40
components/net/lwip-2.1.0/src/include/netif/ethernetif.h
View File

@ -17,27 +17,35 @@
struct eth_device struct eth_device
{ {
/* inherit from rt_device */ /* inherit from rt_device */
struct rt_device parent; struct rt_device parent;
/* network interface for lwip */ /* network interface for lwip */
struct netif *netif; struct netif *netif;
struct rt_semaphore tx_ack; struct rt_semaphore tx_ack;
rt_uint16_t flags; rt_uint16_t flags;
rt_uint8_t link_changed; rt_uint8_t link_changed;
rt_uint8_t link_status; rt_uint8_t link_status;
/* eth device interface */ /* eth device interface */
struct pbuf* (*eth_rx)(rt_device_t dev); struct pbuf* (*eth_rx)(rt_device_t dev);
rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p); rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p);
}; };
rt_err_t eth_device_ready(struct eth_device* dev); #ifdef __cplusplus
rt_err_t eth_device_init(struct eth_device * dev, char *name); extern "C" {
rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flag); #endif
rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
int eth_system_device_init(void); rt_err_t eth_device_ready(struct eth_device* dev);
rt_err_t eth_device_init(struct eth_device * dev, const char *name);
rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flag);
rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up);
int eth_system_device_init(void);
#ifdef __cplusplus
}
#endif
#endif /* __NETIF_ETHERNETIF_H__ */ #endif /* __NETIF_ETHERNETIF_H__ */

4
components/net/lwip-2.1.0/src/netif/ethernetif.c
View File

@ -210,7 +210,7 @@ static err_t eth_netif_device_init(struct netif *netif)
} }
/* Keep old drivers compatible in RT-Thread */ /* Keep old drivers compatible in RT-Thread */
rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flags) rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_uint16_t flags)
{ {
struct netif* netif; struct netif* netif;
@ -273,7 +273,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16
return RT_EOK; return RT_EOK;
} }
rt_err_t eth_device_init(struct eth_device * dev, char *name) rt_err_t eth_device_init(struct eth_device * dev, const char *name)
{ {
rt_uint16_t flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP; rt_uint16_t flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP;

4
src/slab.c
View File

@ -398,10 +398,10 @@ void rt_system_heap_init(void *begin_addr, void *end_addr)
* Calculate the zone index for the allocation request size and set the * Calculate the zone index for the allocation request size and set the
* allocation request size to that particular zone's chunk size. * allocation request size to that particular zone's chunk size.
*/ */
rt_inline int zoneindex(rt_uint32_t *bytes) rt_inline int zoneindex(rt_size_t *bytes)
{ {
/* unsigned for shift opt */ /* unsigned for shift opt */
rt_uint32_t n = (rt_uint32_t) * bytes; rt_uint32_t n = (rt_uint32_t)(*bytes);
if (n < 128) if (n < 128)
{ {