Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
py_free-物联智能
rt-thread
提交
0de261f1
R
rt-thread
项目概览
py_free-物联智能
/
rt-thread
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
0de261f1
编写于
3月 14, 2017
作者:
U
Urey
提交者:
GitHub
3月 14, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1 from RT-Thread/master
update
上级
564e7aef
69f57678
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
161 addition
and
104 deletion
+161
-104
bsp/beaglebone/uboot_cmd.txt
bsp/beaglebone/uboot_cmd.txt
+2
-0
bsp/stm32f10x/drivers/usart.c
bsp/stm32f10x/drivers/usart.c
+1
-1
components/drivers/i2c/i2c_core.c
components/drivers/i2c/i2c_core.c
+2
-2
components/drivers/include/rtdevice.h
components/drivers/include/rtdevice.h
+3
-2
components/drivers/src/workqueue.c
components/drivers/src/workqueue.c
+153
-99
未找到文件。
bsp/beaglebone/uboot_cmd.txt
浏览文件 @
0de261f1
mmcinfo
fatload mmc 0 0x80200000 rtthread.bin
go 0x80200000
其中的地址0x80200000根据链接地址确定
\ No newline at end of file
bsp/stm32f10x/drivers/usart.c
浏览文件 @
0de261f1
...
...
@@ -262,7 +262,7 @@ static void uart_isr(struct rt_serial_device *serial) {
{
rt_hw_serial_isr
(
serial
,
RT_SERIAL_EVENT_TX_DONE
);
}
USART_ITConfig
(
uart
->
uart_device
,
USART_IT_
RXNE
,
DISABLE
);
USART_ITConfig
(
uart
->
uart_device
,
USART_IT_
TC
,
DISABLE
);
USART_ClearITPendingBit
(
uart
->
uart_device
,
USART_IT_TC
);
}
if
(
USART_GetFlagStatus
(
uart
->
uart_device
,
USART_FLAG_ORE
)
==
SET
)
...
...
components/drivers/i2c/i2c_core.c
浏览文件 @
0de261f1
...
...
@@ -93,7 +93,7 @@ rt_size_t rt_i2c_master_send(struct rt_i2c_bus_device *bus,
const
rt_uint8_t
*
buf
,
rt_uint32_t
count
)
{
rt_
size
_t
ret
;
rt_
err
_t
ret
;
struct
rt_i2c_msg
msg
;
msg
.
addr
=
addr
;
...
...
@@ -112,7 +112,7 @@ rt_size_t rt_i2c_master_recv(struct rt_i2c_bus_device *bus,
rt_uint8_t
*
buf
,
rt_uint32_t
count
)
{
rt_
size
_t
ret
;
rt_
err
_t
ret
;
struct
rt_i2c_msg
msg
;
RT_ASSERT
(
bus
!=
RT_NULL
);
...
...
components/drivers/include/rtdevice.h
浏览文件 @
0de261f1
...
...
@@ -150,8 +150,9 @@ struct rt_data_queue
/* workqueue implementation */
struct
rt_workqueue
{
rt_list_t
work_list
;
rt_thread_t
work_thread
;
rt_list_t
work_list
;
struct
rt_work
*
work_current
;
/* current work */
rt_thread_t
work_thread
;
};
struct
rt_work
...
...
components/drivers/src/workqueue.c
浏览文件 @
0de261f1
/*
* File : workqueue.c
* This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2006 - 2017, RT-Thread Development Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Change Logs:
* Date Author Notes
* 2017-02-27 bernard fix the re-work issue.
*/
#include <rthw.h>
#include <rtthread.h>
#include <rtdevice.h>
#ifdef RT_USING_HEAP
static
void
_workqueue_thread_entry
(
void
*
parameter
)
{
struct
rt_work
*
work
;
struct
rt_workqueue
*
queue
;
queue
=
(
struct
rt_workqueue
*
)
parameter
;
RT_ASSERT
(
queue
!=
RT_NULL
);
while
(
1
)
{
if
(
rt_list_isempty
(
&
(
queue
->
work_list
)))
{
/* no software timer exist, suspend self. */
rt_thread_suspend
(
rt_thread_self
());
rt_schedule
();
}
/* we have work to do with. */
rt_enter_critical
();
work
=
rt_list_entry
(
queue
->
work_list
.
next
,
struct
rt_work
,
list
);
rt_list_remove
(
&
(
work
->
list
));
rt_exit_critical
();
/* do work */
work
->
work_func
(
work
,
work
->
work_data
);
}
rt_base_t
level
;
struct
rt_work
*
work
;
struct
rt_workqueue
*
queue
;
queue
=
(
struct
rt_workqueue
*
)
parameter
;
RT_ASSERT
(
queue
!=
RT_NULL
);
while
(
1
)
{
if
(
rt_list_isempty
(
&
(
queue
->
work_list
)))
{
/* no software timer exist, suspend self. */
rt_thread_suspend
(
rt_thread_self
());
rt_schedule
();
}
/* we have work to do with. */
level
=
rt_hw_interrupt_disable
();
work
=
rt_list_entry
(
queue
->
work_list
.
next
,
struct
rt_work
,
list
);
rt_list_remove
(
&
(
work
->
list
));
queue
->
work_current
=
work
;
rt_hw_interrupt_enable
(
level
);
/* do work */
work
->
work_func
(
work
,
work
->
work_data
);
level
=
rt_hw_interrupt_disable
();
/* clean current work */
queue
->
work_current
=
RT_NULL
;
rt_hw_interrupt_enable
(
level
);
}
}
struct
rt_workqueue
*
rt_workqueue_create
(
const
char
*
name
,
rt_uint16_t
stack_size
,
rt_uint8_t
priority
)
{
struct
rt_workqueue
*
queue
=
RT_NULL
;
struct
rt_workqueue
*
queue
=
RT_NULL
;
queue
=
(
struct
rt_workqueue
*
)
RT_KERNEL_MALLOC
(
sizeof
(
struct
rt_workqueue
));
if
(
queue
!=
RT_NULL
)
{
queue
=
(
struct
rt_workqueue
*
)
RT_KERNEL_MALLOC
(
sizeof
(
struct
rt_workqueue
));
if
(
queue
!=
RT_NULL
)
{
/* initialize work list */
rt_list_init
(
&
(
queue
->
work_list
));
/* create the work thread */
queue
->
work_thread
=
rt_thread_create
(
name
,
_workqueue_thread_entry
,
queue
,
stack_size
,
priority
,
10
);
if
(
queue
->
work_thread
==
RT_NULL
)
{
RT_KERNEL_FREE
(
queue
);
return
RT_NULL
;
}
rt_thread_startup
(
queue
->
work_thread
);
}
return
queue
;
queue
->
work_current
=
RT_NULL
;
/* create the work thread */
queue
->
work_thread
=
rt_thread_create
(
name
,
_workqueue_thread_entry
,
queue
,
stack_size
,
priority
,
10
);
if
(
queue
->
work_thread
==
RT_NULL
)
{
RT_KERNEL_FREE
(
queue
);
return
RT_NULL
;
}
rt_thread_startup
(
queue
->
work_thread
);
}
return
queue
;
}
rt_err_t
rt_workqueue_destroy
(
struct
rt_workqueue
*
queue
)
{
RT_ASSERT
(
queue
!=
RT_NULL
);
RT_ASSERT
(
queue
!=
RT_NULL
);
rt_thread_delete
(
queue
->
work_thread
);
RT_KERNEL_FREE
(
queue
);
rt_thread_delete
(
queue
->
work_thread
);
RT_KERNEL_FREE
(
queue
);
return
RT_EOK
;
return
RT_EOK
;
}
rt_err_t
rt_workqueue_dowork
(
struct
rt_workqueue
*
queue
,
struct
rt_work
*
work
)
{
RT_ASSERT
(
queue
!=
RT_NULL
);
RT_ASSERT
(
work
!=
RT_NULL
);
rt_enter_critical
();
/* NOTE: the work MUST be initialized firstly */
rt_list_remove
(
&
(
work
->
list
));
rt_list_insert_after
(
queue
->
work_list
.
prev
,
&
(
work
->
list
));
if
(
queue
->
work_thread
->
stat
!=
RT_THREAD_READY
)
{
rt_exit_critical
();
/* resume work thread */
rt_thread_resume
(
queue
->
work_thread
);
rt_schedule
();
}
else
rt_exit_critical
();
return
RT_EOK
;
rt_base_t
level
;
RT_ASSERT
(
queue
!=
RT_NULL
);
RT_ASSERT
(
work
!=
RT_NULL
);
level
=
rt_hw_interrupt_disable
();
if
(
queue
->
work_current
==
work
)
{
rt_hw_interrupt_enable
(
level
);
return
-
RT_EBUSY
;
}
/* NOTE: the work MUST be initialized firstly */
rt_list_remove
(
&
(
work
->
list
));
rt_list_insert_after
(
queue
->
work_list
.
prev
,
&
(
work
->
list
));
/* whether the workqueue is doing work */
if
(
queue
->
work_current
==
RT_NULL
)
{
rt_hw_interrupt_enable
(
level
);
/* resume work thread */
rt_thread_resume
(
queue
->
work_thread
);
rt_schedule
();
}
else
rt_hw_interrupt_enable
(
level
);
return
RT_EOK
;
}
rt_err_t
rt_workqueue_critical_work
(
struct
rt_workqueue
*
queue
,
struct
rt_work
*
work
)
{
RT_ASSERT
(
queue
!=
RT_NULL
);
RT_ASSERT
(
work
!=
RT_NULL
);
rt_enter_critical
();
/* NOTE: the work MUST be initialized firstly */
rt_list_remove
(
&
(
work
->
list
));
rt_list_insert_after
(
queue
->
work_list
.
prev
,
&
(
work
->
list
));
if
(
queue
->
work_thread
->
stat
!=
RT_THREAD_READY
)
{
rt_exit_critical
();
/* resume work thread */
rt_thread_resume
(
queue
->
work_thread
);
rt_schedule
();
}
else
rt_exit_critical
();
return
RT_EOK
;
rt_base_t
level
;
RT_ASSERT
(
queue
!=
RT_NULL
);
RT_ASSERT
(
work
!=
RT_NULL
);
level
=
rt_hw_interrupt_disable
();
if
(
queue
->
work_current
==
work
)
{
rt_hw_interrupt_enable
(
level
);
return
-
RT_EBUSY
;
}
/* NOTE: the work MUST be initialized firstly */
rt_list_remove
(
&
(
work
->
list
));
rt_list_insert_after
(
queue
->
work_list
.
prev
,
&
(
work
->
list
));
if
(
queue
->
work_current
==
RT_NULL
)
{
rt_hw_interrupt_enable
(
level
);
/* resume work thread */
rt_thread_resume
(
queue
->
work_thread
);
rt_schedule
();
}
else
rt_hw_interrupt_enable
(
level
);
return
RT_EOK
;
}
rt_err_t
rt_workqueue_cancel_work
(
struct
rt_workqueue
*
queue
,
struct
rt_work
*
work
)
{
RT_ASSERT
(
queue
!=
RT_NULL
);
RT_ASSERT
(
work
!=
RT_NULL
);
rt_base_t
level
;
RT_ASSERT
(
queue
!=
RT_NULL
);
RT_ASSERT
(
work
!=
RT_NULL
);
rt_enter_critical
();
rt_list_remove
(
&
(
work
->
list
));
rt_exit_critical
();
level
=
rt_hw_interrupt_disable
();
if
(
queue
->
work_current
==
work
)
{
rt_hw_interrupt_enable
(
level
);
return
-
RT_EBUSY
;
}
rt_list_remove
(
&
(
work
->
list
));
rt_hw_interrupt_enable
(
level
);
return
RT_EOK
;
return
RT_EOK
;
}
rt_err_t
rt_workqueue_cancel_all_work
(
struct
rt_workqueue
*
queue
)
{
struct
rt_list_node
*
node
,
*
next
;
RT_ASSERT
(
queue
!=
RT_NULL
);
rt_enter_critical
();
for
(
node
=
queue
->
work_list
.
next
;
node
!=
&
(
queue
->
work_list
);
node
=
next
)
{
next
=
node
->
next
;
rt_list_remove
(
node
);
}
rt_exit_critical
();
return
RT_EOK
;
struct
rt_list_node
*
node
,
*
next
;
RT_ASSERT
(
queue
!=
RT_NULL
);
rt_enter_critical
();
for
(
node
=
queue
->
work_list
.
next
;
node
!=
&
(
queue
->
work_list
);
node
=
next
)
{
next
=
node
->
next
;
rt_list_remove
(
node
);
}
rt_exit_critical
();
return
RT_EOK
;
}
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录