diff options
9 files changed, 21 insertions, 12 deletions
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction.h b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction.h index 1efab708fe..379bde9c2c 100644 --- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction.h +++ b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction.h @@ -809,4 +809,4 @@ void OSA_InstallIntHandler(uint32_t IRQNumber, void (*handler)(void)); } #endif /*! @}*/ -#endif
\ No newline at end of file +#endif diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_config.h b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_config.h index 11eec49e7d..234cf972bc 100644 --- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_config.h +++ b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_config.h @@ -33,4 +33,4 @@ #define FSL_OSA_TASK_ENABLE 1U #endif /* OSA_USED */ -#endif /* _FSL_OS_ABSTRACTION_CONFIG_H_ */
\ No newline at end of file +#endif /* _FSL_OS_ABSTRACTION_CONFIG_H_ */ diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c index 4601d5f7bd..524744c251 100644 --- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c +++ b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c @@ -379,7 +379,7 @@ osa_status_t OSA_SemaphoreDestroy(osa_semaphore_handle_t semaphoreHandle) *END**************************************************************************/ osa_status_t OSA_SemaphoreWait(osa_semaphore_handle_t semaphoreHandle, uint32_t millisec) { - uint32_t timeoutTicks; + int32_t timeoutTicks; assert(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) { assert(mutexHandle); - uint32_t timeoutTicks; + int32_t timeoutTicks; rt_mutex_t mutex = (rt_mutex_t)(void *)(uint32_t *)(*(uint32_t *)mutexHandle); /* Convert timeout from millisecond to tick. */ @@ -642,7 +642,7 @@ osa_status_t OSA_EventWait(osa_event_handle_t eventHandle, { assert(eventHandle); rt_uint8_t option = 0; - rt_uint32_t timeoutTicks; + rt_int32_t timeoutTicks; rt_uint32_t flagsSave; 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); rt_mq_t handler = (rt_mq_t)(void *)(uint32_t *)(*(uint32_t *)msgqHandle); - uint32_t timeoutTicks; + int32_t timeoutTicks; if (millisec == osaWaitForever_c) { @@ -914,4 +914,4 @@ int main(void) vTaskStartScheduler(); return 0; } -#endif /* FSL_OSA_TASK_ENABLE */
\ No newline at end of file +#endif /* FSL_OSA_TASK_ENABLE */ diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.h b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.h index 0e0423753f..40bd24271a 100644 --- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.h +++ b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.h @@ -127,4 +127,4 @@ extern void DefaultISR(void); /*! @}*/ /*! @}*/ -#endif // __FSL_OS_ABSTRACTION_RTTHREAD_H__
\ No newline at end of file +#endif // __FSL_OS_ABSTRACTION_RTTHREAD_H__ diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.c b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.c index 4c0984f503..80dd21425d 100644 --- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.c +++ b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.c @@ -472,4 +472,4 @@ uint32_t LIST_GetSize(list_handle_t list) uint32_t LIST_GetAvailableSize(list_handle_t list) { return ((uint32_t)list->max - (uint32_t)list->size); /*Gets the number of free places in the list*/ -}
\ No newline at end of file +} diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.h b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.h index 0da10d338d..def00efe8e 100644 --- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.h +++ b/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.h @@ -200,4 +200,4 @@ uint32_t LIST_GetAvailableSize(list_handle_t list); } #endif /*! @}*/ -#endif /*_GENERIC_LIST_H_*/
\ No newline at end of file +#endif /*_GENERIC_LIST_H_*/ diff --git a/components/finsh/cmd.c b/components/finsh/cmd.c index 8fd03e3126..6e86d9214a 100644 --- a/components/finsh/cmd.c +++ b/components/finsh/cmd.c @@ -55,7 +55,7 @@ long version(void) 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) { diff --git a/components/finsh/msh.c b/components/finsh/msh.c index bb649549d4..5272f0728a 100644 --- a/components/finsh/msh.c +++ b/components/finsh/msh.c @@ -52,7 +52,7 @@ int msh_help(int argc, char **argv) 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 int cmd_ps(int argc, char **argv) diff --git a/tools/keil.py b/tools/keil.py index 75986ecbd0..ac2e2c9315 100644 --- a/tools/keil.py +++ b/tools/keil.py @@ -281,6 +281,11 @@ def MDK45Project(tree, target, script): out.close() 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') MDK45Project(template_tree, target, script) @@ -297,6 +302,10 @@ def MDK4Project(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') MDK45Project(template_tree, target, script) |