فهرست منبع

[restore] Restore format

liuxianliang 4 سال پیش
والد
کامیت
ad9c4ea15b

+ 5 - 5
components/net/lwip-1.4.1/src/include/netif/ethernetif.h

@@ -4,16 +4,16 @@
 #include "lwip/netif.h"
 #include <rtthread.h>
 
-#define NIOCTL_GADDR        0x01
+#define NIOCTL_GADDR		0x01
 #ifndef RT_LWIP_ETH_MTU
-#define ETHERNET_MTU        1500
+#define ETHERNET_MTU		1500
 #else
-#define ETHERNET_MTU        RT_LWIP_ETH_MTU
+#define ETHERNET_MTU		RT_LWIP_ETH_MTU
 #endif
 
 /* eth flag with auto_linkup or phy_linkup */
-#define ETHIF_LINK_AUTOUP   0x0000
-#define ETHIF_LINK_PHYUP    0x0100
+#define ETHIF_LINK_AUTOUP	0x0000
+#define ETHIF_LINK_PHYUP	0x0100
 
 struct eth_device
 {

+ 20 - 20
components/net/lwip-1.4.1/src/netif/ethernetif.c

@@ -59,9 +59,9 @@
 #define netifapi_netif_set_link_down(n)    netifapi_netif_common(n, netif_set_link_down, NULL)
 
 #ifndef RT_LWIP_ETHTHREAD_PRIORITY
-#define RT_ETHERNETIF_THREAD_PREORITY   0x90
+#define RT_ETHERNETIF_THREAD_PREORITY	0x90
 #else
-#define RT_ETHERNETIF_THREAD_PREORITY   RT_LWIP_ETHTHREAD_PRIORITY
+#define RT_ETHERNETIF_THREAD_PREORITY	RT_LWIP_ETHTHREAD_PRIORITY
 #endif
 
 #ifndef LWIP_NO_TX_THREAD
@@ -70,8 +70,8 @@
  */
 struct eth_tx_msg
 {
-    struct netif    *netif;
-    struct pbuf     *buf;
+    struct netif 	*netif;
+    struct pbuf 	*buf;
 };
 
 static struct rt_mailbox eth_tx_thread_mb;
@@ -368,7 +368,7 @@ static err_t ethernetif_linkoutput(struct netif *netif, struct pbuf *p)
     struct eth_tx_msg msg;
     struct eth_device* enetif;
 
-    RT_ASSERT(netif != RT_NULL);
+	RT_ASSERT(netif != RT_NULL);
     enetif = (struct eth_device*)netif->state;
 
     /* send a message to eth tx thread */
@@ -382,13 +382,13 @@ static err_t ethernetif_linkoutput(struct netif *netif, struct pbuf *p)
 #else
     struct eth_device* enetif;
 
-    RT_ASSERT(netif != RT_NULL);
+	RT_ASSERT(netif != RT_NULL);
     enetif = (struct eth_device*)netif->state;
 
-    if (enetif->eth_tx(&(enetif->parent), p) != RT_EOK)
-    {
-        return ERR_IF;
-    }
+	if (enetif->eth_tx(&(enetif->parent), p) != RT_EOK)
+	{
+		return ERR_IF;
+	}
 #endif
     return ERR_OK;
 }
@@ -481,16 +481,16 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_
     netif->name[1] = name[1];
 
     /* set hw address to 6 */
-    netif->hwaddr_len   = 6;
+    netif->hwaddr_len 	= 6;
     /* maximum transfer unit */
-    netif->mtu          = ETHERNET_MTU;
+    netif->mtu			= ETHERNET_MTU;
 
     /* get hardware MAC address */
     rt_device_control(&(dev->parent), NIOCTL_GADDR, netif->hwaddr);
 
     /* set output */
-    netif->output       = etharp_output;
-    netif->linkoutput   = ethernetif_linkoutput;
+    netif->output		= etharp_output;
+    netif->linkoutput	= ethernetif_linkoutput;
 
 #if LWIP_NETIF_HOSTNAME
     /* Initialize interface hostname */
@@ -587,12 +587,12 @@ rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up)
 /* NOTE: please not use it in interrupt when no RxThread exist */
 rt_err_t eth_device_linkchange(struct eth_device* dev, rt_bool_t up)
 {
-    if (up == RT_TRUE)
-        netifapi_netif_set_link_up(dev->netif);
-    else
-        netifapi_netif_set_link_down(dev->netif);
+	if (up == RT_TRUE)
+		netifapi_netif_set_link_up(dev->netif);
+	else
+		netifapi_netif_set_link_down(dev->netif);
 
-    return RT_EOK;
+	return RT_EOK;
 }
 #endif
 
