From eb2fc60207fc86229460fe1ec066134751014871 Mon Sep 17 00:00:00 2001 From: Yang sheng Date: Sat, 9 Apr 2022 00:39:00 +0800 Subject: [PATCH] =?UTF-8?q?[bsp]=20Make=20all=20warnings=20into=20errors?= =?UTF-8?q?=20with=20qemu-vexpress-a9=20qemu-virt64=E2=80=A6=20(#5785)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [bsp] Make all warnings into errors with qemu-vexpress-a9 qemu-virt64-aarch64 and stm32f411-st-nucleo. * [RTC] Fix compile errors --- bsp/qemu-vexpress-a9/rtconfig.py | 2 +- bsp/qemu-virt64-aarch64/rtconfig.py | 2 +- bsp/stm32/stm32f411-st-nucleo/rtconfig.py | 2 +- components/drivers/include/drivers/alarm.h | 9 --------- components/drivers/include/drivers/rtc.h | 9 +++++++++ components/drivers/rtc/alarm.c | 1 - examples/utest/testcases/kernel/mailbox_tc.c | 12 ++++++------ examples/utest/testcases/kernel/semaphore_tc.c | 1 - examples/utest/testcases/kernel/signal_tc.c | 4 ++-- 9 files changed, 20 insertions(+), 22 deletions(-) diff --git a/bsp/qemu-vexpress-a9/rtconfig.py b/bsp/qemu-vexpress-a9/rtconfig.py index edd1b6aab7..ebaa1409a6 100644 --- a/bsp/qemu-vexpress-a9/rtconfig.py +++ b/bsp/qemu-vexpress-a9/rtconfig.py @@ -57,7 +57,7 @@ if PLATFORM == 'gcc': STRIP = PREFIX + 'strip' DEVICE = ' -march=armv7-a -marm -msoft-float' - CFLAGS = DEVICE + ' -Wall' + CFLAGS = DEVICE + ' -Wall -Werror' AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -D__ASSEMBLY__ -I.' LINK_SCRIPT = 'link.lds' LFLAGS = DEVICE + ' -nostartfiles -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,system_vectors'+\ diff --git a/bsp/qemu-virt64-aarch64/rtconfig.py b/bsp/qemu-virt64-aarch64/rtconfig.py index 7204079e6f..6432212bf3 100644 --- a/bsp/qemu-virt64-aarch64/rtconfig.py +++ b/bsp/qemu-virt64-aarch64/rtconfig.py @@ -39,7 +39,7 @@ if PLATFORM == 'gcc': OBJCPY = PREFIX + 'objcopy' DEVICE = ' -g -march=armv8-a -mtune=cortex-a53' - CFLAGS = DEVICE + ' -Wall' + CFLAGS = DEVICE + ' -Wall -Werror' AFLAGS = ' -c' + ' -x assembler-with-cpp -D__ASSEMBLY__' LFLAGS = DEVICE + ' -nostartfiles -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,system_vectors -T link.lds' CPATH = '' diff --git a/bsp/stm32/stm32f411-st-nucleo/rtconfig.py b/bsp/stm32/stm32f411-st-nucleo/rtconfig.py index 51934c8fa9..5697fba90d 100644 --- a/bsp/stm32/stm32f411-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f411-st-nucleo/rtconfig.py @@ -44,7 +44,7 @@ if PLATFORM == 'gcc': OBJCPY = PREFIX + 'objcopy' DEVICE = ' -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=hard -ffunction-sections -fdata-sections' - CFLAGS = DEVICE + ' -Dgcc' + CFLAGS = DEVICE + ' -Dgcc' + ' -Wall -Werror' AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp -Wa,-mimplicit-it=thumb ' LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/link.lds' diff --git a/components/drivers/include/drivers/alarm.h b/components/drivers/include/drivers/alarm.h index d96d1ba0d2..6ea9f5e271 100644 --- a/components/drivers/include/drivers/alarm.h +++ b/components/drivers/include/drivers/alarm.h @@ -39,15 +39,6 @@ typedef struct rt_alarm *rt_alarm_t; typedef void (*rt_alarm_callback_t)(rt_alarm_t alarm, time_t timestamp); -/* used for low level RTC driver */ -struct rt_rtc_wkalarm -{ - rt_bool_t enable; /* 0 = alarm disabled, 1 = alarm enabled */ - rt_int32_t tm_sec; /* alarm at tm_sec */ - rt_int32_t tm_min; /* alarm at tm_min */ - rt_int32_t tm_hour; /* alarm at tm_hour */ -}; - struct rt_alarm { rt_list_t list; diff --git a/components/drivers/include/drivers/rtc.h b/components/drivers/include/drivers/rtc.h index 21bbb26d08..2e007e8dd6 100644 --- a/components/drivers/include/drivers/rtc.h +++ b/components/drivers/include/drivers/rtc.h @@ -28,6 +28,15 @@ extern "C" { #define RT_DEVICE_CTRL_RTC_GET_ALARM (RT_DEVICE_CTRL_BASE(RTC) + 0x05) /**< get alarm */ #define RT_DEVICE_CTRL_RTC_SET_ALARM (RT_DEVICE_CTRL_BASE(RTC) + 0x06) /**< set alarm */ +/* used for alarm function */ +struct rt_rtc_wkalarm +{ + rt_bool_t enable; /* 0 = alarm disabled, 1 = alarm enabled */ + rt_int32_t tm_sec; /* alarm at tm_sec */ + rt_int32_t tm_min; /* alarm at tm_min */ + rt_int32_t tm_hour; /* alarm at tm_hour */ +}; + struct rt_rtc_ops { rt_err_t (*init)(void); diff --git a/components/drivers/rtc/alarm.c b/components/drivers/rtc/alarm.c index e56bf591c2..f6c536d354 100644 --- a/components/drivers/rtc/alarm.c +++ b/components/drivers/rtc/alarm.c @@ -748,7 +748,6 @@ void rt_alarm_dump(void) { rt_list_t *next; rt_alarm_t alarm; - rt_uint8_t index = 0; rt_kprintf("| hh:mm:ss | week | flag | en |\n"); rt_kprintf("+----------+------+------+----+\n"); diff --git a/examples/utest/testcases/kernel/mailbox_tc.c b/examples/utest/testcases/kernel/mailbox_tc.c index e18613b559..dc01507c2b 100644 --- a/examples/utest/testcases/kernel/mailbox_tc.c +++ b/examples/utest/testcases/kernel/mailbox_tc.c @@ -191,19 +191,19 @@ static void thread1_recv_static_mb(void *arg) rt_err_t result = RT_EOK; result = rt_mb_recv(&test_static_mb, (rt_ubase_t *)&mb_recv_str1, RT_WAITING_FOREVER); - if (result != RT_EOK || strcmp(mb_recv_str1, mb_send_str1) != 0) + if (result != RT_EOK || rt_strcmp((const char *)mb_recv_str1, (const char *)mb_send_str1) != 0) { uassert_false(1); } result = rt_mb_recv(&test_static_mb, (rt_ubase_t *)&mb_recv_str2, RT_WAITING_FOREVER); - if (result != RT_EOK || strcmp(mb_recv_str2, mb_send_str2) != 0) + if (result != RT_EOK || rt_strcmp((const char *)mb_recv_str2, (const char *)mb_send_str2) != 0) { uassert_false(1); } result = rt_mb_recv(&test_static_mb, (rt_ubase_t *)&mb_recv_str3, RT_WAITING_FOREVER); - if (result != RT_EOK || strcmp(mb_recv_str3, mb_send_str3) != 0) + if (result != RT_EOK || rt_strcmp((const char *)mb_recv_str3, (const char *)mb_send_str3) != 0) { uassert_false(1); } @@ -284,19 +284,19 @@ static void thread3_recv_dynamic_mb(void *arg) rt_err_t result = RT_EOK; result = rt_mb_recv(test_dynamic_mb, (rt_ubase_t *)&mb_recv_str1, RT_WAITING_FOREVER); - if (result != RT_EOK || strcmp(mb_recv_str1, mb_send_str1) != 0) + if (result != RT_EOK || rt_strcmp((const char *)mb_recv_str1, (const char *)mb_send_str1) != 0) { uassert_false(1); } result = rt_mb_recv(test_dynamic_mb, (rt_ubase_t *)&mb_recv_str2, RT_WAITING_FOREVER); - if (result != RT_EOK || strcmp(mb_recv_str2, mb_send_str2) != 0) + if (result != RT_EOK || rt_strcmp((const char *)mb_recv_str2, (const char *)mb_send_str2) != 0) { uassert_false(1); } result = rt_mb_recv(test_dynamic_mb, (rt_ubase_t *)&mb_recv_str3, RT_WAITING_FOREVER); - if (result != RT_EOK || strcmp(mb_recv_str3, mb_send_str3) != 0) + if (result != RT_EOK || rt_strcmp((const char *)mb_recv_str3, (const char *)mb_send_str3) != 0) { uassert_false(1); } diff --git a/examples/utest/testcases/kernel/semaphore_tc.c b/examples/utest/testcases/kernel/semaphore_tc.c index 2992831d87..ca66da43b7 100644 --- a/examples/utest/testcases/kernel/semaphore_tc.c +++ b/examples/utest/testcases/kernel/semaphore_tc.c @@ -269,7 +269,6 @@ static void test_static_semaphore_release_isr(void) #ifdef RT_USING_HEAP static void test_dynamic_semaphore_create(void) { - rt_err_t result; int rand_num = rand() % 0x10000; for (int i = 0; i < rand_num; i++) diff --git a/examples/utest/testcases/kernel/signal_tc.c b/examples/utest/testcases/kernel/signal_tc.c index 40c08f7402..f23aa09124 100644 --- a/examples/utest/testcases/kernel/signal_tc.c +++ b/examples/utest/testcases/kernel/signal_tc.c @@ -121,8 +121,8 @@ void rt_signal_wait_thread(void *parm) rt_signal_install(SIGUSR1, sig_handle_default); rt_signal_unmask(SIGUSR1); - sigemptyset(&selectset); - sigaddset(&selectset, SIGUSR1); + (void)sigemptyset(&selectset); + (void)sigaddset(&selectset, SIGUSR1); /* case 5:rt_signal_wait, two thread, thread1: install and unmask, then wait 1s; thread2: kill, should received. */ if (rt_signal_wait(&selectset, &recive_si, RT_TICK_PER_SECOND) != RT_EOK)