From 0c87becb3eed0e890198740589f0db94ab6256cf Mon Sep 17 00:00:00 2001 From: tangyuxin Date: Sat, 30 Jan 2021 18:21:33 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E5=90=88=E5=B9=B6=20submit=20=E5=92=8C?= =?UTF-8?q?=20submit=5Fdelayed=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BD=93=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 _workqueue_submit_delayed_work 和 _workqueue_submit_work 函数合并成一个。优化代码体积 --- components/drivers/src/workqueue.c | 134 +++++++++++------------------ 1 file changed, 52 insertions(+), 82 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index 2b5630d8d0..557f349e53 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -86,43 +86,61 @@ static void _workqueue_thread_entry(void *parameter) } } -static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *work) +static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue, + struct rt_work *work, rt_tick_t ticks) { rt_base_t level; level = rt_hw_interrupt_disable(); - if (work->flags & RT_WORK_STATE_PENDING) - { - rt_hw_interrupt_enable(level); - return -RT_EBUSY; - } - - if (queue->work_current == work) - { - rt_hw_interrupt_enable(level); - return -RT_EBUSY; - } - - /* NOTE: the work MUST be initialized firstly */ + /* remove list */ rt_list_remove(&(work->list)); - - rt_list_insert_after(queue->work_list.prev, &(work->list)); - work->flags |= RT_WORK_STATE_PENDING; - - /* whether the workqueue is doing work */ - if (queue->work_current == RT_NULL) + work->flags &= ~RT_WORK_STATE_PENDING; + /* */ + if (ticks == 0) { - rt_hw_interrupt_enable(level); - /* resume work thread */ - rt_thread_resume(queue->work_thread); - rt_schedule(); - } - else - { - rt_hw_interrupt_enable(level); - } + if (queue->work_current != work) + { + rt_list_insert_after(queue->work_list.prev, &(work->list)); + work->flags |= RT_WORK_STATE_PENDING; + work->workqueue = queue; + } - return RT_EOK; + /* whether the workqueue is doing work */ + if (queue->work_current == RT_NULL && + ((queue->work_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_SUSPEND)) + { + 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; + } + else if (ticks < RT_TICK_MAX / 2) + { + /* Timer started */ + if (work->flags & RT_WORK_STATE_SUBMITTING) + { + rt_timer_stop(&work->timer); + rt_timer_control(&work->timer, RT_TIMER_CTRL_SET_TIME, &ticks); + } + else + { + rt_timer_init(&(work->timer), "work", _delayed_work_timeout_handler, + work, ticks, RT_TIMER_FLAG_ONE_SHOT | RT_TIMER_FLAG_SOFT_TIMER); + work->flags |= RT_WORK_STATE_SUBMITTING; + } + work->workqueue = queue; + rt_hw_interrupt_enable(level); + rt_timer_start(&(work->timer)); + return RT_EOK; + } + rt_hw_interrupt_enable(level); + return -RT_ERROR; } static rt_err_t _workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work) @@ -184,54 +202,6 @@ __exit: return ret; } -static rt_err_t _workqueue_submit_delayed_work(struct rt_workqueue *queue, - struct rt_work *work, rt_tick_t ticks) -{ - rt_base_t level; - rt_err_t ret = RT_EOK; - - /* Work cannot be active in multiple queues */ - if (work->workqueue && work->workqueue != queue) - { - ret = -RT_EINVAL; - goto __exit; - } - - /* Cancel if work has been submitted */ - if (work->workqueue == queue) - { - ret = _workqueue_cancel_delayed_work(work); - if (ret < 0) - { - goto __exit; - } - } - - level = rt_hw_interrupt_disable(); - /* Attach workqueue so the timeout callback can submit it */ - work->workqueue = queue; - rt_hw_interrupt_enable(level); - - if (!ticks) - { - /* Submit work if no ticks is 0 */ - ret = _workqueue_submit_work(work->workqueue, work); - } - else - { - level = rt_hw_interrupt_disable(); - /* Add timeout */ - work->flags |= RT_WORK_STATE_SUBMITTING; - rt_timer_init(&(work->timer), "work", _delayed_work_timeout_handler, work, ticks, - RT_TIMER_FLAG_ONE_SHOT | RT_TIMER_FLAG_SOFT_TIMER); - rt_hw_interrupt_enable(level); - rt_timer_start(&(work->timer)); - } - -__exit: - return ret; -} - static void _delayed_work_timeout_handler(void *parameter) { struct rt_work *delayed_work; @@ -244,7 +214,7 @@ static void _delayed_work_timeout_handler(void *parameter) delayed_work->flags &= ~RT_WORK_STATE_SUBMITTING; delayed_work->type &= ~RT_WORK_TYPE_DELAYED; rt_hw_interrupt_enable(level); - _workqueue_submit_work(delayed_work->workqueue, delayed_work); + _workqueue_submit_work(delayed_work->workqueue, delayed_work, 0); } struct rt_workqueue *rt_workqueue_create(const char *name, rt_uint16_t stack_size, rt_uint8_t priority) @@ -288,7 +258,7 @@ rt_err_t rt_workqueue_dowork(struct rt_workqueue *queue, struct rt_work *work) RT_ASSERT(queue != RT_NULL); RT_ASSERT(work != RT_NULL); - return _workqueue_submit_work(queue, work); + return _workqueue_submit_work(queue, work, 0); } rt_err_t rt_workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *work, rt_tick_t time) @@ -303,11 +273,11 @@ rt_err_t rt_workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *wo if (work->type & RT_WORK_TYPE_DELAYED) { - return _workqueue_submit_delayed_work(queue, work, time); + return _workqueue_submit_work(queue, work, time); } else { - return _workqueue_submit_work(queue, work); + return _workqueue_submit_work(queue, work, 0); } } From 10b5aa8f59fa83f4f053fd2318cf5268544b3304 Mon Sep 17 00:00:00 2001 From: tangyuxin Date: Sat, 30 Jan 2021 18:29:17 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E5=90=88=E5=B9=B6=20cancel=20=E5=92=8C?= =?UTF-8?q?=20cancel=5Fdelayed=20=E5=87=BD=E6=95=B0=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E4=BD=93=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 合并 _workqueue_cancel_work 和 _workqueue_cancel_delayed_work 函数，优化代码体积 --- components/drivers/src/workqueue.c | 58 +++++------------------------- 1 file changed, 9 insertions(+), 49 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index 557f349e53..0c3c0e9f53 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -143,63 +143,23 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue, return -RT_ERROR; } -static rt_err_t _workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work) +static rt_err_t _workqueue_cancel_work(struct rt_work *work) { rt_base_t level; level = rt_hw_interrupt_disable(); - if (queue->work_current == work) - { - rt_hw_interrupt_enable(level); - return -RT_EBUSY; - } rt_list_remove(&(work->list)); work->flags &= ~RT_WORK_STATE_PENDING; - rt_hw_interrupt_enable(level); - - return RT_EOK; -} - -static rt_err_t _workqueue_cancel_delayed_work(struct rt_work *work) -{ - rt_base_t level; - int ret = RT_EOK; - - if (!work->workqueue) + /* Timer started */ + if (work->flags & RT_WORK_STATE_SUBMITTING) { - ret = -EINVAL; - goto __exit; + rt_timer_stop(&(work->timer)); + rt_timer_detach(&(work->timer)); + work->flags &= ~RT_WORK_STATE_SUBMITTING; } - - if (work->flags & RT_WORK_STATE_PENDING) - { - /* Remove from the queue if already submitted */ - ret = _workqueue_cancel_work(work->workqueue, work); - if (ret) - { - goto __exit; - } - } - else - { - if (work->flags & RT_WORK_STATE_SUBMITTING) - { - level = rt_hw_interrupt_disable(); - rt_timer_stop(&(work->timer)); - rt_timer_detach(&(work->timer)); - work->flags &= ~RT_WORK_STATE_SUBMITTING; - rt_hw_interrupt_enable(level); - } - } - - level = rt_hw_interrupt_disable(); - /* Detach from workqueue */ work->workqueue = RT_NULL; - work->flags &= ~(RT_WORK_STATE_PENDING); rt_hw_interrupt_enable(level); - -__exit: - return ret; + return 0; } static void _delayed_work_timeout_handler(void *parameter) @@ -317,11 +277,11 @@ rt_err_t rt_workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *wo if (work->type & RT_WORK_TYPE_DELAYED) { - return _workqueue_cancel_delayed_work(work); + return _workqueue_cancel_work(work); } else { - return _workqueue_cancel_work(queue, work); + return _workqueue_cancel_work(work); } } From 5a16a2060e5c330066d6d7c499c04d27277b9ae4 Mon Sep 17 00:00:00 2001 From: tangyuxin Date: Mon, 1 Feb 2021 14:26:47 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=B8=B4=E7=95=8C=E5=8C=BA=E4=BF=9D=E6=8A=A4?= =?UTF-8?q?=E6=9B=B4=E5=8A=A0=E5=AE=8C=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 定时器回调函数中，添加工作之前打开了中断。此时在极端情况下，会导致状态不对。 --- components/drivers/src/workqueue.c | 35 +++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index 0c3c0e9f53..6e8683c9b9 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -164,17 +164,36 @@ static rt_err_t _workqueue_cancel_work(struct rt_work *work) static void _delayed_work_timeout_handler(void *parameter) { - struct rt_work *delayed_work; + struct rt_work *work; + struct rt_workqueue *queue; rt_base_t level; - delayed_work = (struct rt_work *)parameter; + work = (struct rt_work *)parameter; + queue = work->workqueue; + RT_ASSERT(queue != RT_NULL); + level = rt_hw_interrupt_disable(); - rt_timer_stop(&(delayed_work->timer)); - rt_timer_detach(&(delayed_work->timer)); - delayed_work->flags &= ~RT_WORK_STATE_SUBMITTING; - delayed_work->type &= ~RT_WORK_TYPE_DELAYED; - rt_hw_interrupt_enable(level); - _workqueue_submit_work(delayed_work->workqueue, delayed_work, 0); + rt_timer_detach(&(work->timer)); + work->flags &= ~RT_WORK_STATE_SUBMITTING; + /* insert work queue */ + if (queue->work_current != work) + { + rt_list_insert_after(queue->work_list.prev, &(work->list)); + work->flags |= RT_WORK_STATE_PENDING; + } + /* whether the workqueue is doing work */ + if (queue->work_current == RT_NULL && + ((queue->work_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_SUSPEND)) + { + rt_hw_interrupt_enable(level); + /* resume work thread */ + rt_thread_resume(queue->work_thread); + rt_schedule(); + } + else + { + rt_hw_interrupt_enable(level); + } } struct rt_workqueue *rt_workqueue_create(const char *name, rt_uint16_t stack_size, rt_uint8_t priority) From 5b52e6c7e315d25c5a492d5460442e6e3f5c5631 Mon Sep 17 00:00:00 2001 From: tangyuxin Date: Mon, 1 Feb 2021 14:31:45 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=94=81=E4=B8=AD=E6=96=AD=E7=AD=89=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/src/workqueue.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index 6e8683c9b9..5c497cd5c8 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -306,12 +306,9 @@ rt_err_t rt_workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *wo rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_work *work) { - rt_base_t level; - RT_ASSERT(queue != RT_NULL); RT_ASSERT(work != RT_NULL); - level = rt_hw_interrupt_disable(); if (queue->work_current == work) /* it's current work in the queue */ { /* wait for work completion */ @@ -319,10 +316,8 @@ rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_wor } else { - rt_list_remove(&(work->list)); + _workqueue_cancel_work(work); } - work->flags &= ~RT_WORK_STATE_PENDING; - rt_hw_interrupt_enable(level); return RT_EOK; } From c5218b5eeed799593485c89234de809858cb6bf2 Mon Sep 17 00:00:00 2001 From: tangyuxin Date: Mon, 1 Feb 2021 14:36:18 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B4=A7=E6=80=A5?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E9=98=9F=E5=88=97=E6=8F=92=E5=85=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 紧急工作仍插入队列尾部，先将其插入队列头部 --- components/drivers/src/workqueue.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index 5c497cd5c8..d21bf08f4d 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -267,24 +267,22 @@ rt_err_t rt_workqueue_critical_work(struct rt_workqueue *queue, struct rt_work * 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_list_insert_after(&queue->work_list, &(work->list)); + /* whether the workqueue is doing work */ + if (queue->work_current == RT_NULL && + ((queue->work_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_SUSPEND)) { rt_hw_interrupt_enable(level); /* resume work thread */ rt_thread_resume(queue->work_thread); rt_schedule(); } - else rt_hw_interrupt_enable(level); + else + { + rt_hw_interrupt_enable(level); + } return RT_EOK; } From b42506fb731c6de683fe27c74cf68064a6919a25 Mon Sep 17 00:00:00 2001 From: tangyuxin Date: Mon, 1 Feb 2021 14:43:12 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/src/workqueue.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index d21bf08f4d..4dc08bb2ea 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -245,19 +245,7 @@ rt_err_t rt_workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *wo RT_ASSERT(queue != RT_NULL); RT_ASSERT(work != RT_NULL); - if (time > 0) - { - work->type |= RT_WORK_TYPE_DELAYED; - } - - if (work->type & RT_WORK_TYPE_DELAYED) - { - return _workqueue_submit_work(queue, work, time); - } - else - { - return _workqueue_submit_work(queue, work, 0); - } + return _workqueue_submit_work(queue, work, time); } rt_err_t rt_workqueue_critical_work(struct rt_workqueue *queue, struct rt_work *work) @@ -289,17 +277,8 @@ rt_err_t rt_workqueue_critical_work(struct rt_workqueue *queue, struct rt_work * 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); - - if (work->type & RT_WORK_TYPE_DELAYED) - { - return _workqueue_cancel_work(work); - } - else - { - return _workqueue_cancel_work(work); - } + return _workqueue_cancel_work(work); } rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_work *work) From 0230d32ca0a794c4564360fb37006837d1e8f42f Mon Sep 17 00:00:00 2001 From: tangyuxin Date: Mon, 1 Feb 2021 14:44:49 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=AD=E8=A8=80?= =?UTF-8?q?=E5=8F=8A=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/src/workqueue.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index 4dc08bb2ea..1b7dbea0c1 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -304,6 +304,7 @@ rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue) struct rt_list_node *node, *next; RT_ASSERT(queue != RT_NULL); + // TODO: cancel delay work rt_enter_critical(); for (node = queue->work_list.next; node != &(queue->work_list); node = next) { @@ -337,14 +338,15 @@ rt_err_t rt_work_cancel(struct rt_work *work) int rt_work_sys_workqueue_init(void) { if (sys_workq != RT_NULL) - return 0; + return RT_EOK; sys_workq = rt_workqueue_create("sys_work", RT_SYSTEM_WORKQUEUE_STACKSIZE, RT_SYSTEM_WORKQUEUE_PRIORITY); + RT_ASSERT(sys_workq != RT_NULL); return RT_EOK; } -INIT_PREV_EXPORT(rt_work_sys_workqueue_init); +INIT_DEVICE_EXPORT(rt_work_sys_workqueue_init); #endif #endif From 360d7e48ab2d3c205b74523a075d92cbe3e72a7b Mon Sep 17 00:00:00 2001 From: tangyuxin Date: Mon, 1 Feb 2021 21:01:14 +0800 Subject: [PATCH 08/25] =?UTF-8?q?[libcpu][cm33]=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E4=BC=98=E5=8C=96=E7=AD=89=E7=BA=A7=EF=BC=8C?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E8=A1=8C=E4=B8=BA=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libcpu/arm/cortex-m33/cpuport.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libcpu/arm/cortex-m33/cpuport.c b/libcpu/arm/cortex-m33/cpuport.c index 42b5798507..41325105d7 100644 --- a/libcpu/arm/cortex-m33/cpuport.c +++ b/libcpu/arm/cortex-m33/cpuport.c @@ -473,17 +473,13 @@ exit #elif defined(__CLANG_ARM) int __rt_ffs(int value) { - __asm volatile( - "CMP r0, #0x00 \n" - "BEQ 1f \n" + if (value == 0) return value; + __asm volatile( "RBIT r0, r0 \n" "CLZ r0, r0 \n" "ADDS r0, r0, #0x01 \n" - "1: \n" - "BX lr \n" - : "=r"(value) : "r"(value) ); From a50d81827a1a4d7172e761dd64cecc5553f349d9 Mon Sep 17 00:00:00 2001 From: Wayne Date: Thu, 4 Feb 2021 22:53:58 +0800 Subject: [PATCH 09/25] Revert "fix the bug that rx_notice out of sync when data received after last rt_device_read() is zero" --- components/net/at/src/at_client.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/components/net/at/src/at_client.c b/components/net/at/src/at_client.c index b9d0ee89cb..788549392d 100644 --- a/components/net/at/src/at_client.c +++ b/components/net/at/src/at_client.c @@ -434,20 +434,18 @@ static rt_err_t at_client_getchar(at_client_t client, char *ch, rt_int32_t timeo { rt_err_t result = RT_EOK; -__retry: - result = rt_sem_take(client->rx_notice, rt_tick_from_millisecond(timeout)); - if (result != RT_EOK) + while (rt_device_read(client->device, 0, ch, 1) == 0) { - return result; - } - if(rt_device_read(client->device, 0, ch, 1) == 1) - { - return RT_EOK; - } - else - { - goto __retry; + rt_sem_control(client->rx_notice, RT_IPC_CMD_RESET, RT_NULL); + + result = rt_sem_take(client->rx_notice, rt_tick_from_millisecond(timeout)); + if (result != RT_EOK) + { + return result; + } } + + return RT_EOK; } /** From d6b44ca52ed2ddc27e447ae2fe2914b9eb38687f Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Sat, 6 Feb 2021 20:08:31 +0800 Subject: [PATCH 10/25] =?UTF-8?q?[workqueue]=20=E6=94=AF=E6=8C=81=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=BB=B6=E6=97=B6=E5=B7=A5=E4=BD=9C=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/include/ipc/workqueue.h | 1 + components/drivers/src/workqueue.c | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/components/drivers/include/ipc/workqueue.h b/components/drivers/include/ipc/workqueue.h index 23e256c420..51976b4de7 100644 --- a/components/drivers/include/ipc/workqueue.h +++ b/components/drivers/include/ipc/workqueue.h @@ -29,6 +29,7 @@ enum struct rt_workqueue { rt_list_t work_list; + rt_list_t delayed_list; struct rt_work *work_current; /* current work */ struct rt_semaphore sem; diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index 1b7dbea0c1..eb6cefc006 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -135,6 +135,8 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue, work->flags |= RT_WORK_STATE_SUBMITTING; } work->workqueue = queue; + /* insert delay work list */ + rt_list_insert_after(queue->delayed_list.prev, &(work->list)); rt_hw_interrupt_enable(level); rt_timer_start(&(work->timer)); return RT_EOK; @@ -175,6 +177,8 @@ static void _delayed_work_timeout_handler(void *parameter) level = rt_hw_interrupt_disable(); rt_timer_detach(&(work->timer)); work->flags &= ~RT_WORK_STATE_SUBMITTING; + /* remove delay list */ + rt_list_remove(&(work->list)); /* insert work queue */ if (queue->work_current != work) { @@ -205,6 +209,7 @@ struct rt_workqueue *rt_workqueue_create(const char *name, rt_uint16_t stack_siz { /* initialize work list */ rt_list_init(&(queue->work_list)); + rt_list_init(&(queue->delayed_list)); queue->work_current = RT_NULL; rt_sem_init(&(queue->sem), "wqueue", 0, RT_IPC_FLAG_FIFO); @@ -302,14 +307,22 @@ rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_wor rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue) { struct rt_list_node *node, *next; + struct rt_work *work; + RT_ASSERT(queue != RT_NULL); - // TODO: cancel delay work + // cancel work rt_enter_critical(); - for (node = queue->work_list.next; node != &(queue->work_list); node = next) + while (rt_list_isempty(&queue->work_list) != RT_FALSE) { - next = node->next; - rt_list_remove(node); + work = rt_list_first_entry(&queue->work_list, struct rt_work, list); + _workqueue_cancel_work(work); + } + // cancel delay work + while (rt_list_isempty(&queue->delayed_list) != RT_FALSE) + { + work = rt_list_first_entry(&queue->delayed_list, struct rt_work, list); + _workqueue_cancel_work(work); } rt_exit_critical(); From 3ef3fb50afdb388918fe7514d287aca753030f27 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Sat, 6 Feb 2021 20:15:50 +0800 Subject: [PATCH 11/25] =?UTF-8?q?[workqueue]=20=E9=98=9F=E5=88=97=E9=94=80?= =?UTF-8?q?=E6=AF=81=E6=97=B6=E5=8F=96=E6=B6=88=E6=89=80=E6=9C=89=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=B9=B6=E9=87=8A=E6=94=BE=E5=86=85=E6=A0=B8=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/src/workqueue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index eb6cefc006..474eae556b 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -231,7 +231,9 @@ rt_err_t rt_workqueue_destroy(struct rt_workqueue *queue) { RT_ASSERT(queue != RT_NULL); + rt_workqueue_cancel_all_work(); rt_thread_delete(queue->work_thread); + rt_sem_detach(&(queue->sem)); RT_KERNEL_FREE(queue); return RT_EOK; From 7eabe5c9e9a2a93aa7303bee15c156e623986194 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Sat, 6 Feb 2021 20:39:52 +0800 Subject: [PATCH 12/25] =?UTF-8?q?[workqueue]=20=E5=8F=96=E6=B6=88=E6=AD=A3?= =?UTF-8?q?=E5=9C=A8=E6=89=A7=E8=A1=8C=E7=9A=84=E5=B7=A5=E4=BD=9C=E8=BF=94?= =?UTF-8?q?=E5=9B=9EBUSY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/src/workqueue.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index 474eae556b..3feeaea0be 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -145,9 +145,10 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue, return -RT_ERROR; } -static rt_err_t _workqueue_cancel_work(struct rt_work *work) +static rt_err_t _workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work) { rt_base_t level; + rt_err_t err; level = rt_hw_interrupt_disable(); rt_list_remove(&(work->list)); @@ -159,9 +160,10 @@ static rt_err_t _workqueue_cancel_work(struct rt_work *work) rt_timer_detach(&(work->timer)); work->flags &= ~RT_WORK_STATE_SUBMITTING; } + err = queue->work_current != work ? RT_EOK : -RT_EBUSY; work->workqueue = RT_NULL; rt_hw_interrupt_enable(level); - return 0; + return err; } static void _delayed_work_timeout_handler(void *parameter) @@ -231,7 +233,7 @@ rt_err_t rt_workqueue_destroy(struct rt_workqueue *queue) { RT_ASSERT(queue != RT_NULL); - rt_workqueue_cancel_all_work(); + rt_workqueue_cancel_all_work(queue); rt_thread_delete(queue->work_thread); rt_sem_detach(&(queue->sem)); RT_KERNEL_FREE(queue); @@ -285,7 +287,8 @@ rt_err_t rt_workqueue_critical_work(struct rt_workqueue *queue, struct rt_work * rt_err_t rt_workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work) { RT_ASSERT(work != RT_NULL); - return _workqueue_cancel_work(work); + RT_ASSERT(queue != RT_NULL); + return _workqueue_cancel_work(queue, work); } rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_work *work) @@ -300,7 +303,7 @@ rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_wor } else { - _workqueue_cancel_work(work); + _workqueue_cancel_work(queue, work); } return RT_EOK; @@ -308,23 +311,22 @@ rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_wor rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue) { - struct rt_list_node *node, *next; struct rt_work *work; RT_ASSERT(queue != RT_NULL); // cancel work rt_enter_critical(); - while (rt_list_isempty(&queue->work_list) != RT_FALSE) + while (rt_list_isempty(&queue->work_list) == RT_FALSE) { work = rt_list_first_entry(&queue->work_list, struct rt_work, list); - _workqueue_cancel_work(work); + _workqueue_cancel_work(queue, work); } // cancel delay work - while (rt_list_isempty(&queue->delayed_list) != RT_FALSE) + while (rt_list_isempty(&queue->delayed_list) == RT_FALSE) { work = rt_list_first_entry(&queue->delayed_list, struct rt_work, list); - _workqueue_cancel_work(work); + _workqueue_cancel_work(queue, work); } rt_exit_critical(); From 83dca09e1c31637583b99823c86ed86fa3e12491 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Sat, 6 Feb 2021 21:54:25 +0800 Subject: [PATCH 13/25] =?UTF-8?q?[workqueue]=20=E4=BF=AE=E5=A4=8D=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=B7=A5=E4=BD=9C=E5=90=8E=E7=AB=8B=E5=8D=B3=E5=8F=96?= =?UTF-8?q?=E6=B6=88=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=97=A0=E6=95=88=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当高优先级任务提交工作后，立即取消。此时队列被唤醒，下面紧接着获取链表中第一个任务。但此时已经是空链表了。 每次线程被唤醒。检查当前任务链表是否未空 --- components/drivers/src/workqueue.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index 3feeaea0be..ce1ca071c3 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -58,15 +58,17 @@ static void _workqueue_thread_entry(void *parameter) while (1) { + level = rt_hw_interrupt_disable(); if (rt_list_isempty(&(queue->work_list))) { + rt_hw_interrupt_enable(level); /* no software timer exist, suspend self. */ rt_thread_suspend(rt_thread_self()); rt_schedule(); + continue; } /* 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; @@ -76,10 +78,8 @@ static void _workqueue_thread_entry(void *parameter) /* 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); /* ack work completion */ _workqueue_work_completion(queue); From a96156faf11d97e50687732f95a2d589c39dc194 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Sun, 7 Feb 2021 10:30:25 +0800 Subject: [PATCH 14/25] =?UTF-8?q?[workqueue]=20=E6=8F=90=E4=BA=A4=E6=AD=A3?= =?UTF-8?q?=E5=9C=A8=E6=89=A7=E8=A1=8C=E7=9A=84=E5=B7=A5=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20BUSY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/src/workqueue.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index ce1ca071c3..f6bb6114aa 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -90,6 +90,7 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *work, rt_tick_t ticks) { rt_base_t level; + rt_err_t err; level = rt_hw_interrupt_disable(); /* remove list */ @@ -103,6 +104,11 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue, rt_list_insert_after(queue->work_list.prev, &(work->list)); work->flags |= RT_WORK_STATE_PENDING; work->workqueue = queue; + err = RT_EOK; + } + else + { + err = -RT_EBUSY; } /* whether the workqueue is doing work */ @@ -118,7 +124,7 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue, { rt_hw_interrupt_enable(level); } - return RT_EOK; + return err; } else if (ticks < RT_TICK_MAX / 2) { From 83692a54c444f07eb4a5e980f696f050f5e924e1 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Sun, 7 Feb 2021 11:14:59 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E3=80=90workqueue=E3=80=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=87=BD=E6=95=B0=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue); --- components/drivers/include/ipc/workqueue.h | 1 + 1 file changed, 1 insertion(+) diff --git a/components/drivers/include/ipc/workqueue.h b/components/drivers/include/ipc/workqueue.h index 51976b4de7..11fee489bd 100644 --- a/components/drivers/include/ipc/workqueue.h +++ b/components/drivers/include/ipc/workqueue.h @@ -63,6 +63,7 @@ rt_err_t rt_workqueue_dowork(struct rt_workqueue *queue, struct rt_work *work); rt_err_t rt_workqueue_submit_work(struct rt_workqueue *queue, struct rt_work *work, rt_tick_t time); rt_err_t rt_workqueue_cancel_work(struct rt_workqueue *queue, struct rt_work *work); rt_err_t rt_workqueue_cancel_work_sync(struct rt_workqueue *queue, struct rt_work *work); +rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue); #ifdef RT_USING_SYSTEM_WORKQUEUE rt_err_t rt_work_submit(struct rt_work *work, rt_tick_t time); From 791b8a35deba00ca334ca81c4e451037d05ae883 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Mon, 22 Feb 2021 11:23:20 +0800 Subject: [PATCH 16/25] =?UTF-8?q?[workqueue]=20=E7=B3=BB=E7=BB=9F=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=B7=A5=E4=BD=9C=E9=98=9F=E5=88=97=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E9=98=B6=E6=AE=B5=E6=8F=90=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/src/workqueue.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index f6bb6114aa..d852b7a4d8 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -369,7 +369,6 @@ int rt_work_sys_workqueue_init(void) return RT_EOK; } - -INIT_DEVICE_EXPORT(rt_work_sys_workqueue_init); +INIT_PREV_EXPORT(rt_work_sys_workqueue_init); #endif #endif From 4f2359d34c502901c56c84ee0b08561aa12f8113 Mon Sep 17 00:00:00 2001 From: tangyuxin <462747508@qq.com> Date: Mon, 22 Feb 2021 17:10:33 +0800 Subject: [PATCH 17/25] =?UTF-8?q?[workqueue]=20=E4=BF=AE=E5=A4=8D=E4=B8=B4?= =?UTF-8?q?=E7=95=8C=E6=9D=A1=E4=BB=B6=E7=BA=BF=E7=A8=8B=E6=84=8F=E5=A4=96?= =?UTF-8?q?=E6=8C=82=E8=B5=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 线程判断任务链表为空时，开中断挂起线程，在挂起线程的过程中，提交的任务不会被执行。 将线程的挂起与恢复放在中断保护内，确保挂起挂起恢复是一个完整的过程 --- components/drivers/src/workqueue.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/drivers/src/workqueue.c b/components/drivers/src/workqueue.c index d852b7a4d8..7aea647703 100644 --- a/components/drivers/src/workqueue.c +++ b/components/drivers/src/workqueue.c @@ -61,9 +61,9 @@ static void _workqueue_thread_entry(void *parameter) level = rt_hw_interrupt_disable(); if (rt_list_isempty(&(queue->work_list))) { - rt_hw_interrupt_enable(level); /* no software timer exist, suspend self. */ rt_thread_suspend(rt_thread_self()); + rt_hw_interrupt_enable(level); rt_schedule(); continue; } @@ -115,9 +115,9 @@ static rt_err_t _workqueue_submit_work(struct rt_workqueue *queue, if (queue->work_current == RT_NULL && ((queue->work_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_SUSPEND)) { - rt_hw_interrupt_enable(level); /* resume work thread */ rt_thread_resume(queue->work_thread); + rt_hw_interrupt_enable(level); rt_schedule(); } else @@ -197,9 +197,9 @@ static void _delayed_work_timeout_handler(void *parameter) if (queue->work_current == RT_NULL && ((queue->work_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_SUSPEND)) { - rt_hw_interrupt_enable(level); /* resume work thread */ rt_thread_resume(queue->work_thread); + rt_hw_interrupt_enable(level); rt_schedule(); } else @@ -277,9 +277,9 @@ rt_err_t rt_workqueue_critical_work(struct rt_workqueue *queue, struct rt_work * if (queue->work_current == RT_NULL && ((queue->work_thread->stat & RT_THREAD_STAT_MASK) == RT_THREAD_SUSPEND)) { - rt_hw_interrupt_enable(level); /* resume work thread */ rt_thread_resume(queue->work_thread); + rt_hw_interrupt_enable(level); rt_schedule(); } else @@ -321,14 +321,14 @@ rt_err_t rt_workqueue_cancel_all_work(struct rt_workqueue *queue) RT_ASSERT(queue != RT_NULL); - // cancel work + /* cancel work */ rt_enter_critical(); while (rt_list_isempty(&queue->work_list) == RT_FALSE) { work = rt_list_first_entry(&queue->work_list, struct rt_work, list); _workqueue_cancel_work(queue, work); } - // cancel delay work + /* cancel delay work */ while (rt_list_isempty(&queue->delayed_list) == RT_FALSE) { work = rt_list_first_entry(&queue->delayed_list, struct rt_work, list); From e03eaec462ed5a890c37c7c8521012f3529e9f4e Mon Sep 17 00:00:00 2001 From: LeeChunHei Date: Tue, 23 Feb 2021 13:42:19 +0800 Subject: [PATCH 18/25] update to new usb api in hid and mouse source file --- components/drivers/Kconfig | 8 ++ components/drivers/usb/usbhost/class/hid.c | 131 ++++++++++-------- components/drivers/usb/usbhost/class/hid.h | 12 +- components/drivers/usb/usbhost/class/umouse.c | 25 +++- 4 files changed, 109 insertions(+), 67 deletions(-) diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig index 006497519f..b0caabc73c 100755 --- a/components/drivers/Kconfig +++ b/components/drivers/Kconfig @@ -642,6 +642,14 @@ menu "Using USB" string "Udisk mount dir" default "/" endif + config RT_USBH_HID + bool "Enable HID Drivers" + default n + if RT_USBH_HID + config RT_USBH_HID_MOUSE + bool "Enable HID mouse protocol" + default n + endif endif config RT_USING_USB_DEVICE bool "Using USB device" diff --git a/components/drivers/usb/usbhost/class/hid.c b/components/drivers/usb/usbhost/class/hid.c index e16096877f..b097b01679 100644 --- a/components/drivers/usb/usbhost/class/hid.c +++ b/components/drivers/usb/usbhost/class/hid.c @@ -6,6 +6,7 @@ * Change Logs: * Date Author Notes * 2011-12-12 Yi Qiu first version + * 2021-02-23 Leslie Lee update with current usb api */ #include @@ -26,7 +27,7 @@ static rt_list_t _protocal_list; * * @return the error code, RT_EOK on successfully. */ -rt_err_t rt_usbh_hid_set_idle(struct uintf* intf, int duration, int report_id) +rt_err_t rt_usbh_hid_set_idle(struct uhintf* intf, int duration, int report_id) { struct urequest setup; struct uinstance* device; @@ -40,14 +41,15 @@ rt_err_t rt_usbh_hid_set_idle(struct uintf* intf, int duration, int report_id) setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE; - setup.request = USB_REQ_SET_IDLE; - setup.index = 0; - setup.length = 0; - setup.value = (duration << 8 )| report_id; + setup.bRequest = USB_REQ_SET_IDLE; + setup.wIndex = 0; + setup.wLength = 0; + setup.wValue = (duration << 8 )| report_id; - if(rt_usb_hcd_control_xfer(device->hcd, device, &setup, RT_NULL, 0, - timeout) == 0) return RT_EOK; - else return -RT_FALSE; + if (rt_usb_hcd_setup_xfer(device->hcd, device->pipe_ep0_out, &setup, timeout) == 8) + return RT_EOK; + else + return -RT_FALSE; } /** @@ -59,7 +61,7 @@ rt_err_t rt_usbh_hid_set_idle(struct uintf* intf, int duration, int report_id) * * @return the error code, RT_EOK on successfully. */ -rt_err_t rt_usbh_hid_get_report(struct uintf* intf, rt_uint8_t type, +rt_err_t rt_usbh_hid_get_report(struct uhintf* intf, rt_uint8_t type, rt_uint8_t id, rt_uint8_t *buffer, rt_size_t size) { struct urequest setup; @@ -74,14 +76,24 @@ rt_err_t rt_usbh_hid_get_report(struct uintf* intf, rt_uint8_t type, setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE; - setup.request = USB_REQ_GET_REPORT; - setup.index = intf->intf_desc->bInterfaceNumber; - setup.length = size; - setup.value = (type << 8 ) + id; + setup.bRequest = USB_REQ_GET_REPORT; + setup.wIndex = intf->intf_desc->bInterfaceNumber; + setup.wLength = size; + setup.wValue = (type << 8 ) + id; - if(rt_usb_hcd_control_xfer(device->hcd, device, &setup, buffer, size, - timeout) == size) return RT_EOK; - else return -RT_FALSE; + if (rt_usb_hcd_setup_xfer(device->hcd, device->pipe_ep0_out, &setup, timeout) == 8) + { + if (rt_usb_hcd_pipe_xfer(device->hcd, device->pipe_ep0_in, buffer, size, timeout) == size) + { + if (rt_usb_hcd_pipe_xfer(device->hcd, device->pipe_ep0_out, RT_NULL, 0, timeout) == 0) + { + return RT_EOK; + } + } + } + else + return -RT_FALSE; + return -RT_FALSE; } /** @@ -93,7 +105,7 @@ rt_err_t rt_usbh_hid_get_report(struct uintf* intf, rt_uint8_t type, * * @return the error code, RT_EOK on successfully. */ -rt_err_t rt_usbh_hid_set_report(struct uintf* intf, rt_uint8_t *buffer, rt_size_t size) +rt_err_t rt_usbh_hid_set_report(struct uhintf* intf, rt_uint8_t *buffer, rt_size_t size) { struct urequest setup; struct uinstance* device; @@ -107,14 +119,15 @@ rt_err_t rt_usbh_hid_set_report(struct uintf* intf, rt_uint8_t *buffer, rt_size_ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE; - setup.request = USB_REQ_SET_REPORT; - setup.index = intf->intf_desc->bInterfaceNumber; - setup.length = size; - setup.value = 0x02 << 8; + setup.bRequest = USB_REQ_SET_REPORT; + setup.wIndex = intf->intf_desc->bInterfaceNumber; + setup.wLength = size; + setup.wValue = 0x02 << 8; - if(rt_usb_hcd_control_xfer(device->hcd, device, &setup, buffer, size, - timeout) == size) return RT_EOK; - else return -RT_FALSE; + if (rt_usb_hcd_setup_xfer(device->hcd, device->pipe_ep0_out, &setup, timeout) == 8) + return RT_EOK; + else + return -RT_FALSE; } /** @@ -125,7 +138,7 @@ rt_err_t rt_usbh_hid_set_report(struct uintf* intf, rt_uint8_t *buffer, rt_size_ * * @return the error code, RT_EOK on successfully. */ -rt_err_t rt_usbh_hid_set_protocal(struct uintf* intf, int protocol) +rt_err_t rt_usbh_hid_set_protocal(struct uhintf* intf, int protocol) { struct urequest setup; struct uinstance* device; @@ -139,14 +152,15 @@ rt_err_t rt_usbh_hid_set_protocal(struct uintf* intf, int protocol) setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE; - setup.request = USB_REQ_SET_PROTOCOL; - setup.index = 0; - setup.length = 0; - setup.value = protocol; + setup.bRequest = USB_REQ_SET_PROTOCOL; + setup.wIndex = 0; + setup.wLength = 0; + setup.wValue = protocol; - if(rt_usb_hcd_control_xfer(device->hcd, device, &setup, RT_NULL, 0, - timeout) == 0) return RT_EOK; - else return -RT_FALSE; + if (rt_usb_hcd_setup_xfer(device->hcd, device->pipe_ep0_out, &setup, timeout) == 8) + return RT_EOK; + else + return -RT_FALSE; } /** @@ -159,7 +173,7 @@ rt_err_t rt_usbh_hid_set_protocal(struct uintf* intf, int protocol) * * @return the error code, RT_EOK on successfully. */ -rt_err_t rt_usbh_hid_get_report_descriptor(struct uintf* intf, +rt_err_t rt_usbh_hid_get_report_descriptor(struct uhintf* intf, rt_uint8_t *buffer, rt_size_t size) { struct urequest setup; @@ -174,14 +188,24 @@ rt_err_t rt_usbh_hid_get_report_descriptor(struct uintf* intf, setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_STANDARD| USB_REQ_TYPE_INTERFACE; - setup.request = USB_REQ_GET_DESCRIPTOR; - setup.index = 0; - setup.length = size; - setup.value = USB_DESC_TYPE_REPORT << 8; + setup.bRequest = USB_REQ_GET_DESCRIPTOR; + setup.wIndex = 0; + setup.wLength = size; + setup.wValue = USB_DESC_TYPE_REPORT << 8; - if(rt_usb_hcd_control_xfer(device->hcd, device, &setup, buffer, size, - timeout) == size) return RT_EOK; - else return -RT_FALSE; + if (rt_usb_hcd_setup_xfer(device->hcd, device->pipe_ep0_out, &setup, timeout) == 8) + { + if (rt_usb_hcd_pipe_xfer(device->hcd, device->pipe_ep0_in, buffer, size, timeout) == size) + { + if (rt_usb_hcd_pipe_xfer(device->hcd, device->pipe_ep0_out, RT_NULL, 0, timeout) == 0) + { + return RT_EOK; + } + } + } + else + return -RT_FALSE; + return -RT_FALSE; } /** @@ -220,16 +244,16 @@ static void rt_usbh_hid_callback(void* context) RT_ASSERT(context != RT_NULL); pipe = (upipe_t)context; - hid = (struct uhid*)pipe->intf->user_data; + hid = (struct uhid*)((struct uhintf*)pipe->inst)->user_data; /* invoke protocal callback function */ hid->protocal->callback((void*)hid); /* parameter check */ - RT_ASSERT(pipe->intf->device->hcd != RT_NULL); + RT_ASSERT(((struct uhintf*)pipe->inst)->device->hcd != RT_NULL); - rt_usb_hcd_int_xfer(pipe->intf->device->hcd, pipe, hid->buffer, - pipe->ep.wMaxPacketSize, timeout); + rt_usb_hcd_pipe_xfer(((struct uhintf*)pipe->inst)->device->hcd, pipe, + hid->buffer, pipe->ep.wMaxPacketSize, timeout); } /** @@ -268,9 +292,7 @@ static rt_err_t rt_usbh_hid_enable(void* arg) int i = 0, pro_id; uprotocal_t protocal; struct uhid* hid; - struct uintf* intf = (struct uintf*)arg; - int timeout = USB_TIMEOUT_BASIC; - upipe_t pipe; + struct uhintf* intf = (struct uhintf*)arg; /* parameter check */ if(intf == RT_NULL) @@ -319,19 +341,13 @@ static rt_err_t rt_usbh_hid_enable(void* arg) if(!(ep_desc->bEndpointAddress & USB_DIR_IN)) continue; ret = rt_usb_hcd_alloc_pipe(intf->device->hcd, &hid->pipe_in, - intf, ep_desc, rt_usbh_hid_callback); + intf, ep_desc); if(ret != RT_EOK) return ret; } /* initialize hid protocal */ - hid->protocal->init((void*)intf); - pipe = hid->pipe_in; + hid->protocal->init((void*)intf); - /* parameter check */ - RT_ASSERT(pipe->intf->device->hcd != RT_NULL); - - rt_usb_hcd_int_xfer(pipe->intf->device->hcd, hid->pipe_in, - hid->buffer, hid->pipe_in->ep.wMaxPacketSize, timeout); return RT_EOK; } @@ -346,7 +362,7 @@ static rt_err_t rt_usbh_hid_enable(void* arg) static rt_err_t rt_usbh_hid_disable(void* arg) { struct uhid* hid; - struct uintf* intf = (struct uintf*)arg; + struct uhintf* intf = (struct uhintf*)arg; RT_ASSERT(intf != RT_NULL); @@ -364,9 +380,6 @@ static rt_err_t rt_usbh_hid_disable(void* arg) /* free the hid instance */ rt_free(hid); } - - /* free the instance */ - rt_free(intf); return RT_EOK; } diff --git a/components/drivers/usb/usbhost/class/hid.h b/components/drivers/usb/usbhost/class/hid.h index 8e446c8cea..dbef84abbe 100644 --- a/components/drivers/usb/usbhost/class/hid.h +++ b/components/drivers/usb/usbhost/class/hid.h @@ -31,11 +31,11 @@ typedef struct uhid uhid_t; #define USB_HID_KEYBOARD 1 #define USB_HID_MOUSE 2 -rt_err_t rt_usbh_hid_set_idle(struct uintf* intf, int duration, int report_id); -rt_err_t rt_usbh_hid_get_report(struct uintf* intf, rt_uint8_t type, rt_uint8_t id, rt_uint8_t *buffer, rt_size_t size); -rt_err_t rt_usbh_hid_set_report(struct uintf* intf, rt_uint8_t *buffer, rt_size_t size); -rt_err_t rt_usbh_hid_set_protocal(struct uintf* intf, int protocol); -rt_err_t rt_usbh_hid_get_report_descriptor(struct uintf* intf, rt_uint8_t *buffer, rt_size_t size); +rt_err_t rt_usbh_hid_set_idle(struct uhintf* intf, int duration, int report_id); +rt_err_t rt_usbh_hid_get_report(struct uhintf* intf, rt_uint8_t type, rt_uint8_t id, rt_uint8_t *buffer, rt_size_t size); +rt_err_t rt_usbh_hid_set_report(struct uhintf* intf, rt_uint8_t *buffer, rt_size_t size); +rt_err_t rt_usbh_hid_set_protocal(struct uhintf* intf, int protocol); +rt_err_t rt_usbh_hid_get_report_descriptor(struct uhintf* intf, rt_uint8_t *buffer, rt_size_t size); rt_err_t rt_usbh_hid_protocal_register(uprotocal_t protocal); -#endif +#endif \ No newline at end of file diff --git a/components/drivers/usb/usbhost/class/umouse.c b/components/drivers/usb/usbhost/class/umouse.c index e769475a98..7f50c0451f 100644 --- a/components/drivers/usb/usbhost/class/umouse.c +++ b/components/drivers/usb/usbhost/class/umouse.c @@ -126,15 +126,36 @@ static rt_err_t rt_usbh_hid_mouse_callback(void* arg) return RT_EOK; } +rt_thread_t mouse_thread; +void mouse_task(void* param) +{ + struct uhintf* intf = (struct uhintf*)param; + while (1) + { + if (rt_usb_hcd_pipe_xfer(intf->device->hcd, ((struct uhid*)intf->user_data)->pipe_in, + ((struct uhid*)intf->user_data)->buffer, ((struct uhid*)intf->user_data)->pipe_in->ep.wMaxPacketSize, + USB_TIMEOUT_BASIC) == 0) + { + break; + } + + rt_usbh_hid_mouse_callback(intf->user_data); + } +} + + static rt_err_t rt_usbh_hid_mouse_init(void* arg) { - struct uintf* intf = (struct uintf*)arg; + struct uhintf* intf = (struct uhintf*)arg; RT_ASSERT(intf != RT_NULL); rt_usbh_hid_set_protocal(intf, 0); - rt_usbh_hid_set_idle(intf, 10, 0); + rt_usbh_hid_set_idle(intf, 0, 0); + + mouse_thread = rt_thread_create("mouse0", mouse_task, intf, 500, 8, 100); + rt_thread_startup(mouse_thread); RT_DEBUG_LOG(RT_DEBUG_USB, ("start usb mouse\n")); #ifdef RT_USING_RTGUI From eaacc0ae3e90eb381cad6e42183902f466eecdad Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Tue, 2 Mar 2021 10:42:40 +0800 Subject: [PATCH 19/25] Optimize getc flow. --- components/net/at/src/at_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/net/at/src/at_client.c b/components/net/at/src/at_client.c index 788549392d..f46abd5cd4 100644 --- a/components/net/at/src/at_client.c +++ b/components/net/at/src/at_client.c @@ -436,13 +436,13 @@ static rt_err_t at_client_getchar(at_client_t client, char *ch, rt_int32_t timeo while (rt_device_read(client->device, 0, ch, 1) == 0) { - rt_sem_control(client->rx_notice, RT_IPC_CMD_RESET, RT_NULL); - result = rt_sem_take(client->rx_notice, rt_tick_from_millisecond(timeout)); if (result != RT_EOK) { return result; } + + rt_sem_control(client->rx_notice, RT_IPC_CMD_RESET, RT_NULL); } return RT_EOK; From 0b2212f773d92d94c8da2a3ab0c7b5b51ab5a893 Mon Sep 17 00:00:00 2001 From: iysheng Date: Tue, 2 Mar 2021 12:11:19 +0800 Subject: [PATCH 20/25] [components][ulog] Add support with timestamp print in function ulog_hexdump --- components/utilities/ulog/ulog.c | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/components/utilities/ulog/ulog.c b/components/utilities/ulog/ulog.c index 7b4cb80c3a..b4571f4920 100644 --- a/components/utilities/ulog/ulog.c +++ b/components/utilities/ulog/ulog.c @@ -667,6 +667,9 @@ void ulog_hexdump(const char *tag, rt_size_t width, rt_uint8_t *buf, rt_size_t s rt_size_t i, j; rt_size_t log_len = 0, name_len = rt_strlen(tag); +#ifdef ULOG_OUTPUT_TIME + rt_size_t time_head_len = 0; +#endif char *log_buf = NULL, dump_string[8]; int fmt_result; @@ -703,6 +706,35 @@ void ulog_hexdump(const char *tag, rt_size_t width, rt_uint8_t *buf, rt_size_t s /* package header */ if (i == 0) { +#ifdef ULOG_OUTPUT_TIME + /* add time info */ +#ifdef ULOG_TIME_USING_TIMESTAMP + static time_t now; + static struct tm *tm, tm_tmp; + + now = time(NULL); + tm = gmtime_r(&now, &tm_tmp); + +#ifdef RT_USING_SOFT_RTC + rt_snprintf(log_buf + log_len, ULOG_LINE_BUF_SIZE - log_len, "%02d-%02d %02d:%02d:%02d.%03d ", tm->tm_mon + 1, + tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, rt_tick_get() % 1000); +#else + rt_snprintf(log_buf + log_len, ULOG_LINE_BUF_SIZE - log_len, "%02d-%02d %02d:%02d:%02d ", tm->tm_mon + 1, + tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); +#endif /* RT_USING_SOFT_RTC */ + +#else + static rt_size_t tick_len = 0; + + log_buf[log_len] = '['; + tick_len = ulog_ultoa(log_buf + log_len + 1, rt_tick_get()); + log_buf[log_len + 1 + tick_len] = ']'; + log_buf[log_len + 2 + tick_len] = ' '; + log_buf[log_len + 3 + tick_len] = '\0'; +#endif /* ULOG_TIME_USING_TIMESTAMP */ + time_head_len = rt_strlen(log_buf + log_len); + log_len += time_head_len; +#endif /* ULOG_OUTPUT_TIME */ log_len += ulog_strcpy(log_len, log_buf + log_len, "D/HEX "); log_len += ulog_strcpy(log_len, log_buf + log_len, tag); log_len += ulog_strcpy(log_len, log_buf + log_len, ": "); @@ -710,6 +742,9 @@ void ulog_hexdump(const char *tag, rt_size_t width, rt_uint8_t *buf, rt_size_t s else { log_len = 6 + name_len + 2; +#ifdef ULOG_OUTPUT_TIME + log_len += time_head_len; +#endif rt_memset(log_buf, ' ', log_len); } fmt_result = rt_snprintf(log_buf + log_len, ULOG_LINE_BUF_SIZE, "%04X-%04X: ", i, i + width - 1); From d42e66cb0d956a4a9bc459be78f04d6749eecf66 Mon Sep 17 00:00:00 2001 From: hyhkjiy <2632790902@qq.com> Date: Mon, 1 Mar 2021 00:02:58 +0800 Subject: [PATCH 21/25] [ADD]vscode support for nrf52832 --- bsp/nrf5x/nrf52832/.gitignore | 7 ++++ bsp/nrf5x/nrf52832/.vscode/launch.json | 15 +++++++ bsp/nrf5x/nrf52832/.vscode/tasks.json | 54 ++++++++++++++++++++++++++ bsp/nrf5x/nrf52832/README.md | 26 ++++++++++++- bsp/nrf5x/nrf52832/rtconfig.py | 4 +- 5 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 bsp/nrf5x/nrf52832/.gitignore create mode 100644 bsp/nrf5x/nrf52832/.vscode/launch.json create mode 100644 bsp/nrf5x/nrf52832/.vscode/tasks.json diff --git a/bsp/nrf5x/nrf52832/.gitignore b/bsp/nrf5x/nrf52832/.gitignore new file mode 100644 index 0000000000..2541e31630 --- /dev/null +++ b/bsp/nrf5x/nrf52832/.gitignore @@ -0,0 +1,7 @@ +# vscode common config +.vscode/* +!.vscode/launch.json +!.vscode/tasks.json + +# OS X icon info +.DS_Store \ No newline at end of file diff --git a/bsp/nrf5x/nrf52832/.vscode/launch.json b/bsp/nrf5x/nrf52832/.vscode/launch.json new file mode 100644 index 0000000000..c3a54b371b --- /dev/null +++ b/bsp/nrf5x/nrf52832/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "cortex-debug", + "request": "launch", + "servertype": "jlink", + "cwd": "${workspaceRoot}", + "executable": "rt-thread.elf", + "name": "Cortex Debug", + "device": "nrf52", + "interface": "swd" + } + ] +} \ No newline at end of file diff --git a/bsp/nrf5x/nrf52832/.vscode/tasks.json b/bsp/nrf5x/nrf52832/.vscode/tasks.json new file mode 100644 index 0000000000..68331caaad --- /dev/null +++ b/bsp/nrf5x/nrf52832/.vscode/tasks.json @@ -0,0 +1,54 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "config", + "type": "shell", + "command": "RTT_ROOT=../../.. scons --pyconfig", + "problemMatcher": [] + }, + { + "label": "build", + "type": "shell", + "command": "scons", + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "clean", + "type": "shell", + "command": "scons -c", + "problemMatcher": [] + }, + { + "label": "flash", + "type": "shell", + "command": "nrfjprog -f nrf52 --program rt-thread.hex --sectorerase", + "group": "build", + "problemMatcher": [] + }, + { + "label": "flash_softdevice", + "type": "shell", + "command": "nrfjprog -f nrf52 --program packages/nrf5x_sdk-latest/components/softdevice/s132/hex/s132_nrf52_7.0.1_softdevice.hex --sectorerase", + "problemMatcher": [] + }, + { + "label": "erase", + "type": "shell", + "command": "nrfjprog -f nrf52 --eraseall", + "problemMatcher": [] + }, + { + "label": "reset", + "type": "shell", + "command": "nrfjprog -f nrf52 --reset", + "problemMatcher": [] + } + ] +} \ No newline at end of file diff --git a/bsp/nrf5x/nrf52832/README.md b/bsp/nrf5x/nrf52832/README.md index 8892190001..e5f46d456f 100644 --- a/bsp/nrf5x/nrf52832/README.md +++ b/bsp/nrf5x/nrf52832/README.md @@ -2,7 +2,7 @@ ## 简介 -该文件夹主要存放所有主芯片为nRF52840的板级支持包。目前默认支持的开发板是官方[PCA10040](https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF52-DK) +该文件夹主要存放所有主芯片为nRF52832的板级支持包。目前默认支持的开发板是官方[PCA10040](https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF52-DK) 主要内容如下： - 开发板资源介绍 @@ -61,6 +61,30 @@ PCA10040-nrf52832开发板常用 **板载资源** 如下： 4. 输入`scons --target=mdk4/mdk5/iar` 命令重新生成工程。 +### VS Code开发支持 + +配置步骤： + +1. 在命令行设置以下两个环境变量： + + ```bash + export RTT_CC=gcc + export RTT_EXEC_PATH=<工具链路径/bin> + ``` + +2. 搜索插件`Cortex-debug`并安装。 +3. 安装[nRF Command Line Tools](https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Command-Line-Tools)以支持`nrfjprog`命令。 +4. 在.vscode/settings.json内配置工具链和`JlinkGDBServer`，sample： + + ```json + { + "cortex-debug.armToolchainPath": "/usr/local/gcc-arm-none-eabi-9-2019-q4-major/bin/", + "cortex-debug.armToolchainPrefix": "arm-none-eabi", + "cortex-debug.JLinkGDBServerPath": "/Applications/SEGGER/JLink/JLinkGDBServer" + } + ``` + +5. 点击`终端`->`运行任务`->`build`编译，点击`终端`->`运行任务`->`flash`烧录，点击左侧`debug`->`run`使用VS Code进行debug。 ## 支持其他开发板 diff --git a/bsp/nrf5x/nrf52832/rtconfig.py b/bsp/nrf5x/nrf52832/rtconfig.py index 219d20d303..3be0db8de1 100644 --- a/bsp/nrf5x/nrf52832/rtconfig.py +++ b/bsp/nrf5x/nrf52832/rtconfig.py @@ -54,7 +54,9 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' + POST_ACTION = OBJCPY + ' -O binary $TARGET rt-thread.bin\n' + POST_ACTION += OBJCPY + ' -O ihex $TARGET rt-thread.hex\n' + POST_ACTION += SIZE + ' $TARGET \n' elif PLATFORM == 'armcc': # toolchains From b22b7cbdfe61eb71b49c8d449a0882e96340d9af Mon Sep 17 00:00:00 2001 From: Howard Su Date: Tue, 2 Mar 2021 14:00:26 +0800 Subject: [PATCH 22/25] Cleanup Interrupt for F1S Use structure to handle the registers access, which simplified the logic --- bsp/allwinner_tina/libcpu/interrupt.c | 80 ++++++++++----------------- bsp/allwinner_tina/libcpu/interrupt.h | 28 +++------- 2 files changed, 38 insertions(+), 70 deletions(-) diff --git a/bsp/allwinner_tina/libcpu/interrupt.c b/bsp/allwinner_tina/libcpu/interrupt.c index 14f53b6881..ccf19b0114 100644 --- a/bsp/allwinner_tina/libcpu/interrupt.c +++ b/bsp/allwinner_tina/libcpu/interrupt.c @@ -1,7 +1,7 @@ /* * File : interrupt.c * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2017, RT-Thread Development Team + * COPYRIGHT (C) 2017-2021, 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 @@ -20,6 +20,7 @@ * Change Logs: * Date Author Notes * 2018-02-08 RT-Thread the first version + * 2020-03-02 Howard Su Use structure to access registers */ #include @@ -38,9 +39,6 @@ static void rt_hw_interrupt_handler(int vector, void *param) rt_kprintf("Unhandled interrupt %d occured!!!\n", vector); } -#define readl(addr) (*(volatile unsigned int *)(addr)) -#define writel(value,addr) (*(volatile unsigned int *)(addr) = (value)) - /** * This function will initialize hardware interrupt */ @@ -63,20 +61,20 @@ void rt_hw_interrupt_init(void) /* set base_addr reg */ INTC->base_addr_reg = 0x00000000; /* clear enable */ - INTC->en_reg0 = 0x00000000; - INTC->en_reg1 = 0x00000000; + INTC->en_reg[0] = 0x00000000; + INTC->en_reg[1] = 0x00000000; /* mask interrupt */ - INTC->mask_reg0 = 0xFFFFFFFF; - INTC->mask_reg1 = 0xFFFFFFFF; + INTC->mask_reg[0] = 0xFFFFFFFF; + INTC->mask_reg[1] = 0xFFFFFFFF; /* clear pending */ - INTC->pend_reg0 = 0x00000000; - INTC->pend_reg1 = 0x00000000; + INTC->pend_reg[0] = 0x00000000; + INTC->pend_reg[1] = 0x00000000; /* set priority */ - INTC->resp_reg0 = 0x00000000; - INTC->resp_reg1 = 0x00000000; + INTC->resp_reg[0] = 0x00000000; + INTC->resp_reg[1] = 0x00000000; /* close fiq interrupt */ - INTC->ff_reg0 = 0x00000000; - INTC->ff_reg1 = 0x00000000; + INTC->ff_reg[0] = 0x00000000; + INTC->ff_reg[1] = 0x00000000; } /** @@ -85,20 +83,16 @@ void rt_hw_interrupt_init(void) */ void rt_hw_interrupt_mask(int vector) { - rt_uint32_t mask_addr, data; - + int index; if ((vector < 0) || (vector > INTERRUPTS_MAX)) { return; } - mask_addr = (rt_uint32_t)(&INTC->mask_reg0); - mask_addr += vector & 0xE0 ? sizeof(rt_uint32_t *) : 0; + index = (vector & 0xE0) != 0; + vector = (vector & 0x1F); - vector &= 0x1F; - data = readl(mask_addr); - data |= 0x1 << vector; - writel(data, mask_addr); + INTC->mask_reg[index] |= 1 << vector; } /** @@ -108,20 +102,16 @@ void rt_hw_interrupt_mask(int vector) */ void rt_hw_interrupt_umask(int vector) { - rt_uint32_t mask_addr, data; - + int index; if ((vector < 0) || (vector > INTERRUPTS_MAX)) { return; } - mask_addr = (rt_uint32_t)(&INTC->mask_reg0); - mask_addr += vector & 0xE0 ? sizeof(rt_uint32_t *) : 0; + index = (vector & 0xE0) != 0; + vector = (vector & 0x1F); - vector &= 0x1F; - data = readl(mask_addr); - data &= ~(0x1 << vector); - writel(data, mask_addr); + INTC->mask_reg[index] &= ~(1 << vector); } /** @@ -136,7 +126,7 @@ rt_isr_handler_t rt_hw_interrupt_install(int vector, rt_isr_handler_t handler, void *param, const char *name) { rt_isr_handler_t old_handler = RT_NULL; - rt_uint32_t pend_addr, en_addr, data; + int index; if ((vector < 0) || (vector > INTERRUPTS_MAX)) { @@ -151,19 +141,11 @@ rt_isr_handler_t rt_hw_interrupt_install(int vector, rt_isr_handler_t handler, isr_table[vector].handler = handler; isr_table[vector].param = param; - pend_addr = (rt_uint32_t)(&INTC->pend_reg0); - en_addr = (rt_uint32_t)(&INTC->en_reg0); - pend_addr += vector & 0xE0 ? sizeof(rt_uint32_t *) : 0; - en_addr += vector & 0xE0 ? sizeof(rt_uint32_t *) : 0; + index = (vector & 0xE0) != 0; + vector = (vector & 0x1F); - vector &= 0x1F; - data = readl(pend_addr); - data &= ~(0x1 << vector); - writel(data, pend_addr); - - data = readl(en_addr); - data |= 0x1 << vector; - writel(data, en_addr); + INTC->pend_reg[index] &= ~(0x1 << vector); + INTC->en_reg[index] |= 0x1 << vector; return old_handler; } @@ -173,7 +155,7 @@ void rt_interrupt_dispatch(rt_uint32_t fiq_irq) void *param; int vector; rt_isr_handler_t isr_func; - rt_uint32_t pend_addr, data; + int index; vector = INTC->vector_reg - INTC->base_addr_reg; vector = vector >> 2; @@ -184,13 +166,11 @@ void rt_interrupt_dispatch(rt_uint32_t fiq_irq) /* jump to fun */ isr_func(vector, param); /* clear pend bit */ - pend_addr = (rt_uint32_t)(&INTC->pend_reg0); - pend_addr += vector & 0xE0 ? sizeof(rt_uint32_t *) : 0; - vector &= 0x1F; - data = readl(pend_addr); - data &= ~(0x1 << vector); - writel(data, pend_addr); + index = (vector & 0xE0) != 0; + vector = (vector & 0x1F); + + INTC->pend_reg[index] &= ~(0x1 << vector); #ifdef RT_USING_INTERRUPT_INFO isr_table[vector].counter ++; diff --git a/bsp/allwinner_tina/libcpu/interrupt.h b/bsp/allwinner_tina/libcpu/interrupt.h index 2292b794bd..2790d05ec5 100644 --- a/bsp/allwinner_tina/libcpu/interrupt.h +++ b/bsp/allwinner_tina/libcpu/interrupt.h @@ -1,7 +1,7 @@ /* * File : interrupt.h * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2017, RT-Thread Development Team + * COPYRIGHT (C) 2017-2021, 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 @@ -20,6 +20,7 @@ * Change Logs: * Date Author Notes * 2018-02-08 RT-Thread the first version + * 2020-03-2 Howard Su Define same regsiters as an array */ #ifndef __INTERRUPT_H__ #define __INTERRUPT_H__ @@ -74,34 +75,21 @@ struct tina_intc volatile rt_uint32_t base_addr_reg; /* 0x04 */ volatile rt_uint32_t reserved0; volatile rt_uint32_t nmi_ctrl_reg; /* 0x0C */ - volatile rt_uint32_t pend_reg0; /* 0x10 */ - volatile rt_uint32_t pend_reg1; /* 0x14 */ + volatile rt_uint32_t pend_reg[2]; /* 0x10, 0x14 */ volatile rt_uint32_t reserved1[2]; - volatile rt_uint32_t en_reg0; /* 0x20 */ - volatile rt_uint32_t en_reg1; /* 0x24 */ + volatile rt_uint32_t en_reg[2]; /* 0x20, 0x24 */ volatile rt_uint32_t reserved2[2]; - volatile rt_uint32_t mask_reg0; /* 0x30 */ - volatile rt_uint32_t mask_reg1; /* 0x34 */ + volatile rt_uint32_t mask_reg[2]; /* 0x30, 0x34 */ volatile rt_uint32_t reserved3[2]; - volatile rt_uint32_t resp_reg0; /* 0x40 */ - volatile rt_uint32_t resp_reg1; /* 0x44 */ + volatile rt_uint32_t resp_reg[2]; /* 0x40, 0x44 */ volatile rt_uint32_t reserved4[2]; - volatile rt_uint32_t ff_reg0; /* 0x50 */ - volatile rt_uint32_t ff_reg1; /* 0x54 */ + volatile rt_uint32_t ff_reg[2]; /* 0x50, 0x54 */ volatile rt_uint32_t reserved5[2]; - volatile rt_uint32_t prio_reg0; /* 0x60 */ - volatile rt_uint32_t prio_reg1; /* 0x64 */ - volatile rt_uint32_t prio_reg2; /* 0x68 */ - volatile rt_uint32_t prio_reg3; /* 0x6C */ + volatile rt_uint32_t prio_reg[4]; /* 0x60 - 0x6c */ } ; typedef struct tina_intc *tina_intc_t; #define INTC ((tina_intc_t)INTC_BASE_ADDR) -void rt_hw_interrupt_init(void); -void rt_hw_interrupt_mask(int vector); -void rt_hw_interrupt_umask(int vector); -rt_isr_handler_t rt_hw_interrupt_install(int vector, rt_isr_handler_t handler, void *param, const char *name); - #endif /* __INTERRUPT_H__ */ From a6c04dbf1860f37b998f275be9e71667e4a379d8 Mon Sep 17 00:00:00 2001 From: David Lin Date: Tue, 2 Mar 2021 16:16:36 +0800 Subject: [PATCH 23/25] [bsp] Mini optimized the fh_mmc.c Deleted the un-reach code line 'break;' --- bsp/fh8620/libraries/driverlib/fh_mmc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/bsp/fh8620/libraries/driverlib/fh_mmc.c b/bsp/fh8620/libraries/driverlib/fh_mmc.c index 4a4370b9fa..5995e634fa 100644 --- a/bsp/fh8620/libraries/driverlib/fh_mmc.c +++ b/bsp/fh8620/libraries/driverlib/fh_mmc.c @@ -194,7 +194,6 @@ int MMC_SetCardWidth(struct fh_mmc_obj *mmc_obj, int width) default: rt_kprintf("ERROR: %s, card width %d is not supported\n", __func__, width); return -RT_ERROR; - break; } return 0; } From 87975c56e82c474dc99067d7758feadab61faa03 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Wed, 3 Mar 2021 02:46:52 +0800 Subject: [PATCH 24/25] =?UTF-8?q?[.gitattributes]=20=E8=A7=A3=E5=86=B3gith?= =?UTF-8?q?ub=E6=98=BE=E7=A4=BAC++=E4=BB=A3=E7=A0=81=E6=AF=94=E4=BE=8B?= =?UTF-8?q?=E8=99=9A=E9=AB=98=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitattributes b/.gitattributes index 4821411509..b689c5b468 100755 --- a/.gitattributes +++ b/.gitattributes @@ -40,3 +40,8 @@ COPYING text *.sct -text *.xsd -text Jamfile -text + +*.c linguist-language=C +*.C linguist-language=C +*.h linguist-language=C +*.H linguist-language=C From 9c1b6e26492191dd02087f3e1b6639b8a9340715 Mon Sep 17 00:00:00 2001 From: Meco Jianting Man <920369182@qq.com> Date: Wed, 3 Mar 2021 03:16:53 +0800 Subject: [PATCH 25/25] Update .gitattributes --- .gitattributes | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index b689c5b468..deeee5e25c 100755 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,8 @@ +*.c linguist-language=C +*.C linguist-language=C +*.h linguist-language=C +*.H linguist-language=C + * text=auto *.S text @@ -40,8 +45,3 @@ COPYING text *.sct -text *.xsd -text Jamfile -text - -*.c linguist-language=C -*.C linguist-language=C -*.h linguist-language=C -*.H linguist-language=C