Przeglądaj źródła

fixed compiling error related to the RT_USING_INTERRUPT_INFO in mini4020

yiyue.fang 12 lat temu
rodzic
commit
db548a1b37
2 zmienionych plików z 4 dodań i 5 usunięć
  1. 3 4
      libcpu/arm/sep4020/interrupt.c
  2. 1 1
      libcpu/arm/sep4020/trap.c

+ 3 - 4
libcpu/arm/sep4020/interrupt.c

@@ -31,10 +31,9 @@ rt_uint32_t rt_thread_switch_interrupt_flag;
  */
 /*@{*/
 
-rt_isr_handler_t rt_hw_interrupt_handle(rt_uint32_t vector)
+static void rt_hw_interrupt_handle(int vector, void *param)
 {
 	rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
-	return RT_NULL;
 }
 
 /**
@@ -85,7 +84,7 @@ void rt_hw_interrupt_init(void)
  * This function will mask a interrupt.
  * @param vector the interrupt number
  */
-void rt_hw_interrupt_mask(rt_uint32_t vector)
+void rt_hw_interrupt_mask(int vector)
 {
 	*(RP)(INTC_IMR) |= 1 << vector;
 }
@@ -94,7 +93,7 @@ void rt_hw_interrupt_mask(rt_uint32_t vector)
  * This function will un-mask a interrupt.
  * @param vector the interrupt number
  */
-void rt_hw_interrupt_umask(rt_uint32_t vector)
+void rt_hw_interrupt_umask(int vector)
 {
 	if(vector == 16)
 	{

+ 1 - 1
libcpu/arm/sep4020/trap.c

@@ -152,7 +152,7 @@ void rt_hw_trap_irq(void)
     }
 
     /* get interrupt service routine */
-    isr_func = isr_table[irq].isr_handle;
+    isr_func = isr_table[irq].handler;
     param = isr_table[irq].param;
 
     /* turn to interrupt service routine */