From e5522d6292e704f0d69cd632a5598b1401732aa9 Mon Sep 17 00:00:00 2001 From: liruncong Date: Mon, 18 Feb 2019 18:28:58 +0800 Subject: [PATCH] =?UTF-8?q?[components/net]=E5=A2=9E=E5=8A=A0const?= =?UTF-8?q?=E9=99=90=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lwip-1.4.1/src/include/netif/ethernetif.h | 40 +++++++++++-------- .../net/lwip-1.4.1/src/netif/ethernetif.c | 4 +- .../lwip-2.0.2/src/include/netif/ethernetif.h | 40 +++++++++++-------- .../net/lwip-2.0.2/src/netif/ethernetif.c | 4 +- .../lwip-2.1.0/src/include/netif/ethernetif.h | 40 +++++++++++-------- .../net/lwip-2.1.0/src/netif/ethernetif.c | 4 +- 6 files changed, 78 insertions(+), 54 deletions(-) diff --git a/components/net/lwip-1.4.1/src/include/netif/ethernetif.h b/components/net/lwip-1.4.1/src/include/netif/ethernetif.h index bdad32ec2..1c969e6e2 100644 --- a/components/net/lwip-1.4.1/src/include/netif/ethernetif.h +++ b/components/net/lwip-1.4.1/src/include/netif/ethernetif.h @@ -17,27 +17,35 @@ struct eth_device { - /* inherit from rt_device */ - struct rt_device parent; + /* inherit from rt_device */ + struct rt_device parent; - /* network interface for lwip */ - struct netif *netif; - struct rt_semaphore tx_ack; + /* network interface for lwip */ + struct netif *netif; + struct rt_semaphore tx_ack; - rt_uint16_t flags; - rt_uint8_t link_changed; - rt_uint8_t link_status; + rt_uint16_t flags; + rt_uint8_t link_changed; + rt_uint8_t link_status; - /* eth device interface */ - struct pbuf* (*eth_rx)(rt_device_t dev); - rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p); + /* eth device interface */ + struct pbuf* (*eth_rx)(rt_device_t dev); + rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p); }; -rt_err_t eth_device_ready(struct eth_device* dev); -rt_err_t eth_device_init(struct eth_device * dev, char *name); -rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flag); -rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up); +#ifdef __cplusplus +extern "C" { +#endif + + 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); + int eth_system_device_init(void); + +#ifdef __cplusplus +} +#endif #endif /* __NETIF_ETHERNETIF_H__ */ diff --git a/components/net/lwip-1.4.1/src/netif/ethernetif.c b/components/net/lwip-1.4.1/src/netif/ethernetif.c index 449b29ffb..31aeaf6df 100644 --- a/components/net/lwip-1.4.1/src/netif/ethernetif.c +++ b/components/net/lwip-1.4.1/src/netif/ethernetif.c @@ -177,7 +177,7 @@ static err_t eth_netif_device_init(struct netif *netif) } /* 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; @@ -242,7 +242,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16 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; diff --git a/components/net/lwip-2.0.2/src/include/netif/ethernetif.h b/components/net/lwip-2.0.2/src/include/netif/ethernetif.h index bdad32ec2..1c969e6e2 100644 --- a/components/net/lwip-2.0.2/src/include/netif/ethernetif.h +++ b/components/net/lwip-2.0.2/src/include/netif/ethernetif.h @@ -17,27 +17,35 @@ struct eth_device { - /* inherit from rt_device */ - struct rt_device parent; + /* inherit from rt_device */ + struct rt_device parent; - /* network interface for lwip */ - struct netif *netif; - struct rt_semaphore tx_ack; + /* network interface for lwip */ + struct netif *netif; + struct rt_semaphore tx_ack; - rt_uint16_t flags; - rt_uint8_t link_changed; - rt_uint8_t link_status; + rt_uint16_t flags; + rt_uint8_t link_changed; + rt_uint8_t link_status; - /* eth device interface */ - struct pbuf* (*eth_rx)(rt_device_t dev); - rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p); + /* eth device interface */ + struct pbuf* (*eth_rx)(rt_device_t dev); + rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p); }; -rt_err_t eth_device_ready(struct eth_device* dev); -rt_err_t eth_device_init(struct eth_device * dev, char *name); -rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flag); -rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up); +#ifdef __cplusplus +extern "C" { +#endif + + 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); + int eth_system_device_init(void); + +#ifdef __cplusplus +} +#endif #endif /* __NETIF_ETHERNETIF_H__ */ 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 f9a798f59..8d53f0f4e 100644 --- a/components/net/lwip-2.0.2/src/netif/ethernetif.c +++ b/components/net/lwip-2.0.2/src/netif/ethernetif.c @@ -205,7 +205,7 @@ static err_t eth_netif_device_init(struct netif *netif) } /* 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; @@ -269,7 +269,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16 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; diff --git a/components/net/lwip-2.1.0/src/include/netif/ethernetif.h b/components/net/lwip-2.1.0/src/include/netif/ethernetif.h index bdad32ec2..1c969e6e2 100644 --- a/components/net/lwip-2.1.0/src/include/netif/ethernetif.h +++ b/components/net/lwip-2.1.0/src/include/netif/ethernetif.h @@ -17,27 +17,35 @@ struct eth_device { - /* inherit from rt_device */ - struct rt_device parent; + /* inherit from rt_device */ + struct rt_device parent; - /* network interface for lwip */ - struct netif *netif; - struct rt_semaphore tx_ack; + /* network interface for lwip */ + struct netif *netif; + struct rt_semaphore tx_ack; - rt_uint16_t flags; - rt_uint8_t link_changed; - rt_uint8_t link_status; + rt_uint16_t flags; + rt_uint8_t link_changed; + rt_uint8_t link_status; - /* eth device interface */ - struct pbuf* (*eth_rx)(rt_device_t dev); - rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p); + /* eth device interface */ + struct pbuf* (*eth_rx)(rt_device_t dev); + rt_err_t (*eth_tx)(rt_device_t dev, struct pbuf* p); }; -rt_err_t eth_device_ready(struct eth_device* dev); -rt_err_t eth_device_init(struct eth_device * dev, char *name); -rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16_t flag); -rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up); +#ifdef __cplusplus +extern "C" { +#endif + + 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); + int eth_system_device_init(void); + +#ifdef __cplusplus +} +#endif #endif /* __NETIF_ETHERNETIF_H__ */ diff --git a/components/net/lwip-2.1.0/src/netif/ethernetif.c b/components/net/lwip-2.1.0/src/netif/ethernetif.c index b8e75b5f3..f0defe5b2 100755 --- a/components/net/lwip-2.1.0/src/netif/ethernetif.c +++ b/components/net/lwip-2.1.0/src/netif/ethernetif.c @@ -210,7 +210,7 @@ static err_t eth_netif_device_init(struct netif *netif) } /* 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; @@ -273,7 +273,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, char *name, rt_uint16 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; -- GitLab