[components/net]增加const限定

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 bdad32ec20..1c969e6e25 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 449b29ffbc..31aeaf6dff 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 bdad32ec20..1c969e6e25 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 f9a798f594..8d53f0f4ed 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 bdad32ec20..1c969e6e25 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 b8e75b5f38..f0defe5b25 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;