summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMeco Jianting Man <[email protected]>2021-09-27 21:12:08 -0500
committerGitHub <[email protected]>2021-09-27 21:12:08 -0500
commitebdf19bf0fbb960102608ed76e1762230ca910bd (patch)
tree142f16f5d6804a93699c138f99302a648b118a4e
parent8b17d53da73289a368a47f798a9275aea3e50d86 (diff)
parent00d42ef73cff61ecda7ff006b077a73e1a4ff669 (diff)
Merge branch 'RT-Thread:master' into part
-rw-r--r--bsp/ls2kdev/drivers/drv_spi.c1
-rw-r--r--components/libc/compilers/common/stdlib.c11
2 files changed, 10 insertions, 2 deletions
diff --git a/bsp/ls2kdev/drivers/drv_spi.c b/bsp/ls2kdev/drivers/drv_spi.c
index e118f48039..71583eb206 100644
--- a/bsp/ls2kdev/drivers/drv_spi.c
+++ b/bsp/ls2kdev/drivers/drv_spi.c
@@ -15,6 +15,7 @@
/*@{*/
#include <stdlib.h>
+#include <stdint.h>
#include <ctype.h>
#include <stdint.h>
#include <rtthread.h>
diff --git a/components/libc/compilers/common/stdlib.c b/components/libc/compilers/common/stdlib.c
index 9d8952e99e..16a13afb83 100644
--- a/components/libc/compilers/common/stdlib.c
+++ b/components/libc/compilers/common/stdlib.c
@@ -10,19 +10,26 @@
#include <rtthread.h>
+#define DBG_TAG "stdlib"
+#define DBG_LVL DBG_INFO
+#include <rtdbg.h>
+
void __rt_libc_exit(int status)
{
rt_thread_t self = rt_thread_self();
if (self != RT_NULL)
{
- rt_kprintf("thread:%s exit:%d!\n", self->name, status);
+ LOG_E("thread:%s exit:%d!", self->name, status);
rt_thread_control(self, RT_THREAD_CTRL_CLOSE, RT_NULL);
}
}
int __rt_libc_system(const char *string)
{
- /* TODO */
+#ifdef RT_USING_MSH
+ extern int msh_exec(char *cmd, rt_size_t length);
+ msh_exec((char*)string, rt_strlen(string));
+#endif
return 0;
}