libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

update mini2440: Modify the interrupt interface implementations.

This commit is contained in:
aozima 2013-03-23 16:38:13 +08:00
parent 97eadb7d8e
commit fbc1b05dd8
5 changed files with 83 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bsp/mini2440/board.c
View File

@ -58,7 +58,7 @@ struct rt_device uart2_device;
/** /**
* This function will handle rtos timer * 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(); rt_tick_increase();
} }
@ -66,7 +66,7 @@ static void rt_timer_handler(int vector)
/** /**
* This function will handle serial * 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); INTSUBMSK |= (BIT_SUB_RXD0);
@ -81,7 +81,7 @@ static void rt_serial0_handler(int vector)
/** /**
* This function will handle serial * 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); INTSUBMSK |= (BIT_SUB_RXD2);
@ -133,7 +133,7 @@ static void rt_hw_uart_init(void)
uart2.uart_device->ucon = 0x245; uart2.uart_device->ucon = 0x245;
/* Set uart0 bps */ /* Set uart0 bps */
uart2.uart_device->ubrd = (rt_int32_t)(PCLK / (BPS * 16)) - 1; uart2.uart_device->ubrd = (rt_int32_t)(PCLK / (BPS * 16)) - 1;
for (i = 0; i < 100; i++); for (i = 0; i < 100; i++);
/* install uart0 isr */ /* install uart0 isr */
@ -141,18 +141,18 @@ static void rt_hw_uart_init(void)
/* install uart2 isr */ /* install uart2 isr */
INTSUBMSK &= ~(BIT_SUB_RXD2); 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_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); rt_hw_interrupt_umask(INTUART2);
} }
/** /**
* This function will init timer4 for system ticks * 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 */ /* timer4, pre = 15+1 */
TCFG0 &= 0xffff00ff; TCFG0 &= 0xffff00ff;
@ -165,7 +165,7 @@ static void rt_hw_timer_init()
/* manual update */ /* manual update */
TCON = TCON & (~(0x0f<<20)) | (0x02<<20); TCON = TCON & (~(0x0f<<20)) | (0x02<<20);
/* install interrupt handler */ /* 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); rt_hw_interrupt_umask(INTTIMER4);
/* start timer4, reload */ /* start timer4, reload */
@ -175,7 +175,7 @@ static void rt_hw_timer_init()
/** /**
* This function will init s3ceb2410 board * This function will init s3ceb2410 board
*/ */
void rt_hw_board_init() void rt_hw_board_init(void)
{ {
/* initialize the system clock */ /* initialize the system clock */
rt_hw_clock_init(); rt_hw_clock_init();

4
bsp/mini2440/dm9000.c
View File

@ -572,7 +572,7 @@ __error_retry:
#define B4_Tacp 0x0 #define B4_Tacp 0x0
#define B4_PMC 0x0 #define B4_PMC 0x0
void INTEINT4_7_handler(int irqno) void INTEINT4_7_handler(int irqno, void *param)
{ {
rt_uint32_t eint_pend; rt_uint32_t eint_pend;
@ -637,7 +637,7 @@ void rt_hw_dm9000_init()
eth_device_init(&(dm9000_device.parent), "e0"); eth_device_init(&(dm9000_device.parent), "e0");
/* instal interrupt */ /* 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); rt_hw_interrupt_umask(INTEINT4_7);
} }

2
bsp/mini2440/rtconfig.h
View File

@ -22,6 +22,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" />

79
libcpu/arm/s3c24x0/interrupt.c
View File

@ -10,9 +10,11 @@
* Change Logs: * Change Logs:
* Date Author Notes * Date Author Notes
* 2006-03-13 Bernard first version * 2006-03-13 Bernard first version
* 2013-03-29 aozima Modify the interrupt interface implementations.
*/ */
#include <rtthread.h> #include <rtthread.h>
#include <rthw.h>
#include "s3c24x0.h" #include "s3c24x0.h"
#define MAX_HANDLERS 32 #define MAX_HANDLERS 32
@ -20,7 +22,7 @@
extern rt_uint32_t rt_interrupt_nest; extern rt_uint32_t rt_interrupt_nest;
/* exception and interrupt handler table */ /* 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_interrupt_from_thread, rt_interrupt_to_thread;
rt_uint32_t rt_thread_switch_interrupt_flag; 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); 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) void rt_hw_interrupt_init(void)
{ {
register rt_uint32_t idx; register rt_uint32_t idx;
/* all clear source pending */ /* all clear source pending */
SRCPND = 0x0; SRCPND = 0x0;
/* all clear sub source pending */ /* all clear sub source pending */
SUBSRCPND = 0x0; SUBSRCPND = 0x0;
/* all=IRQ mode */ /* all=IRQ mode */
INTMOD = 0x0; INTMOD = 0x0;
/* all interrupt disabled include global bit */ /* all interrupt disabled include global bit */
INTMSK = BIT_ALLMSK; INTMSK = BIT_ALLMSK;
/* all sub interrupt disable */ /* all sub interrupt disable */
INTSUBMSK = BIT_SUB_ALLMSK; INTSUBMSK = BIT_SUB_ALLMSK;
/* all clear interrupt pending */ /* all clear interrupt pending */
INTPND = BIT_ALLMSK; INTPND = BIT_ALLMSK;
/* init exceptions table */ /* init exceptions table */
for(idx=0; idx < MAX_HANDLERS; idx++) rt_memset(isr_table, 0x00, sizeof(isr_table));
{ for(idx=0; idx < MAX_HANDLERS; idx++)
isr_table[idx] = (rt_isr_handler_t)rt_hw_interrupt_handle; {
} isr_table[idx].handler = rt_hw_interrupt_handle;
}
/* init interrupt nest, and context in thread sp */ /* init interrupt nest, and context in thread sp */
rt_interrupt_nest = 0; rt_interrupt_nest = 0;
rt_interrupt_from_thread = 0; rt_interrupt_from_thread = 0;
rt_interrupt_to_thread = 0; rt_interrupt_to_thread = 0;
rt_thread_switch_interrupt_flag = 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 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)
{ {
if(vector < MAX_HANDLERS) rt_isr_handler_t old_handler = RT_NULL;
{
if (old_handler != RT_NULL) *old_handler = isr_table[vector]; if(vector < MAX_HANDLERS)
if (new_handler != RT_NULL) isr_table[vector] = new_handler; {
} 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;
} }
/*@}*/ /*@}*/

35
libcpu/arm/s3c24x0/trap.c
View File

@ -12,6 +12,7 @@
* 2006-03-13 Bernard first version * 2006-03-13 Bernard first version
* 2006-05-27 Bernard add skyeye support * 2006-05-27 Bernard add skyeye support
* 2007-11-19 Yi.Qiu fix rt_hw_trap_irq function * 2007-11-19 Yi.Qiu fix rt_hw_trap_irq function
* 2013-03-29 aozima Modify the interrupt interface implementations.
*/ */
#include <rtthread.h> #include <rtthread.h>
@ -140,29 +141,35 @@ void rt_hw_trap_resv(struct rt_hw_register *regs)
rt_hw_cpu_shutdown(); 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; unsigned long irq;
rt_isr_handler_t isr_func; rt_isr_handler_t isr_func;
void *param;
intstat = INTOFFSET; irq = INTOFFSET;
if (intstat == INTGLOBAL) return; if (irq == INTGLOBAL) return;
/* get interrupt service routine */ /* get interrupt service routine */
isr_func = isr_table[intstat]; isr_func = isr_table[irq].handler;
param = isr_table[irq].param;
/* turn to interrupt service routine */ /* turn to interrupt service routine */
isr_func(intstat); isr_func(irq, param);
/* clear pending register */ /* clear pending register */
/* note: must be the last, if not, may repeat*/ /* note: must be the last, if not, may repeat*/
ClearPending(1 << intstat); 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"); rt_kprintf("fast interrupt request\n");
} }