[GitHub] kasjer closed pull request #1419: fe310: change default plic isr name

[GitBox <gi...@apache.org>]

kasjer closed pull request #1419: fe310: change default plic isr name
URL: https://github.com/apache/mynewt-core/pull/1419
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/kernel/os/include/os/arch/rv32imac/os/os_arch.h b/kernel/os/include/os/arch/rv32imac/os/os_arch.h
index 1a072cc833..18d78c018b 100644
--- a/kernel/os/include/os/arch/rv32imac/os/os_arch.h
+++ b/kernel/os/include/os/arch/rv32imac/os/os_arch.h
@@ -37,6 +37,8 @@ typedef uint32_t os_stack_t;
 #define OS_SANITY_STACK_SIZE (96)
 #define OS_IDLE_STACK_SIZE (64)
 
+void plic_default_isr(int num);
+
 /* Include common arch definitions and APIs */
 #include "os/arch/common.h"
 
diff --git a/kernel/os/src/arch/rv32imac/os_arch_rv32imac.c b/kernel/os/src/arch/rv32imac/os_arch_rv32imac.c
index 39090073ed..f2c8376656 100644
--- a/kernel/os/src/arch/rv32imac/os_arch_rv32imac.c
+++ b/kernel/os/src/arch/rv32imac/os_arch_rv32imac.c
@@ -197,7 +197,7 @@ os_arch_os_init(void)
 
     /* Set all external interrupts to default handler */
     for (i = 0; i < PLIC_NUM_INTERRUPTS; ++i) {
-        plic_interrupts[i] = os_default_irq_asm;
+        plic_interrupts[i] = plic_default_isr;
         /* Default priority set to 0, never interrupt */
         PLIC_REG(PLIC_PRIORITY_OFFSET + i * 4) = 0;
     }
diff --git a/kernel/os/src/arch/rv32imac/os_fault.c b/kernel/os/src/arch/rv32imac/os_fault.c
index 4ab872f552..e429081892 100644
--- a/kernel/os/src/arch/rv32imac/os_fault.c
+++ b/kernel/os/src/arch/rv32imac/os_fault.c
@@ -38,7 +38,7 @@ handle_trap(uint32_t cause, void *fault_address, void *exception_frame)
     hal_system_reset();
 }
 
-void os_default_irq_asm(int num)
+void plic_default_isr(int num)
 {
 
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services