From 6058efbd9ba70da9113c50c13e2493453c32c772 Mon Sep 17 00:00:00 2001 From: aozima Date: Sat, 23 Mar 2013 17:34:52 +0800 Subject: update Jz47xx: Modify the interrupt interface implementations. --- libcpu/mips/jz47xx/interrupt.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libcpu/mips') 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); } -- cgit v1.3.1 From 93e04a13667608cb20d098f56a5f1cce75fd8f07 Mon Sep 17 00:00:00 2001 From: aozima Date: Sat, 23 Mar 2013 17:48:36 +0800 Subject: update loongson dev3210: Modify the interrupt interface implementations. --- bsp/dev3210/rtconfig.h | 1 + bsp/dev3210/uart.c | 6 +- libcpu/mips/loongson/interrupt.c | 116 +++++++++++++++++++++++---------------- 3 files changed, 73 insertions(+), 50 deletions(-) (limited to 'libcpu/mips') diff --git a/bsp/dev3210/rtconfig.h b/bsp/dev3210/rtconfig.h index 7968b263f3..cd94adf742 100644 --- a/bsp/dev3210/rtconfig.h +++ b/bsp/dev3210/rtconfig.h @@ -18,6 +18,7 @@ /* Thread Debug */ #define RT_DEBUG #define RT_USING_OVERFLOW_CHECK +#define RT_USING_INTERRUPT_INFO /* Using Hook */ #define RT_USING_HOOK diff --git a/bsp/dev3210/uart.c b/bsp/dev3210/uart.c index 1b8db9ec39..9d638a515a 100644 --- a/bsp/dev3210/uart.c +++ b/bsp/dev3210/uart.c @@ -25,7 +25,7 @@ /* UART interrupt enable register value */ #define UARTIER_IME (1 << 3) -#define UARTIER_ILE (1 << 2) +#define UARTIER_ILE (1 << 2) #define UARTIER_ITXE (1 << 1) #define UARTIER_IRXE (1 << 0) @@ -59,7 +59,7 @@ struct rt_uart_soc3210 rt_uint8_t rx_buffer[RT_UART_RX_BUFFER_SIZE]; }uart_device; -static void rt_uart_irqhandler(int irqno) +static void rt_uart_irqhandler(int irqno, void *param) { rt_ubase_t level; rt_uint8_t isr; @@ -142,7 +142,7 @@ static rt_err_t rt_uart_open(rt_device_t dev, rt_uint16_t oflag) UART_IER(uart->hw_base) |= UARTIER_IRXE; /* install interrupt */ - rt_hw_interrupt_install(uart->irq, rt_uart_irqhandler, RT_NULL); + rt_hw_interrupt_install(uart->irq, rt_uart_irqhandler, RT_NULL, "UART"); rt_hw_interrupt_umask(uart->irq); } return RT_EOK; diff --git a/libcpu/mips/loongson/interrupt.c b/libcpu/mips/loongson/interrupt.c index 4b97068a70..7e59ec950d 100644 --- a/libcpu/mips/loongson/interrupt.c +++ b/libcpu/mips/loongson/interrupt.c @@ -10,8 +10,11 @@ * Change Logs: * Date Author Notes * 2010-10-15 Bernard first version + * 2013-03-29 aozima Modify the interrupt interface implementations. */ + #include +#include #include "soc3210.h" #define MAX_INTR 32 @@ -20,17 +23,17 @@ extern rt_uint32_t rt_interrupt_nest; rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread; rt_uint32_t rt_thread_switch_interrupt_flag; -static rt_isr_handler_t irq_handle_table[MAX_INTR]; +static struct rt_irq_desc irq_handle_table[MAX_INTR]; void rt_interrupt_dispatch(void *ptreg); void rt_hw_timer_handler(); /** * @addtogroup Loongson SoC3210 */ - + /*@{*/ -void rt_hw_interrupt_handler(int vector) +static void rt_hw_interrupt_handler(int vector, void *param) { rt_kprintf("Unhandled interrupt %d occured!!!\n", vector); } @@ -40,11 +43,12 @@ void rt_hw_interrupt_handler(int vector) */ void rt_hw_interrupt_init(void) { - rt_int32_t index; + rt_int32_t idx; - for (index = 0; index < MAX_INTR; index ++) + rt_memset(irq_handle_table, 0x00, sizeof(irq_handle_table)); + for (idx = 0; idx < MAX_INTR; idx ++) { - irq_handle_table[index] = (rt_isr_handler_t)rt_hw_interrupt_handler; + irq_handle_table[idx].handler = rt_hw_interrupt_handler; } /* init interrupt nest, and context in thread sp */ @@ -79,52 +83,70 @@ void rt_hw_interrupt_umask(int vector) * @param new_handler the interrupt service routine to be installed * @param old_handler the old interrupt service routine */ -void rt_hw_interrupt_install(int vector, rt_isr_handler_t new_handler, rt_isr_handler_t *old_handler) +rt_isr_handler_t rt_hw_interrupt_install(int vector, rt_isr_handler_t handler, + void *param, char *name) { - if (vector >= 0 && vector < MAX_INTR) - { - if (old_handler != RT_NULL) - *old_handler = irq_handle_table[vector]; - if (new_handler != RT_NULL) - irq_handle_table[vector] = (rt_isr_handler_t)new_handler; - } + rt_isr_handler_t old_handler = RT_NULL; + + if(vector < MAX_INTR) + { + old_handler = irq_handle_table[vector].handler; + + if (handler != RT_NULL) + { +#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; + } + } + + return old_handler; } void rt_interrupt_dispatch(void *ptreg) { - int i; - rt_isr_handler_t irq_func; - static rt_uint32_t status = 0; - rt_uint32_t c0_status; - - /* check os timer */ - c0_status = read_c0_status(); - if (c0_status & 0x8000) - { - rt_hw_timer_handler(); - } - - if (c0_status & 0x0400) - { - /* the hardware interrupt */ - status |= INT_ISR; - if (!status) return; - - for (i = MAX_INTR; i > 0; --i) - { - if ((status & (1< 0; --irq) + { + if ((status & (1 << irq))) + { + status &= ~(1 << irq); + + irq_func = irq_handle_table[irq].handler; + param = irq_handle_table[irq].param; + + /* do interrupt */ + (*irq_func)(irq, param); + +#ifdef RT_USING_INTERRUPT_INFO + irq_handle_table[irq].counter++; +#endif /* RT_USING_INTERRUPT_INFO */ + + /* ack interrupt */ + INT_CLR = (1 << irq); + } + } + } } /*@}*/ -- cgit v1.3.1 From 83ce43090276b976f99be5646abf7256ce8ec7e0 Mon Sep 17 00:00:00 2001 From: aozima Date: Sat, 23 Mar 2013 20:00:51 +0800 Subject: update loongson 1B dev: Modify the interrupt interface implementations. --- bsp/ls1bdev/drivers/uart.c | 4 +-- bsp/ls1bdev/rtconfig.h | 2 ++ libcpu/mips/loongson_1b/interrupt.c | 57 +++++++++++++++++++++++++------------ 3 files changed, 43 insertions(+), 20 deletions(-) (limited to 'libcpu/mips') diff --git a/bsp/ls1bdev/drivers/uart.c b/bsp/ls1bdev/drivers/uart.c index 80df23f1d6..4e897391fb 100644 --- a/bsp/ls1bdev/drivers/uart.c +++ b/bsp/ls1bdev/drivers/uart.c @@ -37,7 +37,7 @@ struct rt_uart_ls1b rt_uint8_t rx_buffer[RT_UART_RX_BUFFER_SIZE]; }uart_device; -static void rt_uart_irqhandler(int irqno) +static void rt_uart_irqhandler(int irqno, void *param) { rt_ubase_t level; rt_uint8_t isr; @@ -121,7 +121,7 @@ static rt_err_t rt_uart_open(rt_device_t dev, rt_uint16_t oflag) UART_IER(uart->hw_base) |= UARTIER_IRXE; /* install interrupt */ - rt_hw_interrupt_install(uart->irq, rt_uart_irqhandler, RT_NULL); + rt_hw_interrupt_install(uart->irq, rt_uart_irqhandler, RT_NULL, "UART"); rt_hw_interrupt_umask(uart->irq); } return RT_EOK; diff --git a/bsp/ls1bdev/rtconfig.h b/bsp/ls1bdev/rtconfig.h index b0f8a55575..b09f7b044c 100644 --- a/bsp/ls1bdev/rtconfig.h +++ b/bsp/ls1bdev/rtconfig.h @@ -21,6 +21,8 @@ // #define RT_THREAD_DEBUG // #define RT_USING_OVERFLOW_CHECK +// +#define RT_USING_INTERRUPT_INFO // // diff --git a/libcpu/mips/loongson_1b/interrupt.c b/libcpu/mips/loongson_1b/interrupt.c index 63240053a8..c5b4bad038 100644 --- a/libcpu/mips/loongson_1b/interrupt.c +++ b/libcpu/mips/loongson_1b/interrupt.c @@ -11,9 +11,11 @@ * Date Author Notes * 2010-10-15 Bernard first version * 2010-10-15 lgnq modified for LS1B + * 2013-03-29 aozima Modify the interrupt interface implementations. */ #include +#include #include "ls1b.h" #define MAX_INTR 32 @@ -23,7 +25,7 @@ rt_uint32_t rt_interrupt_from_thread; rt_uint32_t rt_interrupt_to_thread; rt_uint32_t rt_thread_switch_interrupt_flag; -static rt_isr_handler_t irq_handle_table[MAX_INTR]; +static struct rt_irq_desc irq_handle_table[MAX_INTR]; void rt_interrupt_dispatch(void *ptreg); void rt_hw_timer_handler(); @@ -36,7 +38,7 @@ static struct ls1b_intc_regs volatile *ls1b_hw0_icregs /*@{*/ -void rt_hw_interrupt_handler(int vector) +static void rt_hw_interrupt_handler(int vector, void *param) { rt_kprintf("Unhandled interrupt %d occured!!!\n", vector); } @@ -46,7 +48,7 @@ void rt_hw_interrupt_handler(int vector) */ void rt_hw_interrupt_init(void) { - rt_int32_t index; + rt_int32_t idx; /* pci active low */ ls1b_hw0_icregs->int_pol = -1; //must be done here 20110802 lgnq @@ -55,9 +57,10 @@ void rt_hw_interrupt_init(void) /* mask all interrupts */ (ls1b_hw0_icregs+0)->int_clr = 0xffffffff; - for (index = 0; index < MAX_INTR; index ++) + rt_memset(irq_handle_table, 0x00, sizeof(irq_handle_table)); + for (idx = 0; idx < MAX_INTR; idx ++) { - irq_handle_table[index] = (rt_isr_handler_t)rt_hw_interrupt_handler; + irq_handle_table[idx].handler = rt_hw_interrupt_handler; } /* init interrupt nest, and context in thread sp */ @@ -92,20 +95,32 @@ void rt_hw_interrupt_umask(int vector) * @param new_handler the interrupt service routine to be installed * @param old_handler the old interrupt service routine */ -void rt_hw_interrupt_install(int vector, rt_isr_handler_t new_handler, rt_isr_handler_t *old_handler) +rt_isr_handler_t rt_hw_interrupt_install(int vector, rt_isr_handler_t handler, + void *param, char *name) { + rt_isr_handler_t old_handler = RT_NULL; + if (vector >= 0 && vector < MAX_INTR) { - if (old_handler != RT_NULL) - *old_handler = irq_handle_table[vector]; - if (new_handler != RT_NULL) - irq_handle_table[vector] = (rt_isr_handler_t)new_handler; - } + old_handler = irq_handle_table[vector].handler; + + if (handler != RT_NULL) + { +#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; + } + } + + return old_handler; } void rt_interrupt_dispatch(void *ptreg) { - int i; + int irq; + void *param; rt_isr_handler_t irq_func; static rt_uint32_t status = 0; rt_uint32_t c0_status; @@ -134,18 +149,24 @@ void rt_interrupt_dispatch(void *ptreg) if (!status) return; - for (i = MAX_INTR; i > 0; --i) + for (irq = MAX_INTR; irq > 0; --irq) { - if ((status & (1<int_clr |= (1 << i); + ls1b_hw0_icregs->int_clr |= (1 << irq); } } } -- cgit v1.3.1