2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com>

* clock/p_clock.c, irq/irq.c, irq/irq_init.c: Addition of a parameter
	to ISRs
This commit is contained in:
Jennifer Averett
2005-05-04 19:28:25 +00:00
parent 8b3b2ef6f5
commit ef546c3270
4 changed files with 13 additions and 5 deletions

View File

@@ -1,3 +1,8 @@
2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com>
* clock/p_clock.c, irq/irq.c, irq/irq_init.c: Addition of a parameter
to ISRs
2005-04-15 Jennifer Averett <jennifer.averett@oarcorp.com> 2005-04-15 Jennifer Averett <jennifer.averett@oarcorp.com>
PR 779/bsp PR 779/bsp

View File

@@ -21,10 +21,11 @@
extern void clockOn(void*); extern void clockOn(void*);
extern void clockOff (void*); extern void clockOff (void*);
extern int clockIsOn(void*); extern int clockIsOn(void*);
extern void Clock_isr(); extern void Clock_isr(void*);
static rtems_irq_connect_data clockIrqData = {BSP_PERIODIC_TIMER, static rtems_irq_connect_data clockIrqData = {BSP_PERIODIC_TIMER,
(rtems_irq_hdl)Clock_isr, (rtems_irq_hdl)Clock_isr,
0,
(rtems_irq_enable)clockOn, (rtems_irq_enable)clockOn,
(rtems_irq_disable)clockOff, (rtems_irq_disable)clockOff,
(rtems_irq_is_enabled)clockIsOn}; (rtems_irq_is_enabled)clockIsOn};

View File

@@ -467,7 +467,7 @@ void C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum)
new_msr = msr | MSR_EE; new_msr = msr | MSR_EE;
_CPU_MSR_SET(new_msr); _CPU_MSR_SET(new_msr);
rtems_hdl_tbl[irq].hdl(); rtems_hdl_tbl[irq].hdl(rtems_hdl_tbl[irq].handle);
_CPU_MSR_SET(msr); _CPU_MSR_SET(msr);

View File

@@ -28,7 +28,9 @@ volatile unsigned int ppc_cached_irq_mask;
/* /*
* default on/off function * default on/off function
*/ */
static void nop_func(){} static void nop_func1(void *unused){}
static void nop_func2(){}
/* /*
* default isOn function * default isOn function
*/ */
@@ -41,8 +43,8 @@ static int connected() {return 1;}
static rtems_irq_connect_data rtemsIrq[BSP_IRQ_NUMBER]; static rtems_irq_connect_data rtemsIrq[BSP_IRQ_NUMBER];
static rtems_irq_global_settings initial_config; static rtems_irq_global_settings initial_config;
static rtems_irq_connect_data defaultIrq = { static rtems_irq_connect_data defaultIrq = {
/* vectorIdex, hdl , on , off , isOn */ /* vectorIdex, hdl , handle , on , off , isOn */
0, nop_func , nop_func , nop_func , not_connected 0, nop_func1 , 0 , nop_func2 , nop_func2 , not_connected
}; };
static rtems_irq_prio irqPrioTable[BSP_IRQ_NUMBER]={ static rtems_irq_prio irqPrioTable[BSP_IRQ_NUMBER]={
/* /*