Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Mr_Pangza
rt-thread
提交
187a860e
R
rt-thread
项目概览
Mr_Pangza
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
2
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
187a860e
编写于
9月 07, 2019
作者:
B
Bernard Xiong
提交者:
GitHub
9月 07, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3045 from loogg/mlw-fs
at_socket的socket成员可能重复问题
上级
77e103f6
b0ccfa31
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
34 addition
and
20 deletion
+34
-20
components/net/at/at_socket/at_socket.c
components/net/at/at_socket/at_socket.c
+34
-20
未找到文件。
components/net/at/at_socket/at_socket.c
浏览文件 @
187a860e
...
...
@@ -54,7 +54,6 @@ static rt_slist_t _socket_list = RT_SLIST_OBJECT_INIT(_socket_list);
struct
at_socket
*
at_get_socket
(
int
socket
)
{
rt_base_t
level
;
size_t
list_num
=
0
;
rt_slist_t
*
node
=
RT_NULL
;
struct
at_socket
*
at_sock
=
RT_NULL
;
...
...
@@ -62,9 +61,9 @@ struct at_socket *at_get_socket(int socket)
rt_slist_for_each
(
node
,
&
_socket_list
)
{
if
(
socket
==
(
list_num
++
))
at_sock
=
rt_slist_entry
(
node
,
struct
at_socket
,
list
);
if
(
socket
==
at_sock
->
socket
)
{
at_sock
=
rt_slist_entry
(
node
,
struct
at_socket
,
list
);
if
(
at_sock
&&
at_sock
->
magic
==
AT_SOCKET_MAGIC
)
{
rt_hw_interrupt_enable
(
level
);
...
...
@@ -275,6 +274,34 @@ static void at_do_event_clean(struct at_socket *sock, at_event_t event)
}
}
static
int
alloc_empty_socket
(
rt_slist_t
*
l
)
{
rt_base_t
level
;
rt_slist_t
*
node
=
RT_NULL
;
rt_slist_t
*
pre_node
=
&
_socket_list
;
struct
at_socket
*
at_sock
=
RT_NULL
;
int
idx
=
0
;
level
=
rt_hw_interrupt_disable
();
rt_slist_init
(
l
);
rt_slist_for_each
(
node
,
&
_socket_list
)
{
at_sock
=
rt_slist_entry
(
node
,
struct
at_socket
,
list
);
if
(
at_sock
->
socket
!=
idx
)
break
;
idx
++
;
pre_node
=
node
;
}
rt_slist_insert
(
pre_node
,
l
);
rt_hw_interrupt_enable
(
level
);
return
idx
;
}
static
struct
at_socket
*
alloc_socket_by_device
(
struct
at_device
*
device
)
{
static
rt_mutex_t
at_slock
=
RT_NULL
;
...
...
@@ -304,21 +331,9 @@ static struct at_socket *alloc_socket_by_device(struct at_device *device)
goto
__err
;
}
/* add device socket to global socket list */
{
rt_base_t
level
;
level
=
rt_hw_interrupt_disable
();
rt_slist_init
(
&
(
device
->
sockets
[
idx
].
list
));
rt_slist_append
(
&
_socket_list
,
&
(
device
->
sockets
[
idx
].
list
));
rt_hw_interrupt_enable
(
level
);
}
sock
=
&
(
device
->
sockets
[
idx
]);
/* the socket descriptor is the number of sockte lists */
sock
->
socket
=
rt_slist_len
(
&
_socket_list
)
-
1
;
sock
->
socket
=
alloc_empty_socket
(
&
(
sock
->
list
))
;
/* the socket operations is the specify operations of the device */
sock
->
ops
=
device
->
class
->
socket_ops
;
/* the user-data is the at device socket descriptor */
...
...
@@ -446,7 +461,6 @@ static int free_socket(struct at_socket *sock)
/* delect socket from socket list */
{
rt_base_t
level
;
int
list_num
=
0
;
rt_slist_t
*
node
=
RT_NULL
;
struct
at_socket
*
at_sock
=
RT_NULL
;
...
...
@@ -454,10 +468,10 @@ static int free_socket(struct at_socket *sock)
rt_slist_for_each
(
node
,
&
_socket_list
)
{
if
(
sock
->
socket
==
(
list_num
++
))
at_sock
=
rt_slist_entry
(
node
,
struct
at_socket
,
list
);
if
(
sock
->
socket
==
at_sock
->
socket
)
{
at_sock
=
rt_slist_entry
(
node
,
struct
at_socket
,
list
);
if
(
at_sock
)
if
(
at_sock
&&
at_sock
->
magic
==
AT_SOCKET_MAGIC
)
{
rt_slist_remove
(
&
_socket_list
,
&
at_sock
->
list
);
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录