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

Merge pull request #5734 from Guozhanxin/finsh

Browse Source 
[finsh] Fixed RT-Thread spelling
This commit is contained in:
guo 2022-03-29 16:54:13 +08:00 committed by GitHub
commit 4f53743e61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c
View File

@ -379,7 +379,7 @@ osa_status_t OSA_SemaphoreDestroy(osa_semaphore_handle_t semaphoreHandle)
*END**************************************************************************/ *END**************************************************************************/
osa_status_t OSA_SemaphoreWait(osa_semaphore_handle_t semaphoreHandle, uint32_t millisec) osa_status_t OSA_SemaphoreWait(osa_semaphore_handle_t semaphoreHandle, uint32_t millisec)
{ {
uint32_t timeoutTicks; int32_t timeoutTicks;
assert(semaphoreHandle); assert(semaphoreHandle);
rt_sem_t sem = (rt_sem_t)(void *)(uint32_t *)(*(uint32_t *)semaphoreHandle); rt_sem_t sem = (rt_sem_t)(void *)(uint32_t *)(*(uint32_t *)semaphoreHandle);
@ -460,7 +460,7 @@ osa_status_t OSA_MutexCreate(osa_mutex_handle_t mutexHandle)
osa_status_t OSA_MutexLock(osa_mutex_handle_t mutexHandle, uint32_t millisec) osa_status_t OSA_MutexLock(osa_mutex_handle_t mutexHandle, uint32_t millisec)
{ {
assert(mutexHandle); assert(mutexHandle);
uint32_t timeoutTicks; int32_t timeoutTicks;
rt_mutex_t mutex = (rt_mutex_t)(void *)(uint32_t *)(*(uint32_t *)mutexHandle); rt_mutex_t mutex = (rt_mutex_t)(void *)(uint32_t *)(*(uint32_t *)mutexHandle);
/* Convert timeout from millisecond to tick. */ /* Convert timeout from millisecond to tick. */
@ -642,7 +642,7 @@ osa_status_t OSA_EventWait(osa_event_handle_t eventHandle,
{ {
assert(eventHandle); assert(eventHandle);
rt_uint8_t option = 0; rt_uint8_t option = 0;
rt_uint32_t timeoutTicks; rt_int32_t timeoutTicks;
rt_uint32_t flagsSave; rt_uint32_t flagsSave;
osa_event_struct_t *pEventStruct = (osa_event_struct_t *)eventHandle; osa_event_struct_t *pEventStruct = (osa_event_struct_t *)eventHandle;
@ -778,7 +778,7 @@ osa_status_t OSA_MsgQGet(osa_msgq_handle_t msgqHandle, osa_msg_handle_t pMessage
assert(msgqHandle); assert(msgqHandle);
rt_mq_t handler = (rt_mq_t)(void *)(uint32_t *)(*(uint32_t *)msgqHandle); rt_mq_t handler = (rt_mq_t)(void *)(uint32_t *)(*(uint32_t *)msgqHandle);
uint32_t timeoutTicks; int32_t timeoutTicks;
if (millisec == osaWaitForever_c) if (millisec == osaWaitForever_c)
{ {

2
components/finsh/cmd.c
View File

@ -55,7 +55,7 @@ long version(void)
return 0; return 0;
} }
MSH_CMD_EXPORT(version, show RT - Thread version information); MSH_CMD_EXPORT(version, show RT-Thread version information);
rt_inline void object_split(int len) rt_inline void object_split(int len)
{ {

2
components/finsh/msh.c
View File

@ -52,7 +52,7 @@ int msh_help(int argc, char **argv)
return 0; return 0;
} }
MSH_CMD_EXPORT_ALIAS(msh_help, help, RT - Thread shell help.); MSH_CMD_EXPORT_ALIAS(msh_help, help, RT-Thread shell help.);
#ifdef MSH_USING_BUILT_IN_COMMANDS #ifdef MSH_USING_BUILT_IN_COMMANDS
int cmd_ps(int argc, char **argv) int cmd_ps(int argc, char **argv)

9
tools/keil.py
View File

@ -281,6 +281,11 @@ def MDK45Project(tree, target, script):
out.close() out.close()
def MDK4Project(target, script): def MDK4Project(target, script):
if os.path.isfile('template.uvproj') is False:
print ('Warning: The template project file [template.uvproj] not found!')
return
template_tree = etree.parse('template.uvproj') template_tree = etree.parse('template.uvproj')
MDK45Project(template_tree, target, script) MDK45Project(template_tree, target, script)
@ -297,6 +302,10 @@ def MDK4Project(target, script):
def MDK5Project(target, script): def MDK5Project(target, script):
if os.path.isfile('template.uvprojx') is False:
print ('Warning: The template project file [template.uvprojx] not found!')
return
template_tree = etree.parse('template.uvprojx') template_tree = etree.parse('template.uvprojx')
MDK45Project(template_tree, target, script) MDK45Project(template_tree, target, script)