diff --git a/.gitignore b/.gitignore index 558b09f1e48beb5f2bc36fedafcec8d97a664a89..87595dcd32961c7fa0caaa43b0ffd9ed82f92221 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,11 @@ ncscope.* #ctag files tags +#gtag files +GPATH +GRTAGS +GTAGS + .idea .vscode *.code-workspace diff --git a/bsp/imx6ul/rtconfig.h b/bsp/imx6ul/rtconfig.h index e71a36b7c59059f05adfc70218c52eb62916b337..600d5521445079a4b810cde5a69f4b3ba5c92ac2 100644 --- a/bsp/imx6ul/rtconfig.h +++ b/bsp/imx6ul/rtconfig.h @@ -9,6 +9,7 @@ /* RT-Thread Kernel */ #define RT_NAME_MAX 8 +#define RT_CPUS_NR 1 #define RT_ALIGN_SIZE 8 #define RT_THREAD_PRIORITY_32 #define RT_THREAD_PRIORITY_MAX 32 @@ -49,6 +50,7 @@ #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart1" #define RT_VER_NUM 0x50002 +#define RT_BACKTRACE_LEVEL_MAX_NR 32 #define RT_USING_CACHE #define RT_USING_HW_ATOMIC #define RT_USING_CPU_FFS diff --git a/components/libc/compilers/common/ctime.c b/components/libc/compilers/common/ctime.c index 44822ec3799eb80732a8860f1f0218def87dfbd1..ffa4d150a35c4483cf463d7242a58dd1e085a4d9 100644 --- a/components/libc/compilers/common/ctime.c +++ b/components/libc/compilers/common/ctime.c @@ -771,7 +771,7 @@ RTM_EXPORT(rt_timespec_to_tick); struct timer_obj { struct rt_ktime_hrtimer hrtimer; - void (*sigev_notify_function)(union sigval val); + void (*sigev_notify_function_t)(union sigval val); union sigval val; struct timespec interval; /* Reload value */ struct timespec value; /* Reload value */ @@ -874,7 +874,7 @@ static void rtthread_timer_wrapper(void *timerobj) } #ifdef RT_USING_SMART /* this field is named as tid in musl */ - int tid = *(int *)&timer->sigev_notify_function; + int tid = *(int *)&timer->sigev_notify_function_t; struct lwp_timer_event_param *data = rt_container_of(timer->work, struct lwp_timer_event_param, work); data->signo = timer->sigev_signo; @@ -892,9 +892,9 @@ static void rtthread_timer_wrapper(void *timerobj) if (rt_work_submit(timer->work, 0)) RT_ASSERT(0); #else - if(timer->sigev_notify_function != RT_NULL) + if(timer->sigev_notify_function_t != RT_NULL) { - (timer->sigev_notify_function)(timer->val); + (timer->sigev_notify_function_t)(timer->val); } #endif /* RT_USING_SMART */ } @@ -982,7 +982,7 @@ int timer_create(clockid_t clockid, struct sigevent *evp, timer_t *timerid) timer->work = work; #endif /* RT_USING_SMART */ - timer->sigev_notify_function = evp->sigev_notify_function; + timer->sigev_notify_function_t = evp->sigev_notify_function; timer->val = evp->sigev_value; timer->interval.tv_sec = 0; timer->interval.tv_nsec = 0;