提交 8e518f23 编写于 作者: L liuxianliang

[fix] format

上级 be2006f3
/* /*
* Copyright (c) 2001-2004 Swedish Institute of Computer Science. * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
* COPYRIGHT (C) 2006-2018, RT-Thread Development Team * COPYRIGHT (C) 2006-2021, RT-Thread Development Team
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, * Redistribution and use in source and binary forms, with or without modification,
...@@ -167,16 +167,16 @@ static int lwip_netdev_set_dns_server(struct netdev *netif, uint8_t dns_num, ip_ ...@@ -167,16 +167,16 @@ static int lwip_netdev_set_dns_server(struct netdev *netif, uint8_t dns_num, ip_
static int lwip_netdev_set_dhcp(struct netdev *netif, rt_bool_t is_enabled) static int lwip_netdev_set_dhcp(struct netdev *netif, rt_bool_t is_enabled)
{ {
netdev_low_level_set_dhcp_status(netif, is_enabled); netdev_low_level_set_dhcp_status(netif, is_enabled);
if(RT_TRUE == is_enabled) if(RT_TRUE == is_enabled)
{ {
dhcp_start((struct netif *)netif->user_data); dhcp_start((struct netif *)netif->user_data);
} }
else else
{ {
dhcp_stop((struct netif *)netif->user_data); dhcp_stop((struct netif *)netif->user_data);
} }
return ERR_OK; return ERR_OK;
} }
#endif /* RT_LWIP_DHCP */ #endif /* RT_LWIP_DHCP */
...@@ -186,7 +186,7 @@ static int lwip_netdev_set_dhcp(struct netdev *netif, rt_bool_t is_enabled) ...@@ -186,7 +186,7 @@ static int lwip_netdev_set_dhcp(struct netdev *netif, rt_bool_t is_enabled)
extern int lwip_ping_recv(int s, int *ttl); extern int lwip_ping_recv(int s, int *ttl);
extern err_t lwip_ping_send(int s, ip_addr_t *addr, int size); extern err_t lwip_ping_send(int s, ip_addr_t *addr, int size);
int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len, int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
uint32_t timeout, struct netdev_ping_resp *ping_resp) uint32_t timeout, struct netdev_ping_resp *ping_resp)
{ {
int s, ttl, recv_len, result = 0; int s, ttl, recv_len, result = 0;
...@@ -202,7 +202,7 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len, ...@@ -202,7 +202,7 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
struct sockaddr_in *h = RT_NULL; struct sockaddr_in *h = RT_NULL;
struct in_addr ina; struct in_addr ina;
struct sockaddr_in local; struct sockaddr_in local;
RT_ASSERT(netif); RT_ASSERT(netif);
RT_ASSERT(host); RT_ASSERT(host);
RT_ASSERT(ping_resp); RT_ASSERT(ping_resp);
...@@ -221,7 +221,7 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len, ...@@ -221,7 +221,7 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
return -RT_ERROR; return -RT_ERROR;
} }
SMEMCPY(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t)); SMEMCPY(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
/* new a socket */ /* new a socket */
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0) if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
{ {
...@@ -295,7 +295,7 @@ const struct netdev_ops lwip_netdev_ops = ...@@ -295,7 +295,7 @@ const struct netdev_ops lwip_netdev_ops =
lwip_netdev_set_addr_info, lwip_netdev_set_addr_info,
#ifdef RT_LWIP_DNS #ifdef RT_LWIP_DNS
lwip_netdev_set_dns_server, lwip_netdev_set_dns_server,
#else #else
NULL, NULL,
#endif /* RT_LWIP_DNS */ #endif /* RT_LWIP_DNS */
...@@ -334,7 +334,7 @@ static int netdev_add(struct netif *lwip_netif) ...@@ -334,7 +334,7 @@ static int netdev_add(struct netif *lwip_netif)
{ {
return -ERR_IF; return -ERR_IF;
} }
#ifdef SAL_USING_LWIP #ifdef SAL_USING_LWIP
extern int sal_lwip_netdev_set_pf_info(struct netdev *netdev); extern int sal_lwip_netdev_set_pf_info(struct netdev *netdev);
/* set the lwIP network interface device protocol family information */ /* set the lwIP network interface device protocol family information */
...@@ -343,7 +343,7 @@ static int netdev_add(struct netif *lwip_netif) ...@@ -343,7 +343,7 @@ static int netdev_add(struct netif *lwip_netif)
rt_strncpy(name, lwip_netif->name, LWIP_NETIF_NAME_LEN); rt_strncpy(name, lwip_netif->name, LWIP_NETIF_NAME_LEN);
result = netdev_register(netdev, name, (void *)lwip_netif); result = netdev_register(netdev, name, (void *)lwip_netif);
/* Update netdev info after registered */ /* Update netdev info after registered */
netdev->flags = lwip_netif->flags; netdev->flags = lwip_netif->flags;
netdev->mtu = lwip_netif->mtu; netdev->mtu = lwip_netif->mtu;
...@@ -386,7 +386,7 @@ static int netdev_flags_sync(struct netif *lwip_netif) ...@@ -386,7 +386,7 @@ static int netdev_flags_sync(struct netif *lwip_netif)
{ {
return -ERR_IF; return -ERR_IF;
} }
netdev->mtu = lwip_netif->mtu; netdev->mtu = lwip_netif->mtu;
netdev->flags |= lwip_netif->flags; netdev->flags |= lwip_netif->flags;
...@@ -448,7 +448,7 @@ static err_t eth_netif_device_init(struct netif *netif) ...@@ -448,7 +448,7 @@ static err_t eth_netif_device_init(struct netif *netif)
/* copy device flags to netif flags */ /* copy device flags to netif flags */
netif->flags = (ethif->flags & 0xff); netif->flags = (ethif->flags & 0xff);
netif->mtu = ETHERNET_MTU; netif->mtu = ETHERNET_MTU;
/* set output */ /* set output */
netif->output = etharp_output; netif->output = etharp_output;
...@@ -541,7 +541,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_ ...@@ -541,7 +541,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_
/* set linkoutput */ /* set linkoutput */
netif->linkoutput = ethernetif_linkoutput; netif->linkoutput = ethernetif_linkoutput;
/* get hardware MAC address */ /* get hardware MAC address */
rt_device_control(&(dev->parent), NIOCTL_GADDR, netif->hwaddr); rt_device_control(&(dev->parent), NIOCTL_GADDR, netif->hwaddr);
...@@ -561,7 +561,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_ ...@@ -561,7 +561,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_
ipaddr.addr = inet_addr(RT_LWIP_IPADDR); ipaddr.addr = inet_addr(RT_LWIP_IPADDR);
gw.addr = inet_addr(RT_LWIP_GWADDR); gw.addr = inet_addr(RT_LWIP_GWADDR);
netmask.addr = inet_addr(RT_LWIP_MSKADDR); netmask.addr = inet_addr(RT_LWIP_MSKADDR);
#else #else
IP4_ADDR(&ipaddr, 0, 0, 0, 0); IP4_ADDR(&ipaddr, 0, 0, 0, 0);
IP4_ADDR(&gw, 0, 0, 0, 0); IP4_ADDR(&gw, 0, 0, 0, 0);
IP4_ADDR(&netmask, 0, 0, 0, 0); IP4_ADDR(&netmask, 0, 0, 0, 0);
...@@ -726,7 +726,7 @@ static void eth_rx_thread_entry(void* parameter) ...@@ -726,7 +726,7 @@ static void eth_rx_thread_entry(void* parameter)
while (1) while (1)
{ {
if(device->eth_rx == RT_NULL) break; if(device->eth_rx == RT_NULL) break;
p = device->eth_rx(&(device->parent)); p = device->eth_rx(&(device->parent));
if (p != RT_NULL) if (p != RT_NULL)
{ {
...@@ -749,9 +749,9 @@ static void eth_rx_thread_entry(void* parameter) ...@@ -749,9 +749,9 @@ static void eth_rx_thread_entry(void* parameter)
} }
#endif #endif
/* this function does not need, /* this function does not need,
* use eth_system_device_init_private() * use eth_system_device_init_private()
* call by lwip_system_init(). * call by lwip_system_init().
*/ */
int eth_system_device_init(void) int eth_system_device_init(void)
{ {
...@@ -894,27 +894,27 @@ void list_if(void) ...@@ -894,27 +894,27 @@ void list_if(void)
rt_kprintf("gw address: %s\n", ipaddr_ntoa(&(netif->gw))); rt_kprintf("gw address: %s\n", ipaddr_ntoa(&(netif->gw)));
rt_kprintf("net mask : %s\n", ipaddr_ntoa(&(netif->netmask))); rt_kprintf("net mask : %s\n", ipaddr_ntoa(&(netif->netmask)));
#if LWIP_IPV6 #if LWIP_IPV6
{ {
ip6_addr_t *addr; ip6_addr_t *addr;
int addr_state; int addr_state;
int i; int i;
addr = (ip6_addr_t *)&netif->ip6_addr[0]; addr = (ip6_addr_t *)&netif->ip6_addr[0];
addr_state = netif->ip6_addr_state[0]; addr_state = netif->ip6_addr_state[0];
rt_kprintf("\nipv6 link-local: %s state:%02X %s\n", ip6addr_ntoa(addr), rt_kprintf("\nipv6 link-local: %s state:%02X %s\n", ip6addr_ntoa(addr),
addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID"); addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
for(i=1; i<LWIP_IPV6_NUM_ADDRESSES; i++) for(i=1; i<LWIP_IPV6_NUM_ADDRESSES; i++)
{ {
addr = (ip6_addr_t *)&netif->ip6_addr[i]; addr = (ip6_addr_t *)&netif->ip6_addr[i];
addr_state = netif->ip6_addr_state[i]; addr_state = netif->ip6_addr_state[i];
rt_kprintf("ipv6[%d] address: %s state:%02X %s\n", i, ip6addr_ntoa(addr), rt_kprintf("ipv6[%d] address: %s state:%02X %s\n", i, ip6addr_ntoa(addr),
addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID"); addr_state, ip6_addr_isvalid(addr_state)?"VALID":"INVALID");
} }
} }
rt_kprintf("\r\n"); rt_kprintf("\r\n");
#endif /* LWIP_IPV6 */ #endif /* LWIP_IPV6 */
netif = netif->next; netif = netif->next;
......
...@@ -1154,7 +1154,7 @@ int netdev_ping(int argc, char **argv) ...@@ -1154,7 +1154,7 @@ int netdev_ping(int argc, char **argv)
{ {
if (argc == 1) if (argc == 1)
{ {
rt_kprintf("Please input: ping <host address>\n"); rt_kprintf("Please input: ping [netdev name] <host address>\n");
} }
else if (argc == 2) else if (argc == 2)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册