chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update loongson 1B dev: Modify the interrupt interface implementations.

This commit is contained in:
aozima 2013-03-23 20:00:51 +08:00
parent 93e04a1366
commit 83ce430902
3 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp/ls1bdev/drivers/uart.c
View File

@ -37,7 +37,7 @@ struct rt_uart_ls1b
rt_uint8_t rx_buffer[RT_UART_RX_BUFFER_SIZE]; rt_uint8_t rx_buffer[RT_UART_RX_BUFFER_SIZE];
}uart_device; }uart_device;
static void rt_uart_irqhandler(int irqno) static void rt_uart_irqhandler(int irqno, void *param)
{ {
rt_ubase_t level; rt_ubase_t level;
rt_uint8_t isr; 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; UART_IER(uart->hw_base) |= UARTIER_IRXE;
/* install interrupt */ /* 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); rt_hw_interrupt_umask(uart->irq);
} }
return RT_EOK; return RT_EOK;

2
bsp/ls1bdev/rtconfig.h
View File

@ -21,6 +21,8 @@
// #define RT_THREAD_DEBUG // #define RT_THREAD_DEBUG
// <bool name="RT_USING_OVERFLOW_CHECK" description="Thread stack over flow detect" default="true" /> // <bool name="RT_USING_OVERFLOW_CHECK" description="Thread stack over flow detect" default="true" />
#define RT_USING_OVERFLOW_CHECK #define RT_USING_OVERFLOW_CHECK
// <bool name="RT_USING_INTERRUPT_INFO" description="Show more interrupt description" default="true" />
#define RT_USING_INTERRUPT_INFO
// </section> // </section>
// <bool name="RT_USING_HOOK" description="Using hook functions" default="true" /> // <bool name="RT_USING_HOOK" description="Using hook functions" default="true" />

55
libcpu/mips/loongson_1b/interrupt.c
View File

@ -11,9 +11,11 @@
* Date Author Notes * Date Author Notes
* 2010-10-15 Bernard first version * 2010-10-15 Bernard first version
* 2010-10-15 lgnq modified for LS1B * 2010-10-15 lgnq modified for LS1B
* 2013-03-29 aozima Modify the interrupt interface implementations.
*/ */
#include <rtthread.h> #include <rtthread.h>
#include <rthw.h>
#include "ls1b.h" #include "ls1b.h"
#define MAX_INTR 32 #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_interrupt_to_thread;
rt_uint32_t rt_thread_switch_interrupt_flag; 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_interrupt_dispatch(void *ptreg);
void rt_hw_timer_handler(); 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); 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) void rt_hw_interrupt_init(void)
{ {
rt_int32_t index; rt_int32_t idx;
/* pci active low */ /* pci active low */
ls1b_hw0_icregs->int_pol = -1; //must be done here 20110802 lgnq 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 */ /* mask all interrupts */
(ls1b_hw0_icregs+0)->int_clr = 0xffffffff; (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 */ /* 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 new_handler the interrupt service routine to be installed
* @param old_handler the old interrupt service routine * @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 (vector >= 0 && vector < MAX_INTR)
{ {
if (old_handler != RT_NULL) old_handler = irq_handle_table[vector].handler;
*old_handler = irq_handle_table[vector];
if (new_handler != RT_NULL) if (handler != RT_NULL)
irq_handle_table[vector] = (rt_isr_handler_t)new_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;
} }
}
return old_handler;
} }
void rt_interrupt_dispatch(void *ptreg) void rt_interrupt_dispatch(void *ptreg)
{ {
int i; int irq;
void *param;
rt_isr_handler_t irq_func; rt_isr_handler_t irq_func;
static rt_uint32_t status = 0; static rt_uint32_t status = 0;
rt_uint32_t c0_status; rt_uint32_t c0_status;
@ -134,18 +149,24 @@ void rt_interrupt_dispatch(void *ptreg)
if (!status) if (!status)
return; return;
for (i = MAX_INTR; i > 0; --i) for (irq = MAX_INTR; irq > 0; --irq)
{ {
if ((status & (1<<i))) if ((status & (1 << irq)))
{ {
status &= ~(1<<i); status &= ~(1 << irq);
irq_func = irq_handle_table[i];
irq_func = irq_handle_table[irq].handler;
param = irq_handle_table[irq].param;
/* do interrupt */ /* do interrupt */
(*irq_func)(i); (*irq_func)(irq, param);
#ifdef RT_USING_INTERRUPT_INFO
irq_handle_table[irq].counter++;
#endif /* RT_USING_INTERRUPT_INFO */
/* ack interrupt */ /* ack interrupt */
ls1b_hw0_icregs->int_clr |= (1 << i); ls1b_hw0_icregs->int_clr |= (1 << irq);
} }
} }
} }