From 8b3d2adff41e69ab0a9178077be36da21fd4c459 Mon Sep 17 00:00:00 2001 From: Sherman Date: Thu, 4 Nov 2021 14:02:05 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E5=90=8C=E6=AD=A5=20rt-thread=20?= =?UTF-8?q?=E4=B8=BB=E4=BB=93=E5=BA=93=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/ra6m4-cpk/.config | 5 +- bsp/ra6m4-cpk/docs/使用瑞萨FSP配置工具.md | 6 +- bsp/ra6m4-cpk/project.uvoptx | 146 +++++++++++----------- bsp/ra6m4-cpk/project.uvprojx | 130 +++++++++---------- 4 files changed, 145 insertions(+), 142 deletions(-) diff --git a/bsp/ra6m4-cpk/.config b/bsp/ra6m4-cpk/.config index 3b36572e22..c5fe6cb440 100644 --- a/bsp/ra6m4-cpk/.config +++ b/bsp/ra6m4-cpk/.config @@ -7,6 +7,7 @@ # RT-Thread Kernel # CONFIG_RT_NAME_MAX=8 +# CONFIG_RT_USING_BIG_ENDIAN is not set # CONFIG_RT_USING_ARCH_DATA_TYPE is not set # CONFIG_RT_USING_SMP is not set CONFIG_RT_ALIGN_SIZE=4 @@ -156,6 +157,7 @@ CONFIG_RT_USING_PIN=y # # Using USB # +# CONFIG_RT_USING_USB is not set # CONFIG_RT_USING_USB_HOST is not set # CONFIG_RT_USING_USB_DEVICE is not set @@ -163,9 +165,9 @@ CONFIG_RT_USING_PIN=y # POSIX layer and C standard library # # CONFIG_RT_USING_LIBC is not set -# CONFIG_RT_USING_PTHREADS is not set CONFIG_RT_LIBC_USING_TIME=y CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 +# CONFIG_RT_USING_PTHREADS is not set # # Network @@ -202,6 +204,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_RYM is not set # CONFIG_RT_USING_ULOG is not set # CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_VAR_EXPORT is not set # CONFIG_RT_USING_RT_LINK is not set # CONFIG_RT_USING_LWP is not set diff --git a/bsp/ra6m4-cpk/docs/使用瑞萨FSP配置工具.md b/bsp/ra6m4-cpk/docs/使用瑞萨FSP配置工具.md index 6ad2b5ab71..b4d01e48c1 100644 --- a/bsp/ra6m4-cpk/docs/使用瑞萨FSP配置工具.md +++ b/bsp/ra6m4-cpk/docs/使用瑞萨FSP配置工具.md @@ -66,15 +66,15 @@ 4. 测试中断是否成功开启 ```c - #define IRQ_TEST_PIN "p104" + #define IRQ_TEST_PIN "p105" void irq_callback_test(void *args) { - rt_kprintf("\n IRQ01 triggered \n"); + rt_kprintf("\n IRQ00 triggered \n"); } void icu_sample(void) { - /* init P104 */ + /* init */ rt_uint32_t pin = rt_pin_get(IRQ_TEST_PIN); rt_kprintf("\n pin number : 0x%04X \n", pin); rt_err_t err = rt_pin_attach_irq(pin, PIN_IRQ_MODE_RISING, irq_callback_test, RT_NULL); diff --git a/bsp/ra6m4-cpk/project.uvoptx b/bsp/ra6m4-cpk/project.uvoptx index f8db0ba535..a12247f11f 100644 --- a/bsp/ra6m4-cpk/project.uvoptx +++ b/bsp/ra6m4-cpk/project.uvoptx @@ -214,18 +214,6 @@ 1 4 - 2 - 0 - 0 - 0 - ..\..\libcpu\arm\cortex-m4\context_rvds.S - context_rvds.S - 0 - 0 - - - 1 - 5 1 0 0 @@ -235,6 +223,18 @@ 0 0 + + 1 + 5 + 2 + 0 + 0 + 0 + ..\..\libcpu\arm\cortex-m4\context_rvds.S + context_rvds.S + 0 + 0 + @@ -274,8 +274,8 @@ 0 0 0 - ..\..\components\drivers\src\pipe.c - pipe.c + ..\..\components\drivers\src\waitqueue.c + waitqueue.c 0 0 @@ -286,23 +286,23 @@ 0 0 0 - ..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c - 0 - 0 - - - 2 - 10 - 1 - 0 - 0 - 0 ..\..\components\drivers\src\dataqueue.c dataqueue.c 0 0 + + 2 + 10 + 1 + 0 + 0 + 0 + ..\..\components\drivers\src\ringblk_buf.c + ringblk_buf.c + 0 + 0 + 2 11 @@ -310,8 +310,8 @@ 0 0 0 - ..\..\components\drivers\src\workqueue.c - workqueue.c + ..\..\components\drivers\src\pipe.c + pipe.c 0 0 @@ -334,8 +334,8 @@ 0 0 0 - ..\..\components\drivers\src\completion.c - completion.c + ..\..\components\drivers\src\workqueue.c + workqueue.c 0 0 @@ -346,8 +346,8 @@ 0 0 0 - ..\..\components\drivers\src\waitqueue.c - waitqueue.c + ..\..\components\drivers\src\completion.c + completion.c 0 0 @@ -355,7 +355,7 @@ Drivers - 1 + 0 0 0 0 @@ -454,8 +454,8 @@ 0 0 0 - ..\..\src\ipc.c - ipc.c + ..\..\src\components.c + components.c 0 0 @@ -466,8 +466,8 @@ 0 0 0 - ..\..\src\thread.c - thread.c + ..\..\src\irq.c + irq.c 0 0 @@ -478,8 +478,8 @@ 0 0 0 - ..\..\src\device.c - device.c + ..\..\src\object.c + object.c 0 0 @@ -490,8 +490,8 @@ 0 0 0 - ..\..\src\kservice.c - kservice.c + ..\..\src\idle.c + idle.c 0 0 @@ -502,8 +502,8 @@ 0 0 0 - ..\..\src\components.c - components.c + ..\..\src\kservice.c + kservice.c 0 0 @@ -526,8 +526,8 @@ 0 0 0 - ..\..\src\timer.c - timer.c + ..\..\src\device.c + device.c 0 0 @@ -538,35 +538,35 @@ 0 0 0 - ..\..\src\mem.c - mem.c - 0 - 0 - - - 5 - 29 - 1 - 0 - 0 - 0 - ..\..\src\object.c - object.c - 0 - 0 - - - 5 - 30 - 1 - 0 - 0 - 0 ..\..\src\scheduler.c scheduler.c 0 0 + + 5 + 29 + 1 + 0 + 0 + 0 + ..\..\src\thread.c + thread.c + 0 + 0 + + + 5 + 30 + 1 + 0 + 0 + 0 + ..\..\src\mem.c + mem.c + 0 + 0 + 5 31 @@ -574,8 +574,8 @@ 0 0 0 - ..\..\src\irq.c - irq.c + ..\..\src\ipc.c + ipc.c 0 0 @@ -586,8 +586,8 @@ 0 0 0 - ..\..\src\idle.c - idle.c + ..\..\src\timer.c + timer.c 0 0 diff --git a/bsp/ra6m4-cpk/project.uvprojx b/bsp/ra6m4-cpk/project.uvprojx index 1af8a08338..0099b57c70 100644 --- a/bsp/ra6m4-cpk/project.uvprojx +++ b/bsp/ra6m4-cpk/project.uvprojx @@ -339,7 +339,7 @@ -Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal SOC_R7FA6M4AF, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - ..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;drivers\config;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\none-gcc;..\..\examples\utest\testcases\kernel + ..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m4;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;drivers\config;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\common;..\..\components\libc\compilers\common\nogcc;..\..\examples\utest\testcases\kernel @@ -398,16 +398,16 @@ 1 ..\..\libcpu\arm\common\showmem.c - - context_rvds.S - 2 - ..\..\libcpu\arm\cortex-m4\context_rvds.S - cpuport.c 1 ..\..\libcpu\arm\cortex-m4\cpuport.c + + context_rvds.S + 2 + ..\..\libcpu\arm\cortex-m4\context_rvds.S + @@ -424,14 +424,9 @@ ..\..\components\drivers\serial\serial_v2.c - pipe.c + waitqueue.c 1 - ..\..\components\drivers\src\pipe.c - - - ringblk_buf.c - 1 - ..\..\components\drivers\src\ringblk_buf.c + ..\..\components\drivers\src\waitqueue.c dataqueue.c @@ -439,25 +434,30 @@ ..\..\components\drivers\src\dataqueue.c - workqueue.c + ringblk_buf.c 1 - ..\..\components\drivers\src\workqueue.c + ..\..\components\drivers\src\ringblk_buf.c + + + pipe.c + 1 + ..\..\components\drivers\src\pipe.c ringbuffer.c 1 ..\..\components\drivers\src\ringbuffer.c + + workqueue.c + 1 + ..\..\components\drivers\src\workqueue.c + completion.c 1 ..\..\components\drivers\src\completion.c - - waitqueue.c - 1 - ..\..\components\drivers\src\waitqueue.c - @@ -503,66 +503,66 @@ Kernel - - ipc.c - 1 - ..\..\src\ipc.c - - - thread.c - 1 - ..\..\src\thread.c - - - device.c - 1 - ..\..\src\device.c - - - kservice.c - 1 - ..\..\src\kservice.c - components.c 1 ..\..\src\components.c - - clock.c - 1 - ..\..\src\clock.c - - - timer.c - 1 - ..\..\src\timer.c - - - mem.c - 1 - ..\..\src\mem.c - - - object.c - 1 - ..\..\src\object.c - - - scheduler.c - 1 - ..\..\src\scheduler.c - irq.c 1 ..\..\src\irq.c + + object.c + 1 + ..\..\src\object.c + idle.c 1 ..\..\src\idle.c + + kservice.c + 1 + ..\..\src\kservice.c + + + clock.c + 1 + ..\..\src\clock.c + + + device.c + 1 + ..\..\src\device.c + + + scheduler.c + 1 + ..\..\src\scheduler.c + + + thread.c + 1 + ..\..\src\thread.c + + + mem.c + 1 + ..\..\src\mem.c + + + ipc.c + 1 + ..\..\src\ipc.c + + + timer.c + 1 + ..\..\src\timer.c +