Skip to content

Commit c9e11ca

Browse files
authored
Merge branch 'RT-Thread:master' into master
2 parents 16f5856 + 7c39352 commit c9e11ca

File tree

19 files changed

+48
-57
lines changed

19 files changed

+48
-57
lines changed

bsp/hpmicro/hpm5300evk/README_zh.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171

7272
- 通过如下命令完成下载:
7373
```console
74-
%OPENOCD_HPMICRO%\openocd.exe -f boards\debug_scripts\probes\cmsis_dap.cfg -f boards\debug_scripts\soc\hpm5300.cfg -f boards\debug_scripts\boards\hpm5300evk.cfg -c "init; halt; flash write_image erase rtthread.elf; reset; shutdown"
74+
%OPENOCD_HPMICRO%\openocd.exe -f board\debug_scripts\probes\ft2232.cfg -f board\debug_scripts\soc\hpm5300.cfg -f board\debug_scripts\boards\hpm5300evk.cfg -c "init; halt; flash write_image erase rtthread.elf; reset; shutdown"
7575
```
7676

7777
- 通过如下命令实现调试:
7878

7979
- 通过 `OpenOCD` 来连接开发板:
8080
```console
81-
%OPENOCD_HPMICRO%\openocd.exe -f boards\debug_scripts\probes\ft2232.cfg -f boards\debug_scripts\soc\hpm5300.cfg -f boards\debug_scripts\boards\hpm5300evk.cfg
81+
%OPENOCD_HPMICRO%\openocd.exe -f board\debug_scripts\probes\ft2232.cfg -f board\debug_scripts\soc\hpm5300.cfg -f board\debug_scripts\boards\hpm5300evk.cfg
8282
```
8383
- 通过 `GDB` 实现调试:
8484
```console

bsp/hpmicro/hpm5300evk/board/debug_scripts/openocd/boards/hpm5300evk.cfg renamed to bsp/hpmicro/hpm5300evk/board/debug_scripts/boards/hpm5300evk.cfg

File renamed without changes.

bsp/hpmicro/hpm5300evk/board/debug_scripts/openocd/probes/cmsis_dap.cfg renamed to bsp/hpmicro/hpm5300evk/board/debug_scripts/probes/cmsis_dap.cfg

File renamed without changes.

bsp/hpmicro/hpm5300evk/board/debug_scripts/openocd/probes/ft2232.cfg renamed to bsp/hpmicro/hpm5300evk/board/debug_scripts/probes/ft2232.cfg

File renamed without changes.

bsp/hpmicro/hpm5300evk/board/debug_scripts/openocd/probes/ft232.cfg renamed to bsp/hpmicro/hpm5300evk/board/debug_scripts/probes/ft232.cfg

File renamed without changes.

bsp/hpmicro/hpm5300evk/board/debug_scripts/openocd/probes/jlink.cfg renamed to bsp/hpmicro/hpm5300evk/board/debug_scripts/probes/jlink.cfg

File renamed without changes.

bsp/hpmicro/hpm5300evk/board/debug_scripts/openocd/probes/nds_aice_micro.cfg renamed to bsp/hpmicro/hpm5300evk/board/debug_scripts/probes/nds_aice_micro.cfg

File renamed without changes.

bsp/hpmicro/hpm5300evk/board/debug_scripts/openocd/soc/hpm5300.cfg renamed to bsp/hpmicro/hpm5300evk/board/debug_scripts/soc/hpm5300.cfg

File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
%OPENOCD_HPMICRO%\openocd.exe -f board\debug_scripts\probes\ft2232.cfg -f board\debug_scripts\soc\hpm5300.cfg -f board\debug_scripts\boards\hpm5300evk.cfg -c "init; halt; flash write_image erase rtthread.elf; reset; shutdown"

components/lwp/lwp_syscall.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,7 @@ sysret_t sys_setpriority(int which, id_t who, int prio)
16341634
for (list = lwp->t_grp.next; list != &lwp->t_grp; list = list->next)
16351635
{
16361636
thread = rt_list_entry(list, struct rt_thread, sibling);
1637-
rt_thread_control(thread, RT_THREAD_CTRL_CHANGE_PRIORITY, &prio);
1637+
rt_thread_control(thread, RT_THREAD_CTRL_RESET_PRIORITY, &prio);
16381638
}
16391639
lwp_pid_lock_release();
16401640
return 0;
@@ -8789,7 +8789,7 @@ sysret_t sys_sched_setparam(pid_t tid, void *param)
87898789

87908790
if (thread)
87918791
{
8792-
ret = rt_thread_control(thread, RT_THREAD_CTRL_CHANGE_PRIORITY, (void *)&sched_param->sched_priority);
8792+
ret = rt_thread_control(thread, RT_THREAD_CTRL_RESET_PRIORITY, (void *)&sched_param->sched_priority);
87938793
}
87948794

87958795
lwp_tid_dec_ref(thread);
@@ -8959,7 +8959,7 @@ sysret_t sys_sched_setscheduler(int tid, int policy, void *param)
89598959
}
89608960

89618961
thread = lwp_tid_get_thread_and_inc_ref(tid);
8962-
ret = rt_thread_control(thread, RT_THREAD_CTRL_CHANGE_PRIORITY, (void *)&sched_param->sched_priority);
8962+
ret = rt_thread_control(thread, RT_THREAD_CTRL_RESET_PRIORITY, (void *)&sched_param->sched_priority);
89638963
lwp_tid_dec_ref(thread);
89648964

89658965
kmem_put(sched_param);

0 commit comments

Comments
 (0)