From cb810dfe750dab6a53a8c20d83f082e0a12ab024 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Mon, 7 Aug 2023 12:30:43 -0400 Subject: [PATCH] rt_hw_cpu_reset: remove all other rt_weak --- bsp/raspberry-pico/libcpu/cpuport.c | 2 +- libcpu/arm/AT91SAM7S/cpu.c | 2 +- libcpu/arm/AT91SAM7X/cpu.c | 2 +- libcpu/arm/arm926/cpuport.c | 2 +- libcpu/arm/armv6/cpuport.c | 2 +- libcpu/arm/cortex-m0/cpuport.c | 2 +- libcpu/arm/cortex-m23/cpuport.c | 2 +- libcpu/arm/cortex-m3/cpuport.c | 2 +- libcpu/arm/cortex-m33/cpuport.c | 2 +- libcpu/arm/cortex-m4/cpuport.c | 2 +- libcpu/arm/cortex-m7/cpuport.c | 2 +- libcpu/arm/cortex-r4/cpu.c | 2 +- libcpu/arm/dm36x/cpuport.c | 2 +- libcpu/arm/lpc214x/cpuport.c | 2 +- libcpu/arm/lpc24xx/cpu.c | 2 +- libcpu/arm/s3c24x0/cpu.c | 2 +- libcpu/arm/s3c44b0/cpu.c | 2 +- libcpu/arm/sep4020/cpu.c | 2 +- libcpu/avr32/uc3/cpu.c | 9 --------- libcpu/mips/gs232/cpuport.c | 2 +- libcpu/unicore32/sep6200/cpu.c | 2 +- libcpu/xilinx/microblaze/cpu.c | 8 -------- src/kservice.c | 16 ++++++++-------- 23 files changed, 28 insertions(+), 45 deletions(-) diff --git a/bsp/raspberry-pico/libcpu/cpuport.c b/bsp/raspberry-pico/libcpu/cpuport.c index 93cc35189a..b6cacb6e13 100644 --- a/bsp/raspberry-pico/libcpu/cpuport.c +++ b/bsp/raspberry-pico/libcpu/cpuport.c @@ -278,7 +278,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex) /** * reset CPU */ -rt_weak void rt_hw_cpu_reset(void) +void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE;//((0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |SCB_AIRCR_SYSRESETREQ_Msk); } diff --git a/libcpu/arm/AT91SAM7S/cpu.c b/libcpu/arm/AT91SAM7S/cpu.c index d917083d0b..e05f8f29ab 100644 --- a/libcpu/arm/AT91SAM7S/cpu.c +++ b/libcpu/arm/AT91SAM7S/cpu.c @@ -20,7 +20,7 @@ * this function will reset CPU * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { } diff --git a/libcpu/arm/AT91SAM7X/cpu.c b/libcpu/arm/AT91SAM7X/cpu.c index bb60ce4565..5406ddf294 100644 --- a/libcpu/arm/AT91SAM7X/cpu.c +++ b/libcpu/arm/AT91SAM7X/cpu.c @@ -20,7 +20,7 @@ * this function will reset CPU * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { } diff --git a/libcpu/arm/arm926/cpuport.c b/libcpu/arm/arm926/cpuport.c index e4d70e1f6f..caf0c46a39 100644 --- a/libcpu/arm/arm926/cpuport.c +++ b/libcpu/arm/arm926/cpuport.c @@ -146,7 +146,7 @@ rt_base_t rt_hw_cpu_dcache_status() * reset cpu by dog's time-out * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { rt_kprintf("Restarting system...\n"); diff --git a/libcpu/arm/armv6/cpuport.c b/libcpu/arm/armv6/cpuport.c index ea9b385b4e..aafd9bbfff 100644 --- a/libcpu/arm/armv6/cpuport.c +++ b/libcpu/arm/armv6/cpuport.c @@ -147,7 +147,7 @@ rt_base_t rt_hw_cpu_dcache_status() * reset cpu by dog's time-out * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { rt_kprintf("Restarting system...\n"); diff --git a/libcpu/arm/cortex-m0/cpuport.c b/libcpu/arm/cortex-m0/cpuport.c index 2d326364cf..dfc2e74223 100644 --- a/libcpu/arm/cortex-m0/cpuport.c +++ b/libcpu/arm/cortex-m0/cpuport.c @@ -131,7 +131,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex) /** * reset CPU */ -rt_weak void rt_hw_cpu_reset(void) +void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE;//((0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |SCB_AIRCR_SYSRESETREQ_Msk); } diff --git a/libcpu/arm/cortex-m23/cpuport.c b/libcpu/arm/cortex-m23/cpuport.c index 7533f2811f..f831db416d 100644 --- a/libcpu/arm/cortex-m23/cpuport.c +++ b/libcpu/arm/cortex-m23/cpuport.c @@ -132,7 +132,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex) /** * reset CPU */ -rt_weak void rt_hw_cpu_reset(void) +void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE;//((0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |SCB_AIRCR_SYSRESETREQ_Msk); } diff --git a/libcpu/arm/cortex-m3/cpuport.c b/libcpu/arm/cortex-m3/cpuport.c index 65fc7969c6..632f1f762b 100644 --- a/libcpu/arm/cortex-m3/cpuport.c +++ b/libcpu/arm/cortex-m3/cpuport.c @@ -356,7 +356,7 @@ rt_weak void rt_hw_cpu_shutdown(void) /** * reset CPU */ -rt_weak void rt_hw_cpu_reset(void) +void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE; } diff --git a/libcpu/arm/cortex-m33/cpuport.c b/libcpu/arm/cortex-m33/cpuport.c index 9c110c7f55..44e1d466d3 100644 --- a/libcpu/arm/cortex-m33/cpuport.c +++ b/libcpu/arm/cortex-m33/cpuport.c @@ -498,7 +498,7 @@ rt_weak void rt_hw_cpu_shutdown(void) /** * reset CPU */ -rt_weak void rt_hw_cpu_reset(void) +void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE; } diff --git a/libcpu/arm/cortex-m4/cpuport.c b/libcpu/arm/cortex-m4/cpuport.c index 1674d846e0..488613ee63 100644 --- a/libcpu/arm/cortex-m4/cpuport.c +++ b/libcpu/arm/cortex-m4/cpuport.c @@ -441,7 +441,7 @@ rt_weak void rt_hw_cpu_shutdown(void) /** * reset CPU */ -rt_weak void rt_hw_cpu_reset(void) +void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE; } diff --git a/libcpu/arm/cortex-m7/cpuport.c b/libcpu/arm/cortex-m7/cpuport.c index 14fee85262..c2faae245f 100644 --- a/libcpu/arm/cortex-m7/cpuport.c +++ b/libcpu/arm/cortex-m7/cpuport.c @@ -440,7 +440,7 @@ rt_weak void rt_hw_cpu_shutdown(void) /** * reset CPU */ -rt_weak void rt_hw_cpu_reset(void) +void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE; } diff --git a/libcpu/arm/cortex-r4/cpu.c b/libcpu/arm/cortex-r4/cpu.c index 2741bfef9b..0a18b6b607 100644 --- a/libcpu/arm/cortex-r4/cpu.c +++ b/libcpu/arm/cortex-r4/cpu.c @@ -20,7 +20,7 @@ * this function will reset CPU * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { } diff --git a/libcpu/arm/dm36x/cpuport.c b/libcpu/arm/dm36x/cpuport.c index 915c79c34f..697f4460ce 100644 --- a/libcpu/arm/dm36x/cpuport.c +++ b/libcpu/arm/dm36x/cpuport.c @@ -145,7 +145,7 @@ rt_base_t rt_hw_cpu_dcache_status() * reset cpu by dog's time-out * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { rt_kprintf("Restarting system...\n"); diff --git a/libcpu/arm/lpc214x/cpuport.c b/libcpu/arm/lpc214x/cpuport.c index de5a900a67..91fa2d761f 100644 --- a/libcpu/arm/lpc214x/cpuport.c +++ b/libcpu/arm/lpc214x/cpuport.c @@ -163,7 +163,7 @@ rt_isr_handler_t rt_hw_interrupt_install(int vector, rt_isr_handler_t handler, * this function will reset CPU * */ -rt_weak void rt_hw_cpu_reset(void) +void rt_hw_cpu_reset(void) { } diff --git a/libcpu/arm/lpc24xx/cpu.c b/libcpu/arm/lpc24xx/cpu.c index 9e19cbf73c..9871debee6 100644 --- a/libcpu/arm/lpc24xx/cpu.c +++ b/libcpu/arm/lpc24xx/cpu.c @@ -20,7 +20,7 @@ * this function will reset CPU * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { } diff --git a/libcpu/arm/s3c24x0/cpu.c b/libcpu/arm/s3c24x0/cpu.c index 88208efc9b..12fbc9c33a 100644 --- a/libcpu/arm/s3c24x0/cpu.c +++ b/libcpu/arm/s3c24x0/cpu.c @@ -148,7 +148,7 @@ rt_base_t rt_hw_cpu_dcache_status() * reset cpu by dog's time-out * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { /* Disable all interrupt except the WDT */ INTMSK = (~((rt_uint32_t)1 << INTWDT)); diff --git a/libcpu/arm/s3c44b0/cpu.c b/libcpu/arm/s3c44b0/cpu.c index e64c6769d6..e4ea96f74e 100644 --- a/libcpu/arm/s3c44b0/cpu.c +++ b/libcpu/arm/s3c44b0/cpu.c @@ -100,7 +100,7 @@ rt_base_t rt_hw_cpu_dcache_status() * this function will reset CPU * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { } diff --git a/libcpu/arm/sep4020/cpu.c b/libcpu/arm/sep4020/cpu.c index c488686e2d..343fcf3612 100644 --- a/libcpu/arm/sep4020/cpu.c +++ b/libcpu/arm/sep4020/cpu.c @@ -152,7 +152,7 @@ rt_base_t rt_hw_cpu_dcache_status() * reset cpu by dog's time-out * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { /* enable watchdog */ diff --git a/libcpu/avr32/uc3/cpu.c b/libcpu/avr32/uc3/cpu.c index 37b0828cf8..36e7611582 100644 --- a/libcpu/avr32/uc3/cpu.c +++ b/libcpu/avr32/uc3/cpu.c @@ -15,15 +15,6 @@ */ /*@{*/ -/** - * reset cpu by dog's time-out - * - */ -rt_weak void rt_hw_cpu_reset() -{ - /*NOTREACHED*/ -} - /** * shutdown CPU * diff --git a/libcpu/mips/gs232/cpuport.c b/libcpu/mips/gs232/cpuport.c index a4a6728ccd..aa0234e672 100644 --- a/libcpu/mips/gs232/cpuport.c +++ b/libcpu/mips/gs232/cpuport.c @@ -23,7 +23,7 @@ * this function will reset CPU * */ -rt_weak void rt_hw_cpu_reset(void) +void rt_hw_cpu_reset(void) { /* open the watch-dog */ WDT_EN = 0x01; /* watch dog enable */ diff --git a/libcpu/unicore32/sep6200/cpu.c b/libcpu/unicore32/sep6200/cpu.c index 26aa673d84..219c37d344 100644 --- a/libcpu/unicore32/sep6200/cpu.c +++ b/libcpu/unicore32/sep6200/cpu.c @@ -245,7 +245,7 @@ static void sep6200_poweroff(void) * reset cpu by dog's time-out * */ -rt_weak void rt_hw_cpu_reset() +void rt_hw_cpu_reset() { rt_kprintf("Soft reset, Restarting system...\n"); diff --git a/libcpu/xilinx/microblaze/cpu.c b/libcpu/xilinx/microblaze/cpu.c index 70a908a22d..36617c26d1 100755 --- a/libcpu/xilinx/microblaze/cpu.c +++ b/libcpu/xilinx/microblaze/cpu.c @@ -10,14 +10,6 @@ #include -/** - * this function will reset CPU - * - */ -rt_weak void rt_hw_cpu_reset() -{ -} - /** * this function will shutdown CPU * diff --git a/src/kservice.c b/src/kservice.c index b29497c765..6c9389dfc5 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -66,22 +66,22 @@ static rt_device_t _console_device = RT_NULL; rt_weak void rt_hw_us_delay(rt_uint32_t us) { (void) us; - LOG_D("rt_hw_us_delay() doesn't support for this board." + LOG_W("rt_hw_us_delay() doesn't support for this board." "Please consider implementing rt_hw_us_delay() in another file."); } +rt_weak void rt_hw_cpu_reset(void) +{ + LOG_W("rt_hw_cpu_reset() doesn't support for this board." + "Please consider implementing rt_hw_cpu_reset() in another file."); + return; +} + rt_weak const char *rt_hw_cpu_arch(void) { return "unknown"; } -rt_weak void rt_hw_cpu_reset(void) -{ - LOG_D("rt_hw_cpu_reset() doesn't support for this board." - "Please consider implementing rt_hw_cpu_reset() in another file."); - return ; -} - static const char* rt_errno_strs[] = { "OK",