diff options
| author | MurphyZhao <[email protected]> | 2018-11-02 10:23:29 +0800 |
|---|---|---|
| committer | MurphyZhao <[email protected]> | 2018-11-02 10:26:37 +0800 |
| commit | c3cc7a29c8e8da3fa897a8ff95d6248c2a0fc3f7 (patch) | |
| tree | 67d2d205b742961b92c054c85e90631c81ffe28a | |
| parent | 58a6b51236498de0bf8cbdb6ee7b172ebc442314 (diff) | |
[components][dfs] 移除冗余代码
[components][net] 修复 Kconfig
[components][net][sal] 还原对 SAL 框架的修改，在 proto_ops 结构体实例赋值位置修改
Signed-off-by: MurphyZhao <[email protected]>
| -rw-r--r-- | components/dfs/include/dfs_poll.h | 6 | ||||
| -rw-r--r-- | components/net/Kconfig | 2 | ||||
| -rw-r--r-- | components/net/sal_socket/impl/af_inet_lwip.c | 4 | ||||
| -rw-r--r-- | components/net/sal_socket/include/sal.h | 5 |
4 files changed, 4 insertions, 13 deletions
diff --git a/components/dfs/include/dfs_poll.h b/components/dfs/include/dfs_poll.h index 066363d6fc..d9597a4364 100644 --- a/components/dfs/include/dfs_poll.h +++ b/components/dfs/include/dfs_poll.h @@ -29,8 +29,6 @@ #define POLLHUP (0x08) #define POLLNVAL (0x10) -#define POLLMASK_DEFAULT (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM) - typedef unsigned int nfds_t; struct pollfd @@ -39,12 +37,10 @@ struct pollfd short events; short revents; }; +#endif /* !defined(POLLIN) && !defined(POLLOUT) */ -int poll(struct pollfd *fds, nfds_t nfds, int timeout); -#else /* !defined(POLLIN) && !defined(POLLOUT) */ #define POLLMASK_DEFAULT (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM) int poll(struct pollfd *fds, nfds_t nfds, int timeout); -#endif /* !defined(POLLIN) && !defined(POLLOUT) */ #endif /* RT_USING_POSIX */ #endif /* DFS_POLL_H__ */ diff --git a/components/net/Kconfig b/components/net/Kconfig index 8f3b87f055..c302dec152 100644 --- a/components/net/Kconfig +++ b/components/net/Kconfig @@ -73,7 +73,7 @@ config RT_USING_LWIP bool "lwIP v2.1.0" endchoice - if (RT_USING_LWIP210) + if (RT_USING_LWIP210 || RT_USING_LWIP202) config RT_USING_LWIP_IPV6 bool "IPV6 protocol" default n diff --git a/components/net/sal_socket/impl/af_inet_lwip.c b/components/net/sal_socket/impl/af_inet_lwip.c index b1e04373c6..df356f89d0 100644 --- a/components/net/sal_socket/impl/af_inet_lwip.c +++ b/components/net/sal_socket/impl/af_inet_lwip.c @@ -271,8 +271,8 @@ static const struct proto_ops lwip_inet_stream_ops = { lwip_listen, lwip_connect, inet_accept, - lwip_sendto, - lwip_recvfrom, + (int (*)(int, const void *, size_t, int, const struct sockaddr *, socklen_t))lwip_sendto, + (int (*)(int, void *, size_t, int, struct sockaddr *, socklen_t *))lwip_recvfrom, lwip_getsockopt, //TODO fix on 1.4.1 lwip_setsockopt, diff --git a/components/net/sal_socket/include/sal.h b/components/net/sal_socket/include/sal.h index ba5589c734..68248742d6 100644 --- a/components/net/sal_socket/include/sal.h +++ b/components/net/sal_socket/include/sal.h @@ -51,13 +51,8 @@ struct proto_ops int (*listen) (int s, int backlog); int (*connect) (int s, const struct sockaddr *name, socklen_t namelen); int (*accept) (int s, struct sockaddr *addr, socklen_t *addrlen); -#if LWIP_VERSION >= 0x20100ff - ssize_t (*sendto) (int s, const void *data, size_t size, int flags, const struct sockaddr *to, socklen_t tolen); - ssize_t (*recvfrom) (int s, void *mem, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen); -#else int (*sendto) (int s, const void *data, size_t size, int flags, const struct sockaddr *to, socklen_t tolen); int (*recvfrom) (int s, void *mem, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen); -#endif int (*getsockopt) (int s, int level, int optname, void *optval, socklen_t *optlen); int (*setsockopt) (int s, int level, int optname, const void *optval, socklen_t optlen); int (*shutdown) (int s, int how); |