summaryrefslogtreecommitdiff
path: root/components/net
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2021-05-28 16:20:08 +0800
committerGitHub <[email protected]>2021-05-28 16:20:08 +0800
commit92beddf3bccf6346e26aa097f82464456fb8e6bd (patch)
tree197e4a108118dda016ea02274172f0c40e7ee8ed /components/net
parentb18a99b44240ec3152011e159cc24a5af8dff0ce (diff)
parent03f4d40e30f3c94e1db0b3a65b3610dee695694a (diff)
Merge pull request #4737 from mysterywolf/3,1,xformatv3.1.5
[lts 3.1.x] format codes
Diffstat (limited to 'components/net')
-rw-r--r--components/net/at/at_socket/at_socket.c40
-rw-r--r--components/net/at/at_socket/at_socket.h2
-rw-r--r--components/net/at/include/at.h2
-rw-r--r--components/net/at/include/at_log.h2
-rw-r--r--components/net/at/src/at_base_cmd.c2
-rw-r--r--components/net/at/src/at_cli.c4
-rw-r--r--components/net/at/src/at_client.c4
-rw-r--r--components/net/at/src/at_server.c2
-rw-r--r--components/net/at/src/at_utils.c2
-rw-r--r--components/net/lwip-1.4.1/src/arch/sys_arch.c8
-rw-r--r--components/net/lwip-1.4.1/src/netif/ethernetif.c50
-rw-r--r--components/net/lwip-2.0.2/src/arch/sys_arch.c2
-rw-r--r--components/net/lwip-2.0.2/src/netif/ethernetif.c72
-rw-r--r--components/net/lwip-2.1.2/src/arch/sys_arch.c2
-rw-r--r--components/net/lwip-2.1.2/src/netif/ethernetif.c78
-rw-r--r--components/net/lwip_dhcpd/dhcp_server.c2
-rw-r--r--components/net/lwip_dhcpd/dhcp_server.h2
-rw-r--r--components/net/lwip_dhcpd/dhcp_server_raw.c4
-rw-r--r--components/net/netdev/include/arpa/inet.h2
-rw-r--r--components/net/netdev/include/netdev.h10
-rw-r--r--components/net/netdev/include/netdev_ipaddr.h42
-rw-r--r--components/net/netdev/src/netdev.c2
-rw-r--r--components/net/netdev/src/netdev_ipaddr.c2
-rw-r--r--components/net/sal_socket/dfs_net/dfs_net.c6
-rw-r--r--components/net/sal_socket/impl/af_inet.h2
-rw-r--r--components/net/sal_socket/impl/af_inet_at.c4
-rw-r--r--components/net/sal_socket/impl/af_inet_lwip.c8
-rw-r--r--components/net/sal_socket/impl/proto_mbedtls.c22
-rw-r--r--components/net/sal_socket/include/dfs_net/dfs_net.h2
-rw-r--r--components/net/sal_socket/include/dfs_net/sys_select/sys/select.h2
-rw-r--r--components/net/sal_socket/include/sal.h2
-rw-r--r--components/net/sal_socket/include/sal_netdb.h2
-rw-r--r--components/net/sal_socket/include/sal_socket.h4
-rw-r--r--components/net/sal_socket/include/sal_tls.h2
-rw-r--r--components/net/sal_socket/include/socket/netdb.h2
-rw-r--r--components/net/sal_socket/include/socket/netinet/in.h2
-rw-r--r--components/net/sal_socket/include/socket/netinet/tcp.h2
-rw-r--r--components/net/sal_socket/include/socket/netinet/udp.h2
-rw-r--r--components/net/sal_socket/include/socket/sys_socket/sys/socket.h2
-rw-r--r--components/net/sal_socket/socket/net_netdb.c2
-rw-r--r--components/net/sal_socket/socket/net_sockets.c6
-rw-r--r--components/net/sal_socket/src/sal_socket.c2
-rw-r--r--components/net/uip/rt-thread/uip_ethernetif.c342
43 files changed, 378 insertions, 378 deletions
diff --git a/components/net/at/at_socket/at_socket.c b/components/net/at/at_socket/at_socket.c
index ce8559f129..6d4c040856 100644
--- a/components/net/at/at_socket/at_socket.c
+++ b/components/net/at/at_socket/at_socket.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -70,8 +70,8 @@ struct at_socket *at_get_socket(int socket)
return at_sock;
}
}
- }
-
+ }
+
rt_hw_interrupt_enable(level);
return RT_NULL;
@@ -289,7 +289,7 @@ static int alloc_empty_socket(rt_slist_t *l)
rt_slist_for_each(node, &_socket_list)
{
at_sock = rt_slist_entry(node, struct at_socket, list);
- if(at_sock->socket != idx)
+ if(at_sock->socket != idx)
break;
idx++;
pre_node = node;
@@ -337,7 +337,7 @@ static struct at_socket *alloc_socket_by_device(struct at_device *device, enum a
{
goto __err;
}
-
+
sock = &(device->sockets[idx]);
/* the socket descriptor is the number of sockte lists */
sock->socket = alloc_empty_socket(&(sock->list));
@@ -508,7 +508,7 @@ int at_closesocket(int socket)
/* deal with TCP server actively disconnect */
rt_thread_delay(rt_tick_from_millisecond(100));
-
+
sock = at_get_socket(socket);
if (sock == RT_NULL)
{
@@ -529,7 +529,7 @@ int at_closesocket(int socket)
}
}
- free_socket(sock);
+ free_socket(sock);
return 0;
}
@@ -603,7 +603,7 @@ int at_bind(int socket, const struct sockaddr *name, socklen_t namelen)
/* input ip address is different from device ip address */
if (ip_addr_cmp(&input_ipaddr, &local_ipaddr) == 0)
- {
+ {
struct at_socket *new_sock = RT_NULL;
struct at_device *new_device = RT_NULL;
enum at_socket_type type = sock->type;
@@ -613,7 +613,7 @@ int at_bind(int socket, const struct sockaddr *name, socklen_t namelen)
{
return -1;
}
-
+
extern struct at_device *at_device_get_by_ipaddr(ip_addr_t *ip_addr);
new_device = at_device_get_by_ipaddr(&input_ipaddr);
if (new_device == RT_NULL)
@@ -649,7 +649,7 @@ static void at_recv_notice_cb(struct at_socket *sock, at_socket_evt_t event, con
{
RT_ASSERT(buff);
RT_ASSERT(event == AT_SOCKET_EVT_RECV);
-
+
/* check the socket object status */
if (sock->magic != AT_SOCKET_MAGIC)
{
@@ -675,7 +675,7 @@ static void at_closed_notice_cb(struct at_socket *sock, at_socket_evt_t event, c
{
return;
}
-
+
at_do_event_changes(sock, AT_EVENT_RECV, RT_TRUE);
at_do_event_changes(sock, AT_EVENT_ERROR, RT_TRUE);
@@ -731,7 +731,7 @@ __exit:
{
at_do_event_changes(sock, AT_EVENT_SEND, RT_TRUE);
}
-
+
return result;
}
@@ -780,7 +780,7 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
goto __exit;
}
rt_mutex_release(sock->recv_lock);
-
+
/* socket passively closed, receive function return 0 */
if (sock->state == AT_SOCKET_CLOSED)
{
@@ -821,7 +821,7 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
goto __exit;
}
else
- {
+ {
/* get receive buffer to receiver ring buffer */
rt_mutex_take(sock->recv_lock, RT_WAITING_FOREVER);
@@ -945,7 +945,7 @@ __exit:
{
if (sock != RT_NULL)
{
- at_do_event_changes(sock, AT_EVENT_ERROR, RT_TRUE);
+ at_do_event_changes(sock, AT_EVENT_ERROR, RT_TRUE);
}
}
else
@@ -1138,13 +1138,13 @@ struct hostent *at_gethostbyname(const char *name)
#if NETDEV_IPV4 && NETDEV_IPV6
addr.u_addr.ip4.addr = ipstr_to_u32(ipstr);
- addr.type = IPADDR_TYPE_V4;
+ addr.type = IPADDR_TYPE_V4;
#elif NETDEV_IPV4
addr.addr = ipstr_to_u32(ipstr);
#elif NETDEV_IPV6
#error "not support IPV6."
#endif /* NETDEV_IPV4 && NETDEV_IPV6 */
-
+
/* fill hostent structure */
s_hostent_addr = addr;
s_phostent_addr[0] = &s_hostent_addr;
@@ -1243,8 +1243,8 @@ int at_getaddrinfo(const char *nodename, const char *servname,
{
strncpy(ip_str, nodename, strlen(nodename));
}
-
- #if NETDEV_IPV4 && NETDEV_IPV6
+
+ #if NETDEV_IPV4 && NETDEV_IPV6
addr.type = IPADDR_TYPE_V4;
if ((addr.u_addr.ip4.addr = ipstr_to_u32(ip_str)) == 0)
{
@@ -1254,7 +1254,7 @@ int at_getaddrinfo(const char *nodename, const char *servname,
addr.addr = ipstr_to_u32(ip_str);
#elif NETDEV_IPV6
#error "not support IPV6."
- #endif /* NETDEV_IPV4 && NETDEV_IPV6 */
+ #endif /* NETDEV_IPV4 && NETDEV_IPV6 */
}
}
else
diff --git a/components/net/at/at_socket/at_socket.h b/components/net/at/at_socket/at_socket.h
index 3317579f05..caac6d2d5d 100644
--- a/components/net/at/at_socket/at_socket.h
+++ b/components/net/at/at_socket/at_socket.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/at/include/at.h b/components/net/at/include/at.h
index 2d0e270f6a..7d9de6b353 100644
--- a/components/net/at/include/at.h
+++ b/components/net/at/include/at.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/at/include/at_log.h b/components/net/at/include/at_log.h
index 9e133561f7..acb5b34ecc 100644
--- a/components/net/at/include/at_log.h
+++ b/components/net/at/include/at_log.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/at/src/at_base_cmd.c b/components/net/at/src/at_base_cmd.c
index b182477f9b..00720c87b2 100644
--- a/components/net/at/src/at_base_cmd.c
+++ b/components/net/at/src/at_base_cmd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/at/src/at_cli.c b/components/net/at/src/at_cli.c
index e39a913357..25fbb708f4 100644
--- a/components/net/at/src/at_cli.c
+++ b/components/net/at/src/at_cli.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -27,7 +27,7 @@ static rt_err_t (*odev_rx_ind)(rt_device_t dev, rt_size_t size) = RT_NULL;
#ifdef AT_USING_CLIENT
static struct rt_semaphore client_rx_notice;
static struct rt_ringbuffer *client_rx_fifo = RT_NULL;
-#endif
+#endif
static char console_getchar(void)
{
diff --git a/components/net/at/src/at_client.c b/components/net/at/src/at_client.c
index b9d0ee89cb..d636460c2d 100644
--- a/components/net/at/src/at_client.c
+++ b/components/net/at/src/at_client.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -579,7 +579,7 @@ int at_obj_set_urc_table(at_client_t client, const struct at_urc *urc_table, rt_
client->urc_table[client->urc_table_size].urc = urc_table;
client->urc_table[client->urc_table_size].urc_size = table_sz;
client->urc_table_size++;
-
+
rt_free(old_urc_table);
}
diff --git a/components/net/at/src/at_server.c b/components/net/at/src/at_server.c
index 81d00951f5..bfbbbae2d3 100644
--- a/components/net/at/src/at_server.c
+++ b/components/net/at/src/at_server.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/at/src/at_utils.c b/components/net/at/src/at_utils.c
index 7d26425f56..8d8887fe5e 100644
--- a/components/net/at/src/at_utils.c
+++ b/components/net/at/src/at_utils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/lwip-1.4.1/src/arch/sys_arch.c b/components/net/lwip-1.4.1/src/arch/sys_arch.c
index d9a11a7e59..b411563f3e 100644
--- a/components/net/lwip-1.4.1/src/arch/sys_arch.c
+++ b/components/net/lwip-1.4.1/src/arch/sys_arch.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (C) 2006-2018, RT-Thread Development Team
+ * COPYRIGHT (C) 2006-2021, RT-Thread Development Team
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
@@ -195,9 +195,9 @@ int lwip_system_init(void)
netifapi_netif_set_addr(netif_default, &ipaddr, &netmask, &gw);
}
#endif
- rt_kprintf("lwIP-%d.%d.%d initialized!\n", LWIP_VERSION_MAJOR, LWIP_VERSION_MINOR, LWIP_VERSION_REVISION);
+ rt_kprintf("lwIP-%d.%d.%d initialized!\n", LWIP_VERSION_MAJOR, LWIP_VERSION_MINOR, LWIP_VERSION_REVISION);
- return 0;
+ return 0;
}
INIT_PREV_EXPORT(lwip_system_init);
@@ -618,7 +618,7 @@ u32_t sys_jiffies(void)
u32_t sys_now(void)
{
- return rt_tick_get() * (1000 / RT_TICK_PER_SECOND);
+ return rt_tick_get() * (1000 / RT_TICK_PER_SECOND);
}
#ifdef RT_LWIP_PPP
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 4a8ff12521..052ee1bb01 100644
--- a/components/net/lwip-1.4.1/src/netif/ethernetif.c
+++ b/components/net/lwip-1.4.1/src/netif/ethernetif.c
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * COPYRIGHT (C) 2006-2010, RT-Thread Development Team
+ * COPYRIGHT (C) 2006-2021, RT-Thread Development Team
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
@@ -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;
@@ -156,16 +156,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)
{
netdev_low_level_set_dhcp_status(netif, is_enabled);
-
+
if(RT_TRUE == is_enabled)
{
dhcp_start((struct netif *)netif->user_data);
}
else
{
- dhcp_stop((struct netif *)netif->user_data);
+ dhcp_stop((struct netif *)netif->user_data);
}
-
+
return ERR_OK;
}
#endif /* RT_LWIP_DHCP */
@@ -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;
}
@@ -474,16 +474,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 tcp thread has been started up, we add this netif to the system */
if (rt_thread_find("tcpip") != RT_NULL)
@@ -565,12 +565,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
@@ -638,8 +638,8 @@ 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)
{
diff --git a/components/net/lwip-2.0.2/src/arch/sys_arch.c b/components/net/lwip-2.0.2/src/arch/sys_arch.c
index 7a814f403e..b0d4709c93 100644
--- a/components/net/lwip-2.0.2/src/arch/sys_arch.c
+++ b/components/net/lwip-2.0.2/src/arch/sys_arch.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (C) 2006-2018, RT-Thread Development Team
+ * COPYRIGHT (C) 2006-2021, RT-Thread Development Team
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
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 12c931fbb4..b49125c194 100644
--- a/components/net/lwip-2.0.2/src/netif/ethernetif.c
+++ b/components/net/lwip-2.0.2/src/netif/ethernetif.c
@@ -1,6 +1,6 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without modification,
@@ -172,7 +172,7 @@ static int lwip_netdev_set_dhcp(struct netdev *netif, rt_bool_t is_enabled)
}
else
{
- dhcp_stop((struct netif *)netif->user_data);
+ dhcp_stop((struct netif *)netif->user_data);
}
return ERR_OK;
}
@@ -183,7 +183,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 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)
{
int s, ttl, recv_len, result = 0;
@@ -198,7 +198,7 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
struct addrinfo hint, *res = RT_NULL;
struct sockaddr_in *h = RT_NULL;
struct in_addr ina;
-
+
RT_ASSERT(netif);
RT_ASSERT(host);
RT_ASSERT(ping_resp);
@@ -217,7 +217,7 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
return -RT_ERROR;
}
rt_memcpy(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
-
+
/* new a socket */
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
{
@@ -285,7 +285,7 @@ const struct netdev_ops lwip_netdev_ops =
lwip_netdev_set_addr_info,
#ifdef RT_LWIP_DNS
lwip_netdev_set_dns_server,
-#else
+#else
NULL,
#endif /* RT_LWIP_DNS */
@@ -333,8 +333,8 @@ static int netdev_add(struct netif *lwip_netif)
rt_strncpy(name, lwip_netif->name, LWIP_NETIF_NAME_LEN);
result = netdev_register(netdev, name, (void *)lwip_netif);
-
- /* Update netdev info after registered */
+
+ /* Update netdev info after registered */
netdev->flags = lwip_netif->flags;
netdev->mtu = lwip_netif->mtu;
netdev->ops = &lwip_netdev_ops;
@@ -343,7 +343,7 @@ static int netdev_add(struct netif *lwip_netif)
netdev->ip_addr = lwip_netif->ip_addr;
netdev->gw = lwip_netif->gw;
netdev->netmask = lwip_netif->netmask;
-
+
#ifdef RT_LWIP_DHCP
netdev_low_level_set_dhcp_status(netdev, RT_TRUE);
#endif
@@ -422,7 +422,7 @@ static err_t eth_netif_device_init(struct netif *netif)
/* network interface device register */
netdev_add(netif);
#endif /* RT_USING_NETDEV */
-
+
ethif = (struct eth_device*)netif->state;
if (ethif != RT_NULL)
{
@@ -541,7 +541,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_
ipaddr.addr = inet_addr(RT_LWIP_IPADDR);
gw.addr = inet_addr(RT_LWIP_GWADDR);
netmask.addr = inet_addr(RT_LWIP_MSKADDR);
-#else
+#else
IP4_ADDR(&ipaddr, 0, 0, 0, 0);
IP4_ADDR(&gw, 0, 0, 0, 0);
IP4_ADDR(&netmask, 0, 0, 0, 0);
@@ -693,7 +693,7 @@ static void eth_rx_thread_entry(void* parameter)
while (1)
{
if(device->eth_rx == RT_NULL) break;
-
+
p = device->eth_rx(&(device->parent));
if (p != RT_NULL)
{
@@ -716,9 +716,9 @@ static void eth_rx_thread_entry(void* parameter)
}
#endif
-/* this function does not need,
- * use eth_system_device_init_private()
- * call by lwip_system_init().
+/* this function does not need,
+ * use eth_system_device_init_private()
+ * call by lwip_system_init().
*/
int eth_system_device_init(void)
{
@@ -861,27 +861,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;
-
- 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");
-
- 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");
- }
-
- }
+ {
+ ip6_addr_t *addr;
+ int addr_state;
+ int i;
+
+ 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");
+
+ 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("\r\n");
#endif /* LWIP_IPV6 */
netif = netif->next;
diff --git a/components/net/lwip-2.1.2/src/arch/sys_arch.c b/components/net/lwip-2.1.2/src/arch/sys_arch.c
index a0eeed1073..c97609a4ea 100644
--- a/components/net/lwip-2.1.2/src/arch/sys_arch.c
+++ b/components/net/lwip-2.1.2/src/arch/sys_arch.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (C) 2006-2018, RT-Thread Development Team
+ * COPYRIGHT (C) 2006-2021, RT-Thread Development Team
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
diff --git a/components/net/lwip-2.1.2/src/netif/ethernetif.c b/components/net/lwip-2.1.2/src/netif/ethernetif.c
index 52bd0fb7b6..829978c139 100644
--- a/components/net/lwip-2.1.2/src/netif/ethernetif.c
+++ b/components/net/lwip-2.1.2/src/netif/ethernetif.c
@@ -1,6 +1,6 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without modification,
@@ -163,16 +163,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)
{
netdev_low_level_set_dhcp_status(netif, is_enabled);
-
+
if(RT_TRUE == is_enabled)
{
dhcp_start((struct netif *)netif->user_data);
}
else
{
- dhcp_stop((struct netif *)netif->user_data);
+ dhcp_stop((struct netif *)netif->user_data);
}
-
+
return ERR_OK;
}
#endif /* RT_LWIP_DHCP */
@@ -182,7 +182,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 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)
{
int s, ttl, recv_len, result = 0;
@@ -197,7 +197,7 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
struct addrinfo hint, *res = RT_NULL;
struct sockaddr_in *h = RT_NULL;
struct in_addr ina;
-
+
RT_ASSERT(netif);
RT_ASSERT(host);
RT_ASSERT(ping_resp);
@@ -216,7 +216,7 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
return -RT_ERROR;
}
rt_memcpy(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
-
+
/* new a socket */
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
{
@@ -284,7 +284,7 @@ const struct netdev_ops lwip_netdev_ops =
lwip_netdev_set_addr_info,
#ifdef RT_LWIP_DNS
lwip_netdev_set_dns_server,
-#else
+#else
NULL,
#endif /* RT_LWIP_DNS */
@@ -323,7 +323,7 @@ static int netdev_add(struct netif *lwip_netif)
{
return -ERR_IF;
}
-
+
#ifdef SAL_USING_LWIP
extern int sal_lwip_netdev_set_pf_info(struct netdev *netdev);
/* set the lwIP network interface device protocol family information */
@@ -332,7 +332,7 @@ static int netdev_add(struct netif *lwip_netif)
rt_strncpy(name, lwip_netif->name, LWIP_NETIF_NAME_LEN);
result = netdev_register(netdev, name, (void *)lwip_netif);
-
+
/* Update netdev info after registered */
netdev->flags = lwip_netif->flags;
netdev->mtu = lwip_netif->mtu;
@@ -375,7 +375,7 @@ static int netdev_flags_sync(struct netif *lwip_netif)
{
return -ERR_IF;
}
-
+
netdev->mtu = lwip_netif->mtu;
netdev->flags |= lwip_netif->flags;
@@ -438,7 +438,7 @@ static err_t eth_netif_device_init(struct netif *netif)
/* copy device flags to netif flags */
netif->flags = (ethif->flags & 0xff);
netif->mtu = ETHERNET_MTU;
-
+
/* set output */
netif->output = etharp_output;
@@ -530,7 +530,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_
/* set linkoutput */
netif->linkoutput = ethernetif_linkoutput;
-
+
/* get hardware MAC address */
rt_device_control(&(dev->parent), NIOCTL_GADDR, netif->hwaddr);
@@ -550,7 +550,7 @@ rt_err_t eth_device_init_with_flag(struct eth_device *dev, const char *name, rt_
ipaddr.addr = inet_addr(RT_LWIP_IPADDR);
gw.addr = inet_addr(RT_LWIP_GWADDR);
netmask.addr = inet_addr(RT_LWIP_MSKADDR);
-#else
+#else
IP4_ADDR(&ipaddr, 0, 0, 0, 0);
IP4_ADDR(&gw, 0, 0, 0, 0);
IP4_ADDR(&netmask, 0, 0, 0, 0);
@@ -702,7 +702,7 @@ static void eth_rx_thread_entry(void* parameter)
while (1)
{
if(device->eth_rx == RT_NULL) break;
-
+
p = device->eth_rx(&(device->parent));
if (p != RT_NULL)
{
@@ -725,9 +725,9 @@ static void eth_rx_thread_entry(void* parameter)
}
#endif
-/* this function does not need,
- * use eth_system_device_init_private()
- * call by lwip_system_init().
+/* this function does not need,
+ * use eth_system_device_init_private()
+ * call by lwip_system_init().
*/
int eth_system_device_init(void)
{
@@ -870,27 +870,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;
-
- 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");
-
- 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");
- }
-
- }
+ {
+ ip6_addr_t *addr;
+ int addr_state;
+ int i;
+
+ 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");
+
+ 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("\r\n");
#endif /* LWIP_IPV6 */
netif = netif->next;
diff --git a/components/net/lwip_dhcpd/dhcp_server.c b/components/net/lwip_dhcpd/dhcp_server.c
index 93b4ad16f0..0ebbe89ca4 100644
--- a/components/net/lwip_dhcpd/dhcp_server.c
+++ b/components/net/lwip_dhcpd/dhcp_server.c
@@ -2,7 +2,7 @@
* File : dhcp_server.c
* A simple DHCP server implementation
*
- * COPYRIGHT (C) 2011-2018, Shanghai Real-Thread Technology Co., Ltd
+ * COPYRIGHT (C) 2011-2021, Shanghai Real-Thread Technology Co., Ltd
* http://www.rt-thread.com
* All rights reserved.
*
diff --git a/components/net/lwip_dhcpd/dhcp_server.h b/components/net/lwip_dhcpd/dhcp_server.h
index ea68d6b8ec..3533cb6087 100644
--- a/components/net/lwip_dhcpd/dhcp_server.h
+++ b/components/net/lwip_dhcpd/dhcp_server.h
@@ -2,7 +2,7 @@
* File : dhcp_server.h
* A simple DHCP server implementation
*
- * COPYRIGHT (C) 2011-2018, Shanghai Real-Thread Technology Co., Ltd
+ * COPYRIGHT (C) 2011-2021, Shanghai Real-Thread Technology Co., Ltd
* http://www.rt-thread.com
* All rights reserved.
*
diff --git a/components/net/lwip_dhcpd/dhcp_server_raw.c b/components/net/lwip_dhcpd/dhcp_server_raw.c
index 6c786301be..06a7affc97 100644
--- a/components/net/lwip_dhcpd/dhcp_server_raw.c
+++ b/components/net/lwip_dhcpd/dhcp_server_raw.c
@@ -1,7 +1,7 @@
/*
* File : dhcp_server_raw.c
* A simple DHCP server implementation
- * COPYRIGHT (C) 2011-2018, Shanghai Real-Thread Technology Co., Ltd
+ * COPYRIGHT (C) 2011-2021, Shanghai Real-Thread Technology Co., Ltd
* http://www.rt-thread.com
* All rights reserved.
*
@@ -26,7 +26,7 @@
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
- *
+ *
* Change Logs:
* Date Author Notes
* 2014-04-01 Ren.Haibo the first version
diff --git a/components/net/netdev/include/arpa/inet.h b/components/net/netdev/include/arpa/inet.h
index 085e15dcbc..9072dffb79 100644
--- a/components/net/netdev/include/arpa/inet.h
+++ b/components/net/netdev/include/arpa/inet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/netdev/include/netdev.h b/components/net/netdev/include/netdev.h
index e11a8929b0..16da0e502c 100644
--- a/components/net/netdev/include/netdev.h
+++ b/components/net/netdev/include/netdev.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2019, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -79,8 +79,8 @@ struct netdev_ops;
/* network interface device object */
struct netdev
{
- rt_slist_t list;
-
+ rt_slist_t list;
+
char name[RT_NAME_MAX]; /* network interface device name */
ip_addr_t ip_addr; /* IP address */
ip_addr_t netmask; /* subnet mask */
@@ -91,11 +91,11 @@ struct netdev
ip_addr_t dns_servers[NETDEV_DNS_SERVERS_NUM]; /* DNS server */
uint8_t hwaddr_len; /* hardware address length */
uint8_t hwaddr[NETDEV_HWADDR_MAX_LEN]; /* hardware address */
-
+
uint16_t flags; /* network interface device status flag */
uint16_t mtu; /* maximum transfer unit (in bytes) */
const struct netdev_ops *ops; /* network interface device operations */
-
+
netdev_callback_fn status_callback; /* network interface device flags change callback */
netdev_callback_fn addr_callback; /* network interface device address information change callback */
diff --git a/components/net/netdev/include/netdev_ipaddr.h b/components/net/netdev/include/netdev_ipaddr.h
index 65970ec5b7..08ea50ed9d 100644
--- a/components/net/netdev/include/netdev_ipaddr.h
+++ b/components/net/netdev/include/netdev_ipaddr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -23,30 +23,30 @@ extern "C" {
* On subnets, the decomposition of addresses to host and net parts
* is done according to subnet mask, not the masks here.
*/
-#define IN_CLASSA(i) (((long)(i) & 0x80000000) == 0)
-#define IN_CLASSA_NET 0xff000000
-#define IN_CLASSA_NSHIFT 24
-#define IN_CLASSA_HOST 0x00ffffff
-#define IN_CLASSA_MAX 128
+#define IN_CLASSA(i) (((long)(i) & 0x80000000) == 0)
+#define IN_CLASSA_NET 0xff000000
+#define IN_CLASSA_NSHIFT 24
+#define IN_CLASSA_HOST 0x00ffffff
+#define IN_CLASSA_MAX 128
-#define IN_CLASSB(i) (((long)(i) & 0xc0000000) == 0x80000000)
-#define IN_CLASSB_NET 0xffff0000
-#define IN_CLASSB_NSHIFT 16
-#define IN_CLASSB_HOST 0x0000ffff
-#define IN_CLASSB_MAX 65536
+#define IN_CLASSB(i) (((long)(i) & 0xc0000000) == 0x80000000)
+#define IN_CLASSB_NET 0xffff0000
+#define IN_CLASSB_NSHIFT 16
+#define IN_CLASSB_HOST 0x0000ffff
+#define IN_CLASSB_MAX 65536
-#define IN_CLASSC(i) (((long)(i) & 0xe0000000) == 0xc0000000)
-#define IN_CLASSC_NET 0xffffff00
-#define IN_CLASSC_NSHIFT 8
-#define IN_CLASSC_HOST 0x000000ff
+#define IN_CLASSC(i) (((long)(i) & 0xe0000000) == 0xc0000000)
+#define IN_CLASSC_NET 0xffffff00
+#define IN_CLASSC_NSHIFT 8
+#define IN_CLASSC_HOST 0x000000ff
-#define IN_CLASSD(i) (((long)(i) & 0xf0000000) == 0xe0000000)
-#define IN_MULTICAST(i) IN_CLASSD(i)
+#define IN_CLASSD(i) (((long)(i) & 0xf0000000) == 0xe0000000)
+#define IN_MULTICAST(i) IN_CLASSD(i)
-#define IN_EXPERIMENTAL(i) (((long)(i) & 0xe0000000) == 0xe0000000)
-#define IN_BADCLASS(i) (((long)(i) & 0xf0000000) == 0xf0000000)
+#define IN_EXPERIMENTAL(i) (((long)(i) & 0xe0000000) == 0xe0000000)
+#define IN_BADCLASS(i) (((long)(i) & 0xf0000000) == 0xf0000000)
-#define IN_LOOPBACKNET 127 /* official! */
+#define IN_LOOPBACKNET 127 /* official! */
/* IP address types for use in ip_addr_t.type member */
enum netdev_ip_addr_type {
@@ -307,7 +307,7 @@ const char *netdev_inet_ntop(int af, const void *src, char *dst, int32_t size);
int netdev_inet_pton(int af, const char *src, void *dst);
#define inet_ntop(af, src, dst, size) netdev_inet_ntop(af, src, dst, size)
-#define inet_pton(af, src, dst) netdev_inet_pton(af, src, dst)
+#define inet_pton(af, src, dst) netdev_inet_pton(af, src, dst)
#ifdef __cplusplus
}
diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c
index 326464866b..ce418757f7 100644
--- a/components/net/netdev/src/netdev.c
+++ b/components/net/netdev/src/netdev.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2019, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/netdev/src/netdev_ipaddr.c b/components/net/netdev/src/netdev_ipaddr.c
index a70a90bb75..9abb41bd14 100644
--- a/components/net/netdev/src/netdev_ipaddr.c
+++ b/components/net/netdev/src/netdev_ipaddr.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/dfs_net/dfs_net.c b/components/net/sal_socket/dfs_net/dfs_net.c
index f1a3d777a1..67b652c320 100644
--- a/components/net/sal_socket/dfs_net/dfs_net.c
+++ b/components/net/sal_socket/dfs_net/dfs_net.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,7 +21,7 @@
int dfs_net_getsocket(int fd)
{
int socket;
- struct dfs_fd *_dfs_fd;
+ struct dfs_fd *_dfs_fd;
_dfs_fd = fd_get(fd);
if (_dfs_fd == NULL) return -1;
@@ -68,7 +68,7 @@ static int dfs_net_poll(struct dfs_fd *file, struct rt_pollreq *req)
return sal_poll(file, req);
}
-const struct dfs_file_ops _net_fops =
+const struct dfs_file_ops _net_fops =
{
NULL, /* open */
dfs_net_close,
diff --git a/components/net/sal_socket/impl/af_inet.h b/components/net/sal_socket/impl/af_inet.h
index caffbe1400..421d15bfae 100644
--- a/components/net/sal_socket/impl/af_inet.h
+++ b/components/net/sal_socket/impl/af_inet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/impl/af_inet_at.c b/components/net/sal_socket/impl/af_inet_at.c
index 135e4183c4..c85dfe9f06 100644
--- a/components/net/sal_socket/impl/af_inet_at.c
+++ b/components/net/sal_socket/impl/af_inet_at.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -85,7 +85,7 @@ static const struct sal_socket_ops at_socket_ops =
#endif /* SAL_USING_POSIX */
};
-static const struct sal_netdb_ops at_netdb_ops =
+static const struct sal_netdb_ops at_netdb_ops =
{
at_gethostbyname,
NULL,
diff --git a/components/net/sal_socket/impl/af_inet_lwip.c b/components/net/sal_socket/impl/af_inet_lwip.c
index 56df735ab9..2e19275b5d 100644
--- a/components/net/sal_socket/impl/af_inet_lwip.c
+++ b/components/net/sal_socket/impl/af_inet_lwip.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -229,7 +229,7 @@ int inet_ioctlsocket(int socket, long cmd, void *arg)
{
case F_GETFL:
case F_SETFL:
- return lwip_fcntl(socket, cmd, (int) arg);
+ return lwip_fcntl(socket, cmd, (int) arg);
default:
return lwip_ioctl(socket, cmd, arg);
@@ -320,7 +320,7 @@ static const struct sal_proto_family lwip_inet_family =
AF_INET6,
#else
AF_INET,
-#endif
+#endif
&lwip_socket_ops,
&lwip_netdb_ops,
};
@@ -329,7 +329,7 @@ static const struct sal_proto_family lwip_inet_family =
int sal_lwip_netdev_set_pf_info(struct netdev *netdev)
{
RT_ASSERT(netdev);
-
+
netdev->sal_user_data = (void *) &lwip_inet_family;
return 0;
}
diff --git a/components/net/sal_socket/impl/proto_mbedtls.c b/components/net/sal_socket/impl/proto_mbedtls.c
index 3472bbeaf5..79fbdcc5d4 100644
--- a/components/net/sal_socket/impl/proto_mbedtls.c
+++ b/components/net/sal_socket/impl/proto_mbedtls.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -59,7 +59,7 @@ static void *mebdtls_socket(int socket)
{
tls_free(session);
session = RT_NULL;
-
+
return RT_NULL;
}
@@ -68,7 +68,7 @@ static void *mebdtls_socket(int socket)
{
mbedtls_client_close(session);
return RT_NULL;
- }
+ }
session->server_fd.fd = socket;
return (void *)session;
@@ -89,7 +89,7 @@ int mbedtls_net_send_cb(void *ctx, const unsigned char *buf, size_t len)
{
return -1;
}
-
+
pf = (struct sal_proto_family *)sock->netdev->sal_user_data;
/* Register scoket sendto option to TLS send data callback */
@@ -128,7 +128,7 @@ int mbedtls_net_recv_cb( void *ctx, unsigned char *buf, size_t len)
}
pf = (struct sal_proto_family *)sock->netdev->sal_user_data;
-
+
/* Register scoket recvfrom option to TLS recv data callback */
ret = pf->skt_ops->recvfrom((int) sock->user_data, (void *)buf, len, 0, RT_NULL, RT_NULL);
if (ret < 0)
@@ -183,7 +183,7 @@ static int mbedtls_connect(void *sock)
mbedtls_x509_crt_verify_info((char *)session->buffer, session->buffer_len, " ! ", ret);
goto __exit;
}
-
+
return ret;
__exit:
@@ -199,27 +199,27 @@ static int mbedtls_closesocket(void *sock)
{
struct sal_socket *ssock;
int socket;
-
+
if (sock == RT_NULL)
{
return 0;
}
-
+
socket = ((MbedTLSSession *) sock)->server_fd.fd;
ssock = sal_get_socket(socket);
if (ssock == RT_NULL)
{
return -1;
}
-
+
/* Close TLS client session, and clean user-data in SAL socket */
mbedtls_client_close((MbedTLSSession *) sock);
ssock->user_data_tls = RT_NULL;
-
+
return 0;
}
-static const struct sal_proto_tls_ops mbedtls_proto_ops=
+static const struct sal_proto_tls_ops mbedtls_proto_ops=
{
RT_NULL,
mebdtls_socket,
diff --git a/components/net/sal_socket/include/dfs_net/dfs_net.h b/components/net/sal_socket/include/dfs_net/dfs_net.h
index ad28b8ec2a..82b7526603 100644
--- a/components/net/sal_socket/include/dfs_net/dfs_net.h
+++ b/components/net/sal_socket/include/dfs_net/dfs_net.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/include/dfs_net/sys_select/sys/select.h b/components/net/sal_socket/include/dfs_net/sys_select/sys/select.h
index 8899daee96..f174bc6504 100644
--- a/components/net/sal_socket/include/dfs_net/sys_select/sys/select.h
+++ b/components/net/sal_socket/include/dfs_net/sys_select/sys/select.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/include/sal.h b/components/net/sal_socket/include/sal.h
index 6ffaa90356..dd250e37b6 100644
--- a/components/net/sal_socket/include/sal.h
+++ b/components/net/sal_socket/include/sal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/include/sal_netdb.h b/components/net/sal_socket/include/sal_netdb.h
index d5ce9b1d7e..50064ce343 100644
--- a/components/net/sal_socket/include/sal_netdb.h
+++ b/components/net/sal_socket/include/sal_netdb.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/include/sal_socket.h b/components/net/sal_socket/include/sal_socket.h
index b620bbe23c..497be47e41 100644
--- a/components/net/sal_socket/include/sal_socket.h
+++ b/components/net/sal_socket/include/sal_socket.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -171,7 +171,7 @@ struct sockaddr_in
#endif /* NETDEV_IPV4 */
#if NETDEV_IPV6
-struct sockaddr_in6
+struct sockaddr_in6
{
uint8_t sin6_len; /* length of this structure */
sa_family_t sin6_family; /* AF_INET6 */
diff --git a/components/net/sal_socket/include/sal_tls.h b/components/net/sal_socket/include/sal_tls.h
index 7681b313bd..f211a3c1f8 100644
--- a/components/net/sal_socket/include/sal_tls.h
+++ b/components/net/sal_socket/include/sal_tls.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/include/socket/netdb.h b/components/net/sal_socket/include/socket/netdb.h
index 17f83efe00..4783405022 100644
--- a/components/net/sal_socket/include/socket/netdb.h
+++ b/components/net/sal_socket/include/socket/netdb.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/include/socket/netinet/in.h b/components/net/sal_socket/include/socket/netinet/in.h
index 57c417d7b6..37240547b4 100644
--- a/components/net/sal_socket/include/socket/netinet/in.h
+++ b/components/net/sal_socket/include/socket/netinet/in.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/include/socket/netinet/tcp.h b/components/net/sal_socket/include/socket/netinet/tcp.h
index 2ac4d6f40d..a3b530186a 100644
--- a/components/net/sal_socket/include/socket/netinet/tcp.h
+++ b/components/net/sal_socket/include/socket/netinet/tcp.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/include/socket/netinet/udp.h b/components/net/sal_socket/include/socket/netinet/udp.h
index 485d7d142c..21f50d55e5 100644
--- a/components/net/sal_socket/include/socket/netinet/udp.h
+++ b/components/net/sal_socket/include/socket/netinet/udp.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/include/socket/sys_socket/sys/socket.h b/components/net/sal_socket/include/socket/sys_socket/sys/socket.h
index 04470aa84a..a86240e2ff 100644
--- a/components/net/sal_socket/include/socket/sys_socket/sys/socket.h
+++ b/components/net/sal_socket/include/socket/sys_socket/sys/socket.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/socket/net_netdb.c b/components/net/sal_socket/socket/net_netdb.c
index bc76a48965..03b995c68d 100644
--- a/components/net/sal_socket/socket/net_netdb.c
+++ b/components/net/sal_socket/socket/net_netdb.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/sal_socket/socket/net_sockets.c b/components/net/sal_socket/socket/net_sockets.c
index a53b2f1f9c..3637635d50 100644
--- a/components/net/sal_socket/socket/net_sockets.c
+++ b/components/net/sal_socket/socket/net_sockets.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -95,7 +95,7 @@ int shutdown(int s, int how)
rt_set_errno(-EBADF);
return -1;
}
-
+
if (sal_shutdown(socket, how) == 0)
{
error = 0;
@@ -105,7 +105,7 @@ int shutdown(int s, int how)
rt_set_errno(-ENOTSOCK);
error = -1;
}
-
+
fd_put(d);
return error;
diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c
index edd5cd9a72..2781088711 100644
--- a/components/net/sal_socket/src/sal_socket.c
+++ b/components/net/sal_socket/src/sal_socket.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/uip/rt-thread/uip_ethernetif.c b/components/net/uip/rt-thread/uip_ethernetif.c
index fa4e52461e..593fdba2b5 100644
--- a/components/net/uip/rt-thread/uip_ethernetif.c
+++ b/components/net/uip/rt-thread/uip_ethernetif.c
@@ -14,9 +14,9 @@
/*
* Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
@@ -25,21 +25,21 @@
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ * derived from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*
* This file is part of the lwIP TCP/IP stack.
- *
+ *
* Author: Adam Dunkels <[email protected]>
*
*/
@@ -62,19 +62,19 @@ extern u16_t uip_len, uip_slen;
static struct rt_mailbox eth_rx_thread_mb;
static struct rt_thread eth_rx_thread;
#ifndef RT_LWIP_ETHTHREAD_PRIORITY
-#define RT_ETHERNETIF_THREAD_PREORITY 0x90
+#define RT_ETHERNETIF_THREAD_PREORITY 0x90
static char eth_rx_thread_mb_pool[48 * 4];
static char eth_rx_thread_stack[1024];
#else
-#define RT_ETHERNETIF_THREAD_PREORITY RT_LWIP_ETHTHREAD_PRIORITY
+#define RT_ETHERNETIF_THREAD_PREORITY RT_LWIP_ETHTHREAD_PRIORITY
static char eth_rx_thread_mb_pool[RT_LWIP_ETHTHREAD_MBOX_SIZE * 4];
static char eth_rx_thread_stack[RT_LWIP_ETHTHREAD_STACKSIZE];
#endif
struct eth_tx_msg
{
- struct netif *netif;
- struct pbuf *buf;
+ struct netif *netif;
+ struct pbuf *buf;
};
static struct rt_mailbox eth_tx_thread_mb;
static struct rt_thread eth_tx_thread;
@@ -89,225 +89,225 @@ static char eth_tx_thread_stack[RT_LWIP_ETHTHREAD_STACKSIZE];
/* the interface provided to uIP */
err_t eth_init(struct netif *netif)
{
- return 0;
+ return 0;
}
extern err_t ethernetif_linkoutput(struct netif *netif, struct pbuf *p);
err_t eth_input(struct pbuf *p,struct netif *inp)
{
- struct eth_hdr *ethhdr;
+ struct eth_hdr *ethhdr;
- if(p != RT_NULL)
- {
+ if(p != RT_NULL)
+ {
#ifdef LINK_STATS
- //LINK_STATS_INC(link.recv);
-#endif LINK_STATS
+ //LINK_STATS_INC(link.recv);
+#endif LINK_STATS
- ethhdr = p->payload;
+ ethhdr = p->payload;
- switch(uip_htons(ethhdr->type))
- {
- case ETHTYPE_IP: //ETHTYPE_IP
- etharp_ip_input(inp, p);
- pbuf_header(p, -((rt_int16_t)sizeof(struct eth_hdr)));
- if (tcpip_input(p, inp) != ERR_OK)
- {
- // discard packet
- pbuf_free(p);
- }
- break;
+ switch(uip_htons(ethhdr->type))
+ {
+ case ETHTYPE_IP: //ETHTYPE_IP
+ etharp_ip_input(inp, p);
+ pbuf_header(p, -((rt_int16_t)sizeof(struct eth_hdr)));
+ if (tcpip_input(p, inp) != ERR_OK)
+ {
+ // discard packet
+ pbuf_free(p);
+ }
+ break;
- case ETHTYPE_ARP:
- etharp_arp_input(inp, (struct eth_addr *)inp->hwaddr, p);
- break;
+ case ETHTYPE_ARP:
+ etharp_arp_input(inp, (struct eth_addr *)inp->hwaddr, p);
+ break;
- default:
- pbuf_free(p);
- p = RT_NULL;
- break;
- }
- }
+ default:
+ pbuf_free(p);
+ p = RT_NULL;
+ break;
+ }
+ }
return ERR_OK;
}
err_t ethernetif_output(struct netif *netif, struct pbuf *p, struct ip_addr *ipaddr)
{
- return etharp_output(netif, p, ipaddr);
+ return etharp_output(netif, p, ipaddr);
}
err_t ethernetif_linkoutput(struct netif *netif, struct pbuf *p)
{
- struct eth_tx_msg msg;
- struct eth_device* enetif;
+ struct eth_tx_msg msg;
+ struct eth_device* enetif;
- enetif = (struct eth_device*)netif->state;
+ enetif = (struct eth_device*)netif->state;
- /* send a message to eth tx thread */
- msg.netif = netif;
- msg.buf = p;
- if (rt_mb_send(&eth_tx_thread_mb, (rt_uint32_t) &msg) == RT_EOK)
- {
- /* waiting for ack */
- rt_sem_take(&(enetif->tx_ack), RT_WAITING_FOREVER);
- }
+ /* send a message to eth tx thread */
+ msg.netif = netif;
+ msg.buf = p;
+ if (rt_mb_send(&eth_tx_thread_mb, (rt_uint32_t) &msg) == RT_EOK)
+ {
+ /* waiting for ack */
+ rt_sem_take(&(enetif->tx_ack), RT_WAITING_FOREVER);
+ }
- return ERR_OK;
+ return ERR_OK;
}
/* ethernetif APIs */
rt_err_t eth_device_init(struct eth_device* dev, const char* name)
{
- struct netif* netif;
+ struct netif* netif;
uip_ipaddr_t ipaddr;
- netif = (struct netif*) rt_malloc (sizeof(struct netif));
- if (netif == RT_NULL)
- {
- rt_kprintf("malloc netif failed\n");
- return -RT_ERROR;
- }
- rt_memset(netif, 0, sizeof(struct netif));
+ netif = (struct netif*) rt_malloc (sizeof(struct netif));
+ if (netif == RT_NULL)
+ {
+ rt_kprintf("malloc netif failed\n");
+ return -RT_ERROR;
+ }
+ rt_memset(netif, 0, sizeof(struct netif));
+
+ /* set netif */
+ dev->netif = netif;
+ /* register to rt-thread device manager */
+ rt_device_register(&(dev->parent), name, RT_DEVICE_FLAG_RDWR);
+ dev->parent.type = RT_Device_Class_NetIf;
+ rt_sem_init(&(dev->tx_ack), name, 0, RT_IPC_FLAG_FIFO);
- /* set netif */
- dev->netif = netif;
- /* register to rt-thread device manager */
- rt_device_register(&(dev->parent), name, RT_DEVICE_FLAG_RDWR);
- dev->parent.type = RT_Device_Class_NetIf;
- rt_sem_init(&(dev->tx_ack), name, 0, RT_IPC_FLAG_FIFO);
+ /* set name */
+ netif->name[0] = name[0];
+ netif->name[1] = name[1];
- /* set name */
- netif->name[0] = name[0];
- netif->name[1] = name[1];
+ /* set hw address to 6 */
+ netif->hwaddr_len = 6;
+ /* maximum transfer unit */
+ netif->mtu = ETHERNET_MTU;
+ /* broadcast capability */
+ netif->flags = NETIF_FLAG_BROADCAST;
- /* set hw address to 6 */
- netif->hwaddr_len = 6;
- /* maximum transfer unit */
- netif->mtu = ETHERNET_MTU;
- /* broadcast capability */
- netif->flags = NETIF_FLAG_BROADCAST;
-
#if LWIP_IGMP
- /* igmp support */
- netif->flags |= NETIF_FLAG_IGMP;
+ /* igmp support */
+ netif->flags |= NETIF_FLAG_IGMP;
#endif
- /* get hardware address */
- rt_device_control(&(dev->parent), NIOCTL_GADDR, netif->hwaddr);
+ /* get hardware address */
+ rt_device_control(&(dev->parent), NIOCTL_GADDR, netif->hwaddr);
- /* set output */
- netif->output = ethernetif_output;
- netif->linkoutput = ethernetif_linkoutput;
+ /* set output */
+ netif->output = ethernetif_output;
+ netif->linkoutput = ethernetif_linkoutput;
- /* add netif to lwip */
-
- if (netif_add(netif, IP_ADDR_ANY, IP_ADDR_BROADCAST, IP_ADDR_ANY, dev,
- eth_init, eth_input) == RT_NULL)
- {
- /* failed, unregister device and free netif */
- rt_device_unregister(&(dev->parent));
- rt_free(netif);
- return -RT_ERROR;
- }
-
- netif_set_default(netif);
- return RT_EOK;
+ /* add netif to lwip */
+
+ if (netif_add(netif, IP_ADDR_ANY, IP_ADDR_BROADCAST, IP_ADDR_ANY, dev,
+ eth_init, eth_input) == RT_NULL)
+ {
+ /* failed, unregister device and free netif */
+ rt_device_unregister(&(dev->parent));
+ rt_free(netif);
+ return -RT_ERROR;
+ }
+
+ netif_set_default(netif);
+ return RT_EOK;
}
/* ethernet buffer */
void eth_tx_thread_entry(void* parameter)
{
- struct eth_tx_msg* msg;
+ struct eth_tx_msg* msg;
- while (1)
- {
- if (rt_mb_recv(&eth_tx_thread_mb, (rt_uint32_t*)&msg, RT_WAITING_FOREVER) == RT_EOK)
- {
- struct eth_device* enetif;
+ while (1)
+ {
+ if (rt_mb_recv(&eth_tx_thread_mb, (rt_uint32_t*)&msg, RT_WAITING_FOREVER) == RT_EOK)
+ {
+ struct eth_device* enetif;
- RT_ASSERT(msg->netif != RT_NULL);
- RT_ASSERT(msg->buf != RT_NULL);
+ RT_ASSERT(msg->netif != RT_NULL);
+ RT_ASSERT(msg->buf != RT_NULL);
- enetif = (struct eth_device*)msg->netif->state;
- if (enetif != RT_NULL)
- {
- /* call driver's interface */
- if (enetif->eth_tx(&(enetif->parent), msg->buf) != RT_EOK)
- {
- rt_kprintf("transmit eth packet failed\n");
- }
- }
+ enetif = (struct eth_device*)msg->netif->state;
+ if (enetif != RT_NULL)
+ {
+ /* call driver's interface */
+ if (enetif->eth_tx(&(enetif->parent), msg->buf) != RT_EOK)
+ {
+ rt_kprintf("transmit eth packet failed\n");
+ }
+ }
- /* send ack */
- rt_sem_release(&(enetif->tx_ack));
- }
- }
+ /* send ack */
+ rt_sem_release(&(enetif->tx_ack));
+ }
+ }
}
/* ethernet buffer */
void eth_rx_thread_entry(void* parameter)
{
- struct eth_device* device;
+ struct eth_device* device;
- while (1)
- {
- if (rt_mb_recv(&eth_rx_thread_mb, (rt_uint32_t*)&device, RT_WAITING_FOREVER) == RT_EOK)
- {
- struct pbuf *p;
+ while (1)
+ {
+ if (rt_mb_recv(&eth_rx_thread_mb, (rt_uint32_t*)&device, RT_WAITING_FOREVER) == RT_EOK)
+ {
+ struct pbuf *p;
- /* receive all of buffer */
- while (1)
- {
- p = device->eth_rx(&(device->parent));
- if (p != RT_NULL)
- {
- /* notify to upper layer */
- eth_input(p, device->netif);
- }
- else break;
- }
- }
- }
+ /* receive all of buffer */
+ while (1)
+ {
+ p = device->eth_rx(&(device->parent));
+ if (p != RT_NULL)
+ {
+ /* notify to upper layer */
+ eth_input(p, device->netif);
+ }
+ else break;
+ }
+ }
+ }
}
rt_err_t eth_device_ready(struct eth_device* dev)
{
- /* post message to ethernet thread */
- return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);
+ /* post message to ethernet thread */
+ return rt_mb_send(&eth_rx_thread_mb, (rt_uint32_t)dev);
}
rt_err_t eth_system_device_init()
{
- rt_err_t result = RT_EOK;
+ rt_err_t result = RT_EOK;
+
+ /* init rx thread */
+ /* init mailbox and create ethernet thread */
+ result = rt_mb_init(&eth_rx_thread_mb, "erxmb",
+ &eth_rx_thread_mb_pool[0], sizeof(eth_rx_thread_mb_pool)/4,
+ RT_IPC_FLAG_FIFO);
+ RT_ASSERT(result == RT_EOK);
- /* init rx thread */
- /* init mailbox and create ethernet thread */
- result = rt_mb_init(&eth_rx_thread_mb, "erxmb",
- &eth_rx_thread_mb_pool[0], sizeof(eth_rx_thread_mb_pool)/4,
- RT_IPC_FLAG_FIFO);
- RT_ASSERT(result == RT_EOK);
+ result = rt_thread_init(&eth_rx_thread, "erx", eth_rx_thread_entry, RT_NULL,
+ &eth_rx_thread_stack[0], sizeof(eth_rx_thread_stack),
+ RT_ETHERNETIF_THREAD_PREORITY, 16);
+ RT_ASSERT(result == RT_EOK);
- result = rt_thread_init(&eth_rx_thread, "erx", eth_rx_thread_entry, RT_NULL,
- &eth_rx_thread_stack[0], sizeof(eth_rx_thread_stack),
- RT_ETHERNETIF_THREAD_PREORITY, 16);
- RT_ASSERT(result == RT_EOK);
+ result = rt_thread_startup(&eth_rx_thread);
+ RT_ASSERT(result == RT_EOK);
- result = rt_thread_startup(&eth_rx_thread);
- RT_ASSERT(result == RT_EOK);
+ /* init tx thread */
+ /* init mailbox and create ethernet thread */
- /* init tx thread */
- /* init mailbox and create ethernet thread */
-
- result = rt_mb_init(&eth_tx_thread_mb, "etxmb",
- &eth_tx_thread_mb_pool[0], sizeof(eth_tx_thread_mb_pool)/4,
- RT_IPC_FLAG_FIFO);
- RT_ASSERT(result == RT_EOK);
+ result = rt_mb_init(&eth_tx_thread_mb, "etxmb",
+ &eth_tx_thread_mb_pool[0], sizeof(eth_tx_thread_mb_pool)/4,
+ RT_IPC_FLAG_FIFO);
+ RT_ASSERT(result == RT_EOK);
- result = rt_thread_init(&eth_tx_thread, "etx", eth_tx_thread_entry, RT_NULL,
- &eth_tx_thread_stack[0], sizeof(eth_tx_thread_stack),
- RT_ETHERNETIF_THREAD_PREORITY, 16);
- RT_ASSERT(result == RT_EOK);
+ result = rt_thread_init(&eth_tx_thread, "etx", eth_tx_thread_entry, RT_NULL,
+ &eth_tx_thread_stack[0], sizeof(eth_tx_thread_stack),
+ RT_ETHERNETIF_THREAD_PREORITY, 16);
+ RT_ASSERT(result == RT_EOK);
- result = rt_thread_startup(&eth_tx_thread);
- RT_ASSERT(result == RT_EOK);
+ result = rt_thread_startup(&eth_tx_thread);
+ RT_ASSERT(result == RT_EOK);
- return result;
+ return result;
}