libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[components/net]增加const限定

This commit is contained in:
liruncong 2019-02-18 18:28:58 +08:00
parent 39673cf4f6
commit e5522d6292
6 changed files with 78 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;