@@ -666,7 +666,7 @@ static void eth_rx_thread_entry(void* parameter)
             /* receive all of buffer */
             while(1)
             {
-                if(device->eth_rx == RT_NULL) break;
+            	if(device->eth_rx == RT_NULL) break;
 
                 p = device->eth_rx(&(device->parent));
                 if (p != RT_NULL)

+ 5 - 5
components/net/lwip-2.0.2/src/include/netif/ethernetif.h

@@ -4,16 +4,16 @@
 #include "lwip/netif.h"
 #include <rtthread.h>
 
-#define NIOCTL_GADDR        0x01
+#define NIOCTL_GADDR		0x01
 #ifndef RT_LWIP_ETH_MTU
-#define ETHERNET_MTU        1500
+#define ETHERNET_MTU		1500
 #else
-#define ETHERNET_MTU        RT_LWIP_ETH_MTU
+#define ETHERNET_MTU		RT_LWIP_ETH_MTU
 #endif
 
 /* eth flag with auto_linkup or phy_linkup */
-#define ETHIF_LINK_AUTOUP   0x0000
-#define ETHIF_LINK_PHYUP    0x0100
+#define ETHIF_LINK_AUTOUP	0x0000
+#define ETHIF_LINK_PHYUP	0x0100
 
 struct eth_device
 {

+ 16 - 16
components/net/lwip-2.0.2/src/netif/ethernetif.c

@@ -884,27 +884,27 @@ void list_if(void)
         rt_kprintf("gw address: %s\n", ipaddr_ntoa(&(netif->gw)));
         rt_kprintf("net mask  : %s\n", ipaddr_ntoa(&(netif->netmask)));
 #if LWIP_IPV6
-        {
-            ip6_addr_t *addr;
-            int addr_state;
-            int i;
+		{
+			ip6_addr_t *addr;
+			int addr_state;
+			int i;
 
-            addr = (ip6_addr_t *)&netif->ip6_addr[0];
-            addr_state = netif->ip6_addr_state[0];
+			addr = (ip6_addr_t *)&netif->ip6_addr[0];
+			addr_state = netif->ip6_addr_state[0];
 
-            rt_kprintf("\nipv6 link-local: %s state:%02X %s\n", ip6addr_ntoa(addr),
-            addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
+			rt_kprintf("\nipv6 link-local: %s state:%02X %s\n", ip6addr_ntoa(addr),
+			addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
 
-            for(i=1; i<LWIP_IPV6_NUM_ADDRESSES; i++)
-            {
-                addr = (ip6_addr_t *)&netif->ip6_addr[i];
-                addr_state = netif->ip6_addr_state[i];
+			for(i=1; i<LWIP_IPV6_NUM_ADDRESSES; i++)
+			{
+				addr = (ip6_addr_t *)&netif->ip6_addr[i];
+				addr_state = netif->ip6_addr_state[i];
 
-                rt_kprintf("ipv6[%d] address: %s state:%02X %s\n", i, ip6addr_ntoa(addr),
-                addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
-            }
+				rt_kprintf("ipv6[%d] address: %s state:%02X %s\n", i, ip6addr_ntoa(addr),
+				addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
+			}
 
-        }
+		}
         rt_kprintf("\r\n");
 #endif /* LWIP_IPV6 */
         netif = netif->next;

+ 5 - 5
components/net/lwip-2.1.2/src/include/netif/ethernetif.h

@@ -4,16 +4,16 @@
 #include "lwip/netif.h"
 #include <rtthread.h>
 
-#define NIOCTL_GADDR        0x01
+#define NIOCTL_GADDR		0x01
 #ifndef RT_LWIP_ETH_MTU
-#define ETHERNET_MTU        1500
+#define ETHERNET_MTU		1500
 #else
-#define ETHERNET_MTU        RT_LWIP_ETH_MTU
+#define ETHERNET_MTU		RT_LWIP_ETH_MTU
 #endif
 
 /* eth flag with auto_linkup or phy_linkup */
-#define ETHIF_LINK_AUTOUP   0x0000
-#define ETHIF_LINK_PHYUP    0x0100
+#define ETHIF_LINK_AUTOUP	0x0000
+#define ETHIF_LINK_PHYUP	0x0100
 
 struct eth_device
 {

+ 16 - 16
components/net/lwip-2.1.2/src/netif/ethernetif.c

@@ -886,27 +886,27 @@ void list_if(void)
         rt_kprintf("gw address: %s\n", ipaddr_ntoa(&(netif->gw)));
         rt_kprintf("net mask  : %s\n", ipaddr_ntoa(&(netif->netmask)));
 #if LWIP_IPV6
-        {
-            ip6_addr_t *addr;
-            int addr_state;
-            int i;
+		{
+			ip6_addr_t *addr;
+			int addr_state;
+			int i;
 
-            addr = (ip6_addr_t *)&netif->ip6_addr[0];
-            addr_state = netif->ip6_addr_state[0];
+			addr = (ip6_addr_t *)&netif->ip6_addr[0];
+			addr_state = netif->ip6_addr_state[0];
 
-            rt_kprintf("\nipv6 link-local: %s state:%02X %s\n", ip6addr_ntoa(addr),
-            addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
+			rt_kprintf("\nipv6 link-local: %s state:%02X %s\n", ip6addr_ntoa(addr),
+			addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
 
-            for(i=1; i<LWIP_IPV6_NUM_ADDRESSES; i++)
-            {
-                addr = (ip6_addr_t *)&netif->ip6_addr[i];
-                addr_state = netif->ip6_addr_state[i];
+			for(i=1; i<LWIP_IPV6_NUM_ADDRESSES; i++)
+			{
+				addr = (ip6_addr_t *)&netif->ip6_addr[i];
+				addr_state = netif->ip6_addr_state[i];
 
-                rt_kprintf("ipv6[%d] address: %s state:%02X %s\n", i, ip6addr_ntoa(addr),
-                addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
-            }
+				rt_kprintf("ipv6[%d] address: %s state:%02X %s\n", i, ip6addr_ntoa(addr),
+				addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
+			}
 
-        }
+		}
         rt_kprintf("\r\n");
 #endif /* LWIP_IPV6 */
         netif = netif->next;