Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dgr6878
rt-thread
提交
58a6b512
R
rt-thread
项目概览
dgr6878
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
58a6b512
编写于
11月 01, 2018
作者:
M
MurphyZhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[components][dfs] AND [components][net][sal] 适配 LWIP210
Signed-off-by:
N
MurphyZhao
<
d2014zjt@163.com
>
上级
f08039ff
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
4 deletion
+33
-4
components/dfs/include/dfs_poll.h
components/dfs/include/dfs_poll.h
+7
-2
components/net/sal_socket/impl/af_inet_lwip.c
components/net/sal_socket/impl/af_inet_lwip.c
+21
-2
components/net/sal_socket/include/sal.h
components/net/sal_socket/include/sal.h
+5
-0
未找到文件。
components/dfs/include/dfs_poll.h
浏览文件 @
58a6b512
...
...
@@ -15,6 +15,7 @@
#ifdef RT_USING_POSIX
#include <sys/time.h>
/* for struct timeval */
#if !defined(POLLIN) && !defined(POLLOUT)
#define POLLIN (0x01)
#define POLLRDNORM (0x01)
#define POLLRDBAND (0x01)
...
...
@@ -40,6 +41,10 @@ struct pollfd
};
int
poll
(
struct
pollfd
*
fds
,
nfds_t
nfds
,
int
timeout
);
#endif
#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
#endif
/* DFS_POLL_H__ */
components/net/sal_socket/impl/af_inet_lwip.c
浏览文件 @
58a6b512
...
...
@@ -33,6 +33,15 @@
#ifdef SAL_USING_LWIP
#ifdef SAL_USING_POSIX
#if LWIP_VERSION >= 0x20100ff
#include <lwip/priv/sockets_priv.h>
#if LWIP_NETCONN_FULLDUPLEX
#error "Not support"
#endif
#else
/* LWIP_VERSION < 0x20100ff */
/*
* Re-define lwip socket
*
...
...
@@ -64,6 +73,7 @@ struct lwip_sock {
rt_wqueue_t
wait_head
;
};
#endif
/* LWIP_VERSION >= 0x20100ff */
extern
struct
lwip_sock
*
lwip_tryget_socket
(
int
s
);
...
...
@@ -136,7 +146,11 @@ static void event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len
break
;
}
if
(
sock
->
lastdata
||
sock
->
rcvevent
>
0
)
#if LWIP_VERSION >= 0x20100ff
if
((
void
*
)(
sock
->
lastdata
.
pbuf
)
||
(
sock
->
rcvevent
>
0
))
#else
if
((
void
*
)(
sock
->
lastdata
)
||
(
sock
->
rcvevent
>
0
))
#endif
event
|=
POLLIN
;
if
(
sock
->
sendevent
)
event
|=
POLLOUT
;
...
...
@@ -226,7 +240,12 @@ static int inet_poll(struct dfs_fd *file, struct rt_pollreq *req)
rt_poll_add
(
&
sock
->
wait_head
,
req
);
level
=
rt_hw_interrupt_disable
();
if
(
sock
->
lastdata
||
sock
->
rcvevent
)
#if LWIP_VERSION >= 0x20100ff
if
((
void
*
)(
sock
->
lastdata
.
pbuf
)
||
sock
->
rcvevent
)
#else
if
((
void
*
)(
sock
->
lastdata
)
||
sock
->
rcvevent
)
#endif
{
mask
|=
POLLIN
;
}
...
...
components/net/sal_socket/include/sal.h
浏览文件 @
58a6b512
...
...
@@ -51,8 +51,13 @@ 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
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录