From 6058efbd9ba70da9113c50c13e2493453c32c772 Mon Sep 17 00:00:00 2001 From: aozima Date: Sat, 23 Mar 2013 17:34:52 +0800 Subject: [PATCH] update Jz47xx: Modify the interrupt interface implementations. --- bsp/jz47xx/board.c | 2 +- bsp/jz47xx/uart.c | 2 +- libcpu/mips/jz47xx/interrupt.c | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bsp/jz47xx/board.c b/bsp/jz47xx/board.c index b2f1ba0092..c742d32e7d 100644 --- a/bsp/jz47xx/board.c +++ b/bsp/jz47xx/board.c @@ -39,7 +39,7 @@ void rt_hw_timer_handler(int vector, void* param) /** * This function will initial OS timer */ -void rt_hw_timer_init() +void rt_hw_timer_init(void) { rt_uint32_t val; diff --git a/bsp/jz47xx/uart.c b/bsp/jz47xx/uart.c index 309a89d63f..18edad9d67 100644 --- a/bsp/jz47xx/uart.c +++ b/bsp/jz47xx/uart.c @@ -10,7 +10,7 @@ /*@{*/ #if defined(RT_USING_UART) && defined(RT_USING_DEVICE) -#define UART_BAUDRATE 115200 +#define UART_BAUDRATE 57600 #define DEV_CLK 12000000 /* diff --git a/libcpu/mips/jz47xx/interrupt.c b/libcpu/mips/jz47xx/interrupt.c index f9ada3254a..0ea4827ee2 100644 --- a/libcpu/mips/jz47xx/interrupt.c +++ b/libcpu/mips/jz47xx/interrupt.c @@ -90,7 +90,9 @@ rt_isr_handler_t rt_hw_interrupt_install(int vector, { old_handler = irq_handle_table[vector].handler; +#ifdef RT_USING_INTERRUPT_INFO rt_strncpy(irq_handle_table[vector].name, name, RT_NAME_MAX); +#endif /* RT_USING_INTERRUPT_INFO */ irq_handle_table[vector].handler = handler; irq_handle_table[vector].param = param; } @@ -118,6 +120,10 @@ void rt_interrupt_dispatch(void *ptreg) /* do interrupt */ (*irq_func)(i, irq_handle_table[i].param); +#ifdef RT_USING_INTERRUPT_INFO + irq_handle_table[i].counter++; +#endif /* RT_USING_INTERRUPT_INFO */ + /* ack interrupt */ INTC_IPR = (1 << i); } -- GitLab