Merge pull request #56 from aozima/aozima
Modify the interrupt interface implementations.
This commit is contained in:
commit
c1b600644f
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
/*
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
* This is the timer interrupt service routine.
|
||||
* @param vector the irq number for timer
|
||||
*/
|
||||
void rt_hw_timer_handler(int vector)
|
||||
void rt_hw_timer_handler(int vector, void *param)
|
||||
{
|
||||
rt_tick_increase();
|
||||
|
||||
|
@ -82,7 +82,7 @@ void rt_hw_console_init()
|
|||
/**
|
||||
* This function will initial sam7x256 board.
|
||||
*/
|
||||
void rt_hw_board_init()
|
||||
void rt_hw_board_init(void)
|
||||
{
|
||||
/* console init */
|
||||
rt_hw_console_init();
|
||||
|
@ -99,7 +99,7 @@ void rt_hw_board_init()
|
|||
T0TCR = 1;
|
||||
|
||||
/* install timer handler */
|
||||
rt_hw_interrupt_install(TIMER0_INT, rt_hw_timer_handler, RT_NULL);
|
||||
rt_hw_interrupt_install(TIMER0_INT, rt_hw_timer_handler, RT_NULL, "TIMER0");
|
||||
rt_hw_interrupt_umask(TIMER0_INT);
|
||||
}
|
||||
|
||||
|
|
|
@ -113,7 +113,7 @@ void rt_hw_uart_isr(struct rt_lpcserial* lpc_serial)
|
|||
}
|
||||
|
||||
#ifdef RT_USING_UART1
|
||||
void rt_hw_uart_isr_1(int irqno)
|
||||
void rt_hw_uart_isr_1(int irqno, void *param)
|
||||
{
|
||||
/* get lpc serial device */
|
||||
rt_hw_uart_isr(&serial1);
|
||||
|
@ -121,7 +121,7 @@ void rt_hw_uart_isr_1(int irqno)
|
|||
#endif
|
||||
|
||||
#ifdef RT_USING_UART2
|
||||
void rt_hw_uart_isr_2(int irqno)
|
||||
void rt_hw_uart_isr_2(int irqno, void *param)
|
||||
{
|
||||
/* get lpc serial device */
|
||||
rt_hw_uart_isr(&serial2);
|
||||
|
@ -153,13 +153,15 @@ static rt_err_t rt_serial_open(rt_device_t dev, rt_uint16_t oflag)
|
|||
if (lpc_serial->irqno == UART0_INT)
|
||||
{
|
||||
#ifdef RT_USING_UART1
|
||||
rt_hw_interrupt_install(lpc_serial->irqno, rt_hw_uart_isr_1, RT_NULL);
|
||||
rt_hw_interrupt_install(lpc_serial->irqno,
|
||||
rt_hw_uart_isr_1, &serial1, "UART1");
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef RT_USING_UART2
|
||||
rt_hw_interrupt_install(lpc_serial->irqno, rt_hw_uart_isr_2, RT_NULL);
|
||||
rt_hw_interrupt_install(lpc_serial->irqno,
|
||||
rt_hw_uart_isr_2, &serial2, "UART2");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -322,7 +324,7 @@ void rt_hw_serial_init(void)
|
|||
lpc_serial->read_index = lpc_serial->save_index = 0;
|
||||
|
||||
/* Enable UART0 RxD and TxD pins */
|
||||
PINSEL0 |= 0x05;
|
||||
PINSEL0 |= 0x05;
|
||||
|
||||
/* 8 bits, no Parity, 1 Stop bit */
|
||||
UART_LCR(lpc_serial->hw_base) = 0x83;
|
||||
|
@ -334,6 +336,7 @@ void rt_hw_serial_init(void)
|
|||
/* DLAB = 0 */
|
||||
UART_LCR(lpc_serial->hw_base) = 0x03;
|
||||
|
||||
lpc_serial->parent.type = RT_Device_Class_Char;
|
||||
lpc_serial->parent.init = rt_serial_init;
|
||||
lpc_serial->parent.open = rt_serial_open;
|
||||
lpc_serial->parent.close = rt_serial_close;
|
||||
|
@ -371,6 +374,7 @@ void rt_hw_serial_init(void)
|
|||
/* DLAB = 0 */
|
||||
UART_LCR(lpc_serial->hw_base) = 0x03;
|
||||
|
||||
lpc_serial->parent.type = RT_Device_Class_Char;
|
||||
lpc_serial->parent.init = rt_serial_init;
|
||||
lpc_serial->parent.open = rt_serial_open;
|
||||
lpc_serial->parent.close = rt_serial_close;
|
||||
|
|
|
@ -37,7 +37,7 @@ void rt_timer_handler(int vector, void* param)
|
|||
/**
|
||||
* This function will init LPC2478 board
|
||||
*/
|
||||
void rt_hw_board_init()
|
||||
void rt_hw_board_init(void)
|
||||
{
|
||||
#if defined(RT_USING_DEVICE) && defined(RT_USING_UART1)
|
||||
rt_hw_serial_init();
|
||||
|
|
|
@ -64,9 +64,10 @@ void rt_hw_serial_init(void);
|
|||
|
||||
#define U0PINS 0x00000005
|
||||
|
||||
void rt_hw_uart_isr(struct rt_lpcserial* lpc_serial)
|
||||
void rt_hw_uart_isr(int irqno, void *param)
|
||||
{
|
||||
UNUSED rt_uint32_t iir;
|
||||
struct rt_lpcserial* lpc_serial = (struct rt_lpcserial*)param;
|
||||
|
||||
RT_ASSERT(lpc_serial != RT_NULL)
|
||||
|
||||
|
@ -112,21 +113,6 @@ void rt_hw_uart_isr(struct rt_lpcserial* lpc_serial)
|
|||
VICVectAddr = 0;
|
||||
}
|
||||
|
||||
#ifdef RT_USING_UART1
|
||||
void rt_hw_uart_isr_1(int irqno, void* param)
|
||||
{
|
||||
/* get lpc serial device */
|
||||
rt_hw_uart_isr(&serial1);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef RT_USING_UART2
|
||||
void rt_hw_uart_isr_2(int irqno, void* param)
|
||||
{
|
||||
/* get lpc serial device */
|
||||
rt_hw_uart_isr(&serial2);
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @addtogroup LPC214x
|
||||
|
@ -150,19 +136,8 @@ static rt_err_t rt_serial_open(rt_device_t dev, rt_uint16_t oflag)
|
|||
UART_IER(lpc_serial->hw_base) = 0x01;
|
||||
|
||||
/* install ISR */
|
||||
if (lpc_serial->irqno == UART0_INT)
|
||||
{
|
||||
#ifdef RT_USING_UART1
|
||||
rt_hw_interrupt_install(lpc_serial->irqno, rt_hw_uart_isr_1, RT_NULL, "uart1");
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef RT_USING_UART2
|
||||
rt_hw_interrupt_install(lpc_serial->irqno, rt_hw_uart_isr_2, RT_NULL, "uart2");
|
||||
#endif
|
||||
}
|
||||
|
||||
rt_hw_interrupt_install(lpc_serial->irqno,
|
||||
rt_hw_uart_isr, lpc_serial, RT_NULL);
|
||||
rt_hw_interrupt_umask(lpc_serial->irqno);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
// #define RT_THREAD_DEBUG
|
||||
// <bool name="RT_USING_OVERFLOW_CHECK" description="Thread stack over flow detect" default="true" />
|
||||
#define RT_USING_OVERFLOW_CHECK
|
||||
// <bool name="RT_USING_INTERRUPT_INFO" description="Show more interrupt description" default="true" />
|
||||
#define RT_USING_INTERRUPT_INFO
|
||||
// </section>
|
||||
|
||||
// <bool name="RT_USING_HOOK" description="Using hook functions" default="true" />
|
||||
|
|
|
@ -58,7 +58,7 @@ struct rt_device uart2_device;
|
|||
/**
|
||||
* This function will handle rtos timer
|
||||
*/
|
||||
static void rt_timer_handler(int vector)
|
||||
static void rt_timer_handler(int vector, void *param)
|
||||
{
|
||||
rt_tick_increase();
|
||||
}
|
||||
|
@ -66,7 +66,7 @@ static void rt_timer_handler(int vector)
|
|||
/**
|
||||
* This function will handle serial
|
||||
*/
|
||||
static void rt_serial0_handler(int vector)
|
||||
static void rt_serial0_handler(int vector, void *param)
|
||||
{
|
||||
INTSUBMSK |= (BIT_SUB_RXD0);
|
||||
|
||||
|
@ -81,7 +81,7 @@ static void rt_serial0_handler(int vector)
|
|||
/**
|
||||
* This function will handle serial
|
||||
*/
|
||||
static void rt_serial2_handler(int vector)
|
||||
static void rt_serial2_handler(int vector, void *param)
|
||||
{
|
||||
INTSUBMSK |= (BIT_SUB_RXD2);
|
||||
|
||||
|
@ -142,17 +142,17 @@ static void rt_hw_uart_init(void)
|
|||
/* install uart2 isr */
|
||||
INTSUBMSK &= ~(BIT_SUB_RXD2);
|
||||
|
||||
rt_hw_interrupt_install(INTUART0, rt_serial0_handler, RT_NULL);
|
||||
rt_hw_interrupt_install(INTUART0, rt_serial0_handler, RT_NULL, "UART0");
|
||||
rt_hw_interrupt_umask(INTUART0);
|
||||
|
||||
rt_hw_interrupt_install(INTUART2, rt_serial2_handler, RT_NULL);
|
||||
rt_hw_interrupt_install(INTUART2, rt_serial2_handler, RT_NULL, "UART2");
|
||||
rt_hw_interrupt_umask(INTUART2);
|
||||
}
|
||||
|
||||
/**
|
||||
* This function will init timer4 for system ticks
|
||||
*/
|
||||
static void rt_hw_timer_init()
|
||||
static void rt_hw_timer_init(void)
|
||||
{
|
||||
/* timer4, pre = 15+1 */
|
||||
TCFG0 &= 0xffff00ff;
|
||||
|
@ -165,7 +165,7 @@ static void rt_hw_timer_init()
|
|||
/* manual update */
|
||||
TCON = TCON & (~(0x0f<<20)) | (0x02<<20);
|
||||
/* install interrupt handler */
|
||||
rt_hw_interrupt_install(INTTIMER4, rt_timer_handler, RT_NULL);
|
||||
rt_hw_interrupt_install(INTTIMER4, rt_timer_handler, RT_NULL, "tick");
|
||||
rt_hw_interrupt_umask(INTTIMER4);
|
||||
|
||||
/* start timer4, reload */
|
||||
|
@ -175,7 +175,7 @@ static void rt_hw_timer_init()
|
|||
/**
|
||||
* This function will init s3ceb2410 board
|
||||
*/
|
||||
void rt_hw_board_init()
|
||||
void rt_hw_board_init(void)
|
||||
{
|
||||
/* initialize the system clock */
|
||||
rt_hw_clock_init();
|
||||
|
|
|
@ -572,7 +572,7 @@ __error_retry:
|
|||
#define B4_Tacp 0x0
|
||||
#define B4_PMC 0x0
|
||||
|
||||
void INTEINT4_7_handler(int irqno)
|
||||
void INTEINT4_7_handler(int irqno, void *param)
|
||||
{
|
||||
rt_uint32_t eint_pend;
|
||||
|
||||
|
@ -637,7 +637,7 @@ void rt_hw_dm9000_init()
|
|||
eth_device_init(&(dm9000_device.parent), "e0");
|
||||
|
||||
/* instal interrupt */
|
||||
rt_hw_interrupt_install(INTEINT4_7, INTEINT4_7_handler, RT_NULL);
|
||||
rt_hw_interrupt_install(INTEINT4_7, INTEINT4_7_handler, RT_NULL, "EINT4_7");
|
||||
rt_hw_interrupt_umask(INTEINT4_7);
|
||||
}
|
||||
|
||||
|
|
|
@ -22,6 +22,8 @@
|
|||
// #define RT_THREAD_DEBUG
|
||||
// <bool name="RT_USING_OVERFLOW_CHECK" description="Thread stack over flow detect" default="true" />
|
||||
#define RT_USING_OVERFLOW_CHECK
|
||||
// <bool name="RT_USING_INTERRUPT_INFO" description="Show more interrupt description" default="true" />
|
||||
#define RT_USING_INTERRUPT_INFO
|
||||
// </section>
|
||||
|
||||
// <bool name="RT_USING_HOOK" description="Using hook functions" default="true" />
|
||||
|
|
|
@ -34,7 +34,7 @@ struct serial_device uart0 =
|
|||
/**
|
||||
* This function will handle rtos timer
|
||||
*/
|
||||
void rt_timer_handler(int vector)
|
||||
void rt_timer_handler(int vector, void *param)
|
||||
{
|
||||
rt_uint32_t clear_int;
|
||||
rt_tick_increase();
|
||||
|
@ -47,7 +47,7 @@ void rt_timer_handler(int vector)
|
|||
/**
|
||||
* This function will handle serial
|
||||
*/
|
||||
void rt_serial_handler(int vector)
|
||||
void rt_serial_handler(int vector, void *param)
|
||||
{
|
||||
//rt_kprintf("in rt_serial_handler\n");
|
||||
rt_int32_t stat = *(RP)UART0_IIR ;
|
||||
|
@ -78,16 +78,17 @@ static void rt_hw_board_led_init(void)
|
|||
|
||||
*(RP)GPIO_PORTE_DATA &= ~0x38; /* low */
|
||||
}
|
||||
|
||||
/**
|
||||
* This function will init timer4 for system ticks
|
||||
*/
|
||||
void rt_hw_timer_init(void)
|
||||
void rt_hw_timer_init(void)
|
||||
{
|
||||
/*Set timer1*/
|
||||
*(RP)TIMER_T1LCR = 880000;
|
||||
*(RP)TIMER_T1CR = 0x06;
|
||||
|
||||
rt_hw_interrupt_install(INTSRC_TIMER1, rt_timer_handler, RT_NULL);
|
||||
rt_hw_interrupt_install(INTSRC_TIMER1, rt_timer_handler, RT_NULL, "tick");
|
||||
rt_hw_interrupt_umask(INTSRC_TIMER1);
|
||||
|
||||
/*Enable timer1*/
|
||||
|
@ -119,7 +120,7 @@ void rt_hw_uart_init(void)
|
|||
/*Disable tx interrupt*/
|
||||
*(RP)(UART0_IER) &= ~(0x1<<1);
|
||||
|
||||
rt_hw_interrupt_install(INTSRC_UART0, rt_serial_handler, RT_NULL);
|
||||
rt_hw_interrupt_install(INTSRC_UART0, rt_serial_handler, RT_NULL, "UART0");
|
||||
rt_hw_interrupt_umask(INTSRC_UART0);
|
||||
/* register uart0 */
|
||||
rt_hw_serial_register(&uart0_device, "uart0",
|
||||
|
|
|
@ -81,7 +81,7 @@ struct rt_dm9161_eth
|
|||
static struct rt_dm9161_eth dm9161_device;
|
||||
static struct rt_semaphore sem_ack, sem_lock;
|
||||
|
||||
void rt_dm9161_isr(int irqno);
|
||||
void rt_dm9161_isr(int irqno, void *param);
|
||||
|
||||
static void udelay(unsigned long ns)
|
||||
{
|
||||
|
@ -201,7 +201,7 @@ static void read_phy(unsigned char phy_addr, unsigned char address, unsigned int
|
|||
}
|
||||
|
||||
/* interrupt service routine */
|
||||
void rt_dm9161_isr(int irqno)
|
||||
void rt_dm9161_isr(int irqno, void *param)
|
||||
{
|
||||
unsigned long intstatus;
|
||||
rt_uint32_t address;
|
||||
|
@ -469,7 +469,7 @@ static rt_err_t rt_dm9161_open(rt_device_t dev, rt_uint16_t oflag)
|
|||
*(volatile unsigned long*)GPIO_PORTA_INTRCLR |= 0x0080; //清除中断
|
||||
*(volatile unsigned long*)GPIO_PORTA_INTRCLR = 0x0000; //清除中断
|
||||
|
||||
rt_hw_interrupt_install(INTSRC_MAC, rt_dm9161_isr, RT_NULL);
|
||||
rt_hw_interrupt_install(INTSRC_MAC, rt_dm9161_isr, RT_NULL, "EMAC");
|
||||
enable_irq(INTSRC_EXINT7);
|
||||
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
/* #define RT_THREAD_DEBUG */
|
||||
|
||||
#define RT_USING_OVERFLOW_CHECK
|
||||
#define RT_USING_INTERRUPT_INFO
|
||||
|
||||
/* Using Hook */
|
||||
#define RT_USING_HOOK
|
||||
|
|
|
@ -31,14 +31,14 @@ Options 1,0,0 // Target 'RT-Thread_Mini4020'
|
|||
EnvReg ()
|
||||
OrgReg ()
|
||||
TgStat=16
|
||||
OutDir (.\)
|
||||
OutDir (.\build\)
|
||||
OutName (rtthread-mini4020)
|
||||
GenApp=1
|
||||
GenLib=0
|
||||
GenHex=0
|
||||
Debug=1
|
||||
Browse=0
|
||||
LstDir (.\)
|
||||
LstDir (.\build\)
|
||||
HexSel=1
|
||||
MG32K=0
|
||||
TGMORE=0
|
||||
|
|
|
@ -154,7 +154,7 @@ static void rt_hw_console_init()
|
|||
/**
|
||||
* This function will initial sam7x board.
|
||||
*/
|
||||
void rt_hw_board_init()
|
||||
void rt_hw_board_init(void)
|
||||
{
|
||||
extern void rt_serial_init(void);
|
||||
|
||||
|
|
|
@ -10,8 +10,10 @@
|
|||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2006-08-23 Bernard first version
|
||||
* 2013-03-29 aozima Modify the interrupt interface implementations.
|
||||
*/
|
||||
|
||||
#include <rtthread.h>
|
||||
#include <rthw.h>
|
||||
#include "AT91SAM7X256.h"
|
||||
|
||||
|
@ -30,7 +32,7 @@ rt_uint32_t rt_thread_switch_interrupt_flag;
|
|||
*/
|
||||
/*@{*/
|
||||
|
||||
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);
|
||||
}
|
||||
|
@ -38,7 +40,7 @@ void rt_hw_interrupt_handler(int vector)
|
|||
/**
|
||||
* This function will initialize hardware interrupt
|
||||
*/
|
||||
void rt_hw_interrupt_init()
|
||||
void rt_hw_interrupt_init(void)
|
||||
{
|
||||
rt_base_t index;
|
||||
|
||||
|
@ -96,7 +98,6 @@ 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_HANDLERS)
|
||||
{
|
||||
old_handler = irq_desc[vector].handler;
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
*/
|
||||
/*@{*/
|
||||
|
||||
void rt_hw_trap_irq()
|
||||
void rt_hw_trap_irq(void)
|
||||
{
|
||||
int irqno;
|
||||
extern struct rt_irq_desc irq_desc[];
|
||||
|
@ -37,13 +37,13 @@ void rt_hw_trap_irq()
|
|||
AT91C_BASE_AIC->AIC_EOICR = 0;
|
||||
}
|
||||
|
||||
void rt_hw_trap_fiq()
|
||||
void rt_hw_trap_fiq(void)
|
||||
{
|
||||
rt_kprintf("fast interrupt request\n");
|
||||
}
|
||||
|
||||
extern struct rt_thread* rt_current_thread;
|
||||
void rt_hw_trap_abort()
|
||||
void rt_hw_trap_abort(void)
|
||||
{
|
||||
rt_kprintf("Abort occured!!! Thread [%s] suspended.\n",rt_current_thread->name);
|
||||
rt_thread_suspend(rt_current_thread);
|
||||
|
|
|
@ -10,9 +10,11 @@
|
|||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2011-06-15 aozima the first version for lpc214x
|
||||
* 2013-03-29 aozima Modify the interrupt interface implementations.
|
||||
*/
|
||||
|
||||
#include <rtthread.h>
|
||||
#include <rthw.h>
|
||||
#include "lpc214x.h"
|
||||
|
||||
#define MAX_HANDLERS 32
|
||||
|
@ -20,6 +22,9 @@
|
|||
|
||||
extern rt_uint32_t rt_interrupt_nest;
|
||||
|
||||
/* exception and interrupt handler table */
|
||||
struct rt_irq_desc irq_desc[MAX_HANDLERS];
|
||||
|
||||
/**
|
||||
* @addtogroup LPC214x
|
||||
*/
|
||||
|
@ -71,7 +76,7 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter,
|
|||
rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
|
||||
rt_uint32_t rt_thread_switch_interrupt_flag;
|
||||
|
||||
void rt_hw_interrupt_handler(int vector)
|
||||
void rt_hw_interrupt_handler(int vector, void *param)
|
||||
{
|
||||
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
|
||||
}
|
||||
|
@ -79,7 +84,7 @@ void rt_hw_interrupt_handler(int vector)
|
|||
/**
|
||||
* This function will initialize hardware interrupt
|
||||
*/
|
||||
void rt_hw_interrupt_init()
|
||||
void rt_hw_interrupt_init(void)
|
||||
{
|
||||
rt_base_t index;
|
||||
rt_uint32_t *vect_addr, *vect_ctl;
|
||||
|
@ -90,12 +95,15 @@ void rt_hw_interrupt_init()
|
|||
/* set all to IRQ */
|
||||
VICIntSelect = 0;
|
||||
|
||||
rt_memset(irq_desc, 0x00, sizeof(irq_desc));
|
||||
for (index = 0; index < MAX_HANDLERS; index ++)
|
||||
{
|
||||
irq_desc[index].handler = rt_hw_interrupt_handler;
|
||||
|
||||
vect_addr = (rt_uint32_t *)(VIC_BASE_ADDR + 0x100 + (index << 2));
|
||||
vect_ctl = (rt_uint32_t *)(VIC_BASE_ADDR + 0x200 + (index << 2));
|
||||
|
||||
*vect_addr = (rt_uint32_t)rt_hw_interrupt_handler;
|
||||
*vect_addr = (rt_uint32_t)&irq_desc[index];
|
||||
*vect_ctl = 0xF;
|
||||
}
|
||||
|
||||
|
@ -127,30 +135,39 @@ void rt_hw_interrupt_umask(int vector)
|
|||
/**
|
||||
* This function will install a interrupt service routine to a interrupt.
|
||||
* @param vector the interrupt number
|
||||
* @param new_handler the interrupt service routine to be installed
|
||||
* @param old_handler the old interrupt service routine
|
||||
* @param handler the interrupt service routine to be installed
|
||||
* @param param the interrupt service function parameter
|
||||
* @param name the interrupt name
|
||||
* @return old handler
|
||||
*/
|
||||
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_HANDLERS)
|
||||
{
|
||||
/* get VIC address */
|
||||
rt_uint32_t* vect_addr = (rt_uint32_t *)(VIC_BASE_ADDR + 0x100 + (vector << 2));
|
||||
rt_uint32_t* vect_ctl = (rt_uint32_t *)(VIC_BASE_ADDR + 0x200 + (vector << 2));
|
||||
rt_isr_handler_t old_handler = RT_NULL;
|
||||
|
||||
/* assign IRQ slot and enable this slot */
|
||||
*vect_ctl = 0x20 | (vector & 0x1F);
|
||||
if(vector >= 0 && vector < MAX_HANDLERS)
|
||||
{
|
||||
rt_uint32_t* vect_ctl = (rt_uint32_t *)(VIC_BASE_ADDR + 0x200 + (vector << 2));
|
||||
|
||||
if (old_handler != RT_NULL) *old_handler = (rt_isr_handler_t) *vect_addr;
|
||||
if (new_handler != RT_NULL) *vect_addr = (rt_uint32_t) new_handler;
|
||||
}
|
||||
/* assign IRQ slot and enable this slot */
|
||||
*vect_ctl = 0x20 | (vector & 0x1F);
|
||||
|
||||
old_handler = irq_desc[vector].handler;
|
||||
if (handler != RT_NULL)
|
||||
{
|
||||
irq_desc[vector].handler = handler;
|
||||
irq_desc[vector].param = param;
|
||||
}
|
||||
}
|
||||
|
||||
return old_handler;
|
||||
}
|
||||
|
||||
/**
|
||||
* this function will reset CPU
|
||||
*
|
||||
*/
|
||||
void rt_hw_cpu_reset()
|
||||
void rt_hw_cpu_reset(void)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -165,18 +182,23 @@ void rt_hw_cpu_shutdown()
|
|||
while (1);
|
||||
}
|
||||
|
||||
void rt_hw_trap_irq()
|
||||
void rt_hw_trap_irq(void)
|
||||
{
|
||||
rt_isr_handler_t isr_func;
|
||||
int irqno;
|
||||
struct rt_irq_desc* irq;
|
||||
extern struct rt_irq_desc irq_desc[];
|
||||
|
||||
isr_func = (rt_isr_handler_t) VICVectAddr;
|
||||
isr_func(0);
|
||||
irq = (struct rt_irq_desc*) VICVectAddr;
|
||||
irqno = ((rt_uint32_t) irq - (rt_uint32_t) &irq_desc[0])/sizeof(struct rt_irq_desc);
|
||||
|
||||
/* acknowledge Interrupt */
|
||||
// VICVectAddr = 0;
|
||||
/* invoke isr */
|
||||
irq->handler(irqno, irq->param);
|
||||
|
||||
/* acknowledge Interrupt */
|
||||
// VICVectAddr = 0;
|
||||
}
|
||||
|
||||
void rt_hw_trap_fiq()
|
||||
void rt_hw_trap_fiq(void)
|
||||
{
|
||||
rt_kprintf("fast interrupt request\n");
|
||||
}
|
||||
|
|
|
@ -10,8 +10,10 @@
|
|||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2008-12-11 XuXinming first version
|
||||
* 2013-03-29 aozima Modify the interrupt interface implementations.
|
||||
*/
|
||||
|
||||
#include <rtthread.h>
|
||||
#include <rthw.h>
|
||||
#include "LPC24xx.h"
|
||||
|
||||
|
@ -35,7 +37,7 @@ void rt_hw_interrupt_handler(int vector, void *param)
|
|||
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
|
||||
}
|
||||
|
||||
void rt_hw_interrupt_init()
|
||||
void rt_hw_interrupt_init(void)
|
||||
{
|
||||
register int i;
|
||||
|
||||
|
@ -47,10 +49,10 @@ void rt_hw_interrupt_init()
|
|||
VICIntSelect = 0;
|
||||
|
||||
/* init exceptions table */
|
||||
rt_memset(irq_desc, 0x00, sizeof(irq_desc));
|
||||
for(i=0; i < MAX_HANDLERS; i++)
|
||||
{
|
||||
irq_desc[i].handler = (rt_isr_handler_t)rt_hw_interrupt_handler;
|
||||
irq_desc[i].param = RT_NULL;
|
||||
irq_desc[i].handler = rt_hw_interrupt_handler;
|
||||
|
||||
vect_addr = (rt_uint32_t *)(VIC_BASE_ADDR + 0x100 + i*4);
|
||||
vect_cntl = (rt_uint32_t *)(VIC_BASE_ADDR + 0x200 + i*4);
|
||||
|
@ -94,7 +96,7 @@ rt_isr_handler_t rt_hw_interrupt_install(int vector, rt_isr_handler_t handler,
|
|||
old_handler = irq_desc[vector].handler;
|
||||
if (handler != RT_NULL)
|
||||
{
|
||||
irq_desc[vector].handler = (rt_isr_handler_t)handler;
|
||||
irq_desc[vector].handler = handler;
|
||||
irq_desc[vector].param = param;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -126,7 +126,7 @@ void rt_hw_trap_resv(struct rt_hw_register *regs)
|
|||
}
|
||||
|
||||
extern rt_isr_handler_t isr_table[];
|
||||
void rt_hw_trap_irq()
|
||||
void rt_hw_trap_irq(void)
|
||||
{
|
||||
int irqno;
|
||||
struct rt_irq_desc* irq;
|
||||
|
@ -139,7 +139,7 @@ void rt_hw_trap_irq()
|
|||
irq->handler(irqno, irq->param);
|
||||
}
|
||||
|
||||
void rt_hw_trap_fiq()
|
||||
void rt_hw_trap_fiq(void)
|
||||
{
|
||||
rt_kprintf("fast interrupt request\n");
|
||||
}
|
||||
|
|
|
@ -10,9 +10,11 @@
|
|||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2006-03-13 Bernard first version
|
||||
* 2013-03-29 aozima Modify the interrupt interface implementations.
|
||||
*/
|
||||
|
||||
#include <rtthread.h>
|
||||
#include <rthw.h>
|
||||
#include "s3c24x0.h"
|
||||
|
||||
#define MAX_HANDLERS 32
|
||||
|
@ -20,7 +22,7 @@
|
|||
extern rt_uint32_t rt_interrupt_nest;
|
||||
|
||||
/* exception and interrupt handler table */
|
||||
rt_isr_handler_t isr_table[MAX_HANDLERS];
|
||||
struct rt_irq_desc isr_table[MAX_HANDLERS];
|
||||
rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
|
||||
rt_uint32_t rt_thread_switch_interrupt_flag;
|
||||
|
||||
|
@ -29,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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -40,37 +41,38 @@ rt_isr_handler_t rt_hw_interrupt_handle(rt_uint32_t vector)
|
|||
*/
|
||||
void rt_hw_interrupt_init(void)
|
||||
{
|
||||
register rt_uint32_t idx;
|
||||
register rt_uint32_t idx;
|
||||
|
||||
/* all clear source pending */
|
||||
SRCPND = 0x0;
|
||||
/* all clear source pending */
|
||||
SRCPND = 0x0;
|
||||
|
||||
/* all clear sub source pending */
|
||||
SUBSRCPND = 0x0;
|
||||
/* all clear sub source pending */
|
||||
SUBSRCPND = 0x0;
|
||||
|
||||
/* all=IRQ mode */
|
||||
INTMOD = 0x0;
|
||||
/* all=IRQ mode */
|
||||
INTMOD = 0x0;
|
||||
|
||||
/* all interrupt disabled include global bit */
|
||||
INTMSK = BIT_ALLMSK;
|
||||
/* all interrupt disabled include global bit */
|
||||
INTMSK = BIT_ALLMSK;
|
||||
|
||||
/* all sub interrupt disable */
|
||||
INTSUBMSK = BIT_SUB_ALLMSK;
|
||||
/* all sub interrupt disable */
|
||||
INTSUBMSK = BIT_SUB_ALLMSK;
|
||||
|
||||
/* all clear interrupt pending */
|
||||
INTPND = BIT_ALLMSK;
|
||||
/* all clear interrupt pending */
|
||||
INTPND = BIT_ALLMSK;
|
||||
|
||||
/* init exceptions table */
|
||||
for(idx=0; idx < MAX_HANDLERS; idx++)
|
||||
{
|
||||
isr_table[idx] = (rt_isr_handler_t)rt_hw_interrupt_handle;
|
||||
}
|
||||
/* init exceptions table */
|
||||
rt_memset(isr_table, 0x00, sizeof(isr_table));
|
||||
for(idx=0; idx < MAX_HANDLERS; idx++)
|
||||
{
|
||||
isr_table[idx].handler = rt_hw_interrupt_handle;
|
||||
}
|
||||
|
||||
/* init interrupt nest, and context in thread sp */
|
||||
rt_interrupt_nest = 0;
|
||||
rt_interrupt_from_thread = 0;
|
||||
rt_interrupt_to_thread = 0;
|
||||
rt_thread_switch_interrupt_flag = 0;
|
||||
/* init interrupt nest, and context in thread sp */
|
||||
rt_interrupt_nest = 0;
|
||||
rt_interrupt_from_thread = 0;
|
||||
rt_interrupt_to_thread = 0;
|
||||
rt_thread_switch_interrupt_flag = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -105,13 +107,26 @@ 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 < MAX_HANDLERS)
|
||||
{
|
||||
if (old_handler != RT_NULL) *old_handler = isr_table[vector];
|
||||
if (new_handler != RT_NULL) isr_table[vector] = new_handler;
|
||||
}
|
||||
rt_isr_handler_t old_handler = RT_NULL;
|
||||
|
||||
if(vector < MAX_HANDLERS)
|
||||
{
|
||||
old_handler = isr_table[vector].handler;
|
||||
|
||||
if (handler != RT_NULL)
|
||||
{
|
||||
#ifdef RT_USING_INTERRUPT_INFO
|
||||
rt_strncpy(isr_table[vector].name, name, RT_NAME_MAX);
|
||||
#endif /* RT_USING_INTERRUPT_INFO */
|
||||
isr_table[vector].handler = handler;
|
||||
isr_table[vector].param = param;
|
||||
}
|
||||
}
|
||||
|
||||
return old_handler;
|
||||
}
|
||||
|
||||
/*@}*/
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
* 2006-03-13 Bernard first version
|
||||
* 2006-05-27 Bernard add skyeye support
|
||||
* 2007-11-19 Yi.Qiu fix rt_hw_trap_irq function
|
||||
* 2013-03-29 aozima Modify the interrupt interface implementations.
|
||||
*/
|
||||
|
||||
#include <rtthread.h>
|
||||
|
@ -140,29 +141,35 @@ void rt_hw_trap_resv(struct rt_hw_register *regs)
|
|||
rt_hw_cpu_shutdown();
|
||||
}
|
||||
|
||||
extern rt_isr_handler_t isr_table[];
|
||||
extern struct rt_irq_desc isr_table[];
|
||||
|
||||
void rt_hw_trap_irq()
|
||||
void rt_hw_trap_irq(void)
|
||||
{
|
||||
unsigned long intstat;
|
||||
rt_isr_handler_t isr_func;
|
||||
unsigned long irq;
|
||||
rt_isr_handler_t isr_func;
|
||||
void *param;
|
||||
|
||||
intstat = INTOFFSET;
|
||||
irq = INTOFFSET;
|
||||
|
||||
if (intstat == INTGLOBAL) return;
|
||||
if (irq == INTGLOBAL) return;
|
||||
|
||||
/* get interrupt service routine */
|
||||
isr_func = isr_table[intstat];
|
||||
/* get interrupt service routine */
|
||||
isr_func = isr_table[irq].handler;
|
||||
param = isr_table[irq].param;
|
||||
|
||||
/* turn to interrupt service routine */
|
||||
isr_func(intstat);
|
||||
/* turn to interrupt service routine */
|
||||
isr_func(irq, param);
|
||||
|
||||
/* clear pending register */
|
||||
/* note: must be the last, if not, may repeat*/
|
||||
ClearPending(1 << intstat);
|
||||
/* clear pending register */
|
||||
/* note: must be the last, if not, may repeat*/
|
||||
ClearPending(1 << irq);
|
||||
|
||||
#ifdef RT_USING_INTERRUPT_INFO
|
||||
isr_table[irq].counter++;
|
||||
#endif /* RT_USING_INTERRUPT_INFO */
|
||||
}
|
||||
|
||||
void rt_hw_trap_fiq()
|
||||
void rt_hw_trap_fiq(void)
|
||||
{
|
||||
rt_kprintf("fast interrupt request\n");
|
||||
}
|
||||
|
|
|
@ -10,9 +10,11 @@
|
|||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2006-03-13 Bernard first version
|
||||
* 2013-03-29 aozima Modify the interrupt interface implementations.
|
||||
*/
|
||||
|
||||
#include <rtthread.h>
|
||||
#include <rthw.h>
|
||||
#include <sep4020.h>
|
||||
|
||||
#define MAX_HANDLERS 32
|
||||
|
@ -20,7 +22,7 @@
|
|||
extern rt_uint32_t rt_interrupt_nest;
|
||||
|
||||
/* exception and interrupt handler table */
|
||||
rt_isr_handler_t isr_table[MAX_HANDLERS];
|
||||
struct rt_irq_desc isr_table[MAX_HANDLERS];
|
||||
rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
|
||||
rt_uint32_t rt_thread_switch_interrupt_flag;
|
||||
|
||||
|
@ -38,44 +40,45 @@ rt_isr_handler_t rt_hw_interrupt_handle(rt_uint32_t vector)
|
|||
/**
|
||||
* This function will initialize hardware interrupt
|
||||
*/
|
||||
void rt_hw_interrupt_init()
|
||||
void rt_hw_interrupt_init(void)
|
||||
{
|
||||
register rt_uint32_t idx;
|
||||
register rt_uint32_t idx;
|
||||
|
||||
/*Make sure all intc registers in proper state*/
|
||||
/*Make sure all intc registers in proper state*/
|
||||
|
||||
/*mask all the irq*/
|
||||
*(RP)(INTC_IMR) = 0xFFFFFFFF;
|
||||
/*mask all the irq*/
|
||||
*(RP)(INTC_IMR) = 0xFFFFFFFF;
|
||||
|
||||
/*enable all the irq*/
|
||||
*(RP)(INTC_IER) = 0XFFFFFFFF;
|
||||
/*enable all the irq*/
|
||||
*(RP)(INTC_IER) = 0XFFFFFFFF;
|
||||
|
||||
/*Dont use any forced irq*/
|
||||
*(RP)(INTC_IFR) = 0x0;
|
||||
/*Dont use any forced irq*/
|
||||
*(RP)(INTC_IFR) = 0x0;
|
||||
|
||||
/*Disable all the fiq*/
|
||||
*(RP)(INTC_FIER) = 0x0;
|
||||
/*Disable all the fiq*/
|
||||
*(RP)(INTC_FIER) = 0x0;
|
||||
|
||||
/*Mask all the fiq*/
|
||||
*(RP)(INTC_FIMR) = 0x0F;
|
||||
/*Mask all the fiq*/
|
||||
*(RP)(INTC_FIMR) = 0x0F;
|
||||
|
||||
/*Dont use forced fiq*/
|
||||
*(RP)(INTC_FIFR) = 0x0;
|
||||
/*Dont use forced fiq*/
|
||||
*(RP)(INTC_FIFR) = 0x0;
|
||||
|
||||
/*Intrrupt priority register*/
|
||||
*(RP)(INTC_IPLR) = 0x0;
|
||||
/*Intrrupt priority register*/
|
||||
*(RP)(INTC_IPLR) = 0x0;
|
||||
|
||||
/* init exceptions table */
|
||||
for(idx=0; idx < MAX_HANDLERS; idx++)
|
||||
{
|
||||
isr_table[idx] = (rt_isr_handler_t)rt_hw_interrupt_handle;
|
||||
}
|
||||
/* init exceptions table */
|
||||
rt_memset(isr_table, 0x00, sizeof(isr_table));
|
||||
for(idx=0; idx < MAX_HANDLERS; idx++)
|
||||
{
|
||||
isr_table[idx].handler = rt_hw_interrupt_handle;
|
||||
}
|
||||
|
||||
/* init interrupt nest, and context in thread sp */
|
||||
rt_interrupt_nest = 0;
|
||||
rt_interrupt_from_thread = 0;
|
||||
rt_interrupt_to_thread = 0;
|
||||
rt_thread_switch_interrupt_flag = 0;
|
||||
/* init interrupt nest, and context in thread sp */
|
||||
rt_interrupt_nest = 0;
|
||||
rt_interrupt_from_thread = 0;
|
||||
rt_interrupt_to_thread = 0;
|
||||
rt_thread_switch_interrupt_flag = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -108,15 +111,26 @@ void rt_hw_interrupt_umask(rt_uint32_t vector)
|
|||
* @param new_handler the interrupt service routine to be installed
|
||||
* @param old_handler the old interrupt service routine
|
||||
*/
|
||||
void rt_hw_interrupt_install(rt_uint32_t 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 < MAX_HANDLERS)
|
||||
{
|
||||
if (*old_handler != RT_NULL)
|
||||
*old_handler = isr_table[vector];
|
||||
if (new_handler != RT_NULL)
|
||||
isr_table[vector] = new_handler;
|
||||
}
|
||||
rt_isr_handler_t old_handler = RT_NULL;
|
||||
|
||||
if(vector < MAX_HANDLERS)
|
||||
{
|
||||
old_handler = isr_table[vector].handler;
|
||||
|
||||
if (handler != RT_NULL)
|
||||
{
|
||||
#ifdef RT_USING_INTERRUPT_INFO
|
||||
rt_strncpy(isr_table[vector].name, name, RT_NAME_MAX);
|
||||
#endif /* RT_USING_INTERRUPT_INFO */
|
||||
isr_table[vector].handler = handler;
|
||||
isr_table[vector].param = param;
|
||||
}
|
||||
}
|
||||
|
||||
return old_handler;
|
||||
}
|
||||
|
||||
/*@}*/
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
* 2006-03-13 Bernard first version
|
||||
* 2006-05-27 Bernard add skyeye support
|
||||
* 2007-11-19 Yi.Qiu fix rt_hw_trap_irq function
|
||||
* 2013-03-29 aozima Modify the interrupt interface implementations.
|
||||
*/
|
||||
|
||||
#include <rtthread.h>
|
||||
|
@ -131,31 +132,38 @@ void rt_hw_trap_resv(struct rt_hw_register *regs)
|
|||
rt_hw_cpu_shutdown();
|
||||
}
|
||||
|
||||
extern rt_isr_handler_t isr_table[];
|
||||
extern struct rt_irq_desc isr_table[];
|
||||
|
||||
void rt_hw_trap_irq()
|
||||
void rt_hw_trap_irq(void)
|
||||
{
|
||||
unsigned long intstat;
|
||||
rt_uint32_t i = 0;
|
||||
rt_isr_handler_t isr_func;
|
||||
unsigned long intstat;
|
||||
rt_uint32_t irq = 0;
|
||||
rt_isr_handler_t isr_func;
|
||||
void *param;
|
||||
|
||||
/*Get the final intrrupt source*/
|
||||
intstat = *(RP)(INTC_IFSR);;
|
||||
/*Get the final intrrupt source*/
|
||||
intstat = *(RP)(INTC_IFSR);;
|
||||
|
||||
/*Shift to get the intrrupt number*/
|
||||
while(intstat != 1)
|
||||
{
|
||||
intstat = intstat >> 1;
|
||||
i++;
|
||||
}
|
||||
/* get interrupt service routine */
|
||||
isr_func = isr_table[i];
|
||||
/*Shift to get the intrrupt number*/
|
||||
while(intstat != 1)
|
||||
{
|
||||
intstat = intstat >> 1;
|
||||
irq++;
|
||||
}
|
||||
|
||||
/* turn to interrupt service routine */
|
||||
isr_func(i);
|
||||
/* get interrupt service routine */
|
||||
isr_func = isr_table[irq].isr_handle;
|
||||
param = isr_table[irq].param;
|
||||
|
||||
/* turn to interrupt service routine */
|
||||
isr_func(irq, param);
|
||||
|
||||
#ifdef RT_USING_INTERRUPT_INFO
|
||||
isr_table[irq].counter++;
|
||||
#endif /* RT_USING_INTERRUPT_INFO */
|
||||
}
|
||||
|
||||
void rt_hw_trap_fiq()
|
||||
void rt_hw_trap_fiq(void)
|
||||
{
|
||||
rt_kprintf("fast interrupt request\n");
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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 <rtthread.h>
|
||||
#include <rthw.h>
|
||||
#include "soc3210.h"
|
||||
|
||||
#define MAX_INTR 32
|
||||
|
@ -20,7 +23,7 @@ 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();
|
||||
|
||||
|
@ -30,7 +33,7 @@ void rt_hw_timer_handler();
|
|||
|
||||
/*@{*/
|
||||
|
||||
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;
|
||||
int irq;
|
||||
void *param;
|
||||
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();
|
||||
}
|
||||
/* 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;
|
||||
if (c0_status & 0x0400)
|
||||
{
|
||||
/* the hardware interrupt */
|
||||
status |= INT_ISR;
|
||||
if (!status) return;
|
||||
|
||||
for (i = MAX_INTR; i > 0; --i)
|
||||
{
|
||||
if ((status & (1<<i)))
|
||||
{
|
||||
status &= ~(1<<i);
|
||||
irq_func = irq_handle_table[i];
|
||||
for (irq = MAX_INTR; irq > 0; --irq)
|
||||
{
|
||||
if ((status & (1 << irq)))
|
||||
{
|
||||
status &= ~(1 << irq);
|
||||
|
||||
/* do interrupt */
|
||||
(*irq_func)(i);
|
||||
irq_func = irq_handle_table[irq].handler;
|
||||
param = irq_handle_table[irq].param;
|
||||
|
||||
/* ack interrupt */
|
||||
INT_CLR = (1 << i);
|
||||
}
|
||||
}
|
||||
}
|
||||
/* 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*@}*/
|
||||
|
|
|
@ -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 <rtthread.h>
|
||||
#include <rthw.h>
|
||||
#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<<i)))
|
||||
if ((status & (1 << irq)))
|
||||
{
|
||||
status &= ~(1<<i);
|
||||
irq_func = irq_handle_table[i];
|
||||
status &= ~(1 << irq);
|
||||
|
||||
irq_func = irq_handle_table[irq].handler;
|
||||
param = irq_handle_table[irq].param;
|
||||
|
||||
/* 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 */
|
||||
ls1b_hw0_icregs->int_clr |= (1 << i);
|
||||
ls1b_hw0_icregs->int_clr |= (1 << irq);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue