libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1 from RT-Thread/master 

update
This commit is contained in:
Urey 2017-03-14 10:59:05 +08:00 committed by GitHub
parent 564e7aefce 69f5767868
commit 0de261f123
5 changed files with 148 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/beaglebone/uboot_cmd.txt
View File

@ -1,3 +1,5 @@
mmcinfo
fatload mmc 0 0x80200000 rtthread.bin
go 0x80200000
其中的地址0x80200000根据链接地址确定

2
bsp/stm32f10x/drivers/usart.c
View File

@ -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)

4
components/drivers/i2c/i2c_core.c
View File

@ -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);

1
components/drivers/include/rtdevice.h
View File

@ -151,6 +151,7 @@ struct rt_data_queue
struct rt_workqueue
{
rt_list_t work_list;
struct rt_work *work_current; /* current work */
rt_thread_t work_thread;
};

78
components/drivers/src/workqueue.c
View File

@ -1,9 +1,35 @@
/*
* 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)
{
rt_base_t level;
struct rt_work* work;
struct rt_workqueue* queue;
@ -20,13 +46,18 @@ static void _workqueue_thread_entry(void* parameter)
}
/* we have work to do with. */
rt_enter_critical();
level = rt_hw_interrupt_disable();
work = rt_list_entry(queue->work_list.next, struct rt_work, list);
rt_list_remove(&(work->list));
rt_exit_critical();
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);
}
}
@ -39,6 +70,7 @@ struct rt_workqueue *rt_workqueue_create(const char* name, rt_uint16_t stack_siz
{
/* initialize work list */
rt_list_init(&(queue->work_list));
queue->work_current = RT_NULL;
/* create the work thread */
queue->work_thread = rt_thread_create(name, _workqueue_thread_entry, queue, stack_size, priority, 10);
@ -66,56 +98,78 @@ rt_err_t rt_workqueue_destroy(struct rt_workqueue* queue)
rt_err_t rt_workqueue_dowork(struct rt_workqueue* queue, struct rt_work* work)
{
rt_base_t level;
RT_ASSERT(queue != RT_NULL);
RT_ASSERT(work != RT_NULL);
rt_enter_critical();
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_thread->stat != RT_THREAD_READY)
/* whether the workqueue is doing work */
if (queue->work_current == RT_NULL)
{
rt_exit_critical();
rt_hw_interrupt_enable(level);
/* resume work thread */
rt_thread_resume(queue->work_thread);
rt_schedule();
}
else rt_exit_critical();
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_base_t level;
RT_ASSERT(queue != RT_NULL);
RT_ASSERT(work != RT_NULL);
rt_enter_critical();
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_thread->stat != RT_THREAD_READY)
if (queue->work_current == RT_NULL)
{
rt_exit_critical();
rt_hw_interrupt_enable(level);
/* resume work thread */
rt_thread_resume(queue->work_thread);
rt_schedule();
}
else rt_exit_critical();
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_base_t level;
RT_ASSERT(queue != RT_NULL);
RT_ASSERT(work != RT_NULL);
rt_enter_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_exit_critical();
rt_hw_interrupt_enable(level);
return RT_EOK;
}