RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
PR 779/bsp
	* clock/p_clock.c, console/console.c, console/uart.c, console/uart.h,
	irq/irq.c, irq/irq.h, irq/irq_init.c:
	powerpc: add parameter to new exception interrupt handlers
This commit is contained in:
Jennifer Averett
2005-04-15 17:52:46 +00:00
parent c1e7b3f70c
commit 2d0d0293ee
7 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
c/src/lib/libbsp/powerpc/shared/clock/p_clock.c
View File

@@ -20,6 +20,7 @@
static rtems_irq_connect_data clockIrqData = {BSP_DECREMENTER, static rtems_irq_connect_data clockIrqData = {BSP_DECREMENTER,
clockIsr, clockIsr,
NULL,
(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};

4
c/src/lib/libbsp/powerpc/shared/console/console.c
View File

@@ -54,8 +54,8 @@ int BSPBaseBaud = BSP_UART_BAUD_BASE;
static int conSetAttr(int minor, const struct termios *); static int conSetAttr(int minor, const struct termios *);
typedef struct TtySTblRec_ { typedef struct TtySTblRec_ {
char *name; char *name;
void (*isr)(void); /* STUPID API doesn't pass a parameter :-( */ rtems_irq_hdl isr;
} TtySTblRec, *TtySTbl; } TtySTblRec, *TtySTbl;
static TtySTblRec ttyS[]={ static TtySTblRec ttyS[]={

8
c/src/lib/libbsp/powerpc/shared/console/uart.c
View File

@@ -692,14 +692,18 @@ BSP_uart_termios_isr_com(int uart)
} }
} }
/*
* XXX - Note that this can now be one isr with the uart
* passed as the parameter.
*/
void void
BSP_uart_termios_isr_com1(void) BSP_uart_termios_isr_com1(void *unused)
{ {
BSP_uart_termios_isr_com(BSP_UART_COM1); BSP_uart_termios_isr_com(BSP_UART_COM1);
} }
void void
BSP_uart_termios_isr_com2(void) BSP_uart_termios_isr_com2(void *unused)
{ {
BSP_uart_termios_isr_com(BSP_UART_COM2); BSP_uart_termios_isr_com(BSP_UART_COM2);
} }

4
c/src/lib/libbsp/powerpc/shared/console/uart.h
View File

@@ -25,8 +25,8 @@ void BSP_uart_polled_write(int uart, int val);
int BSP_uart_polled_read(int uart); int BSP_uart_polled_read(int uart);
void BSP_uart_termios_set(int uart, void *ttyp); void BSP_uart_termios_set(int uart, void *ttyp);
int BSP_uart_termios_write_com(int minor, const char *buf, int len); int BSP_uart_termios_write_com(int minor, const char *buf, int len);
void BSP_uart_termios_isr_com1(); void BSP_uart_termios_isr_com1(void *unused);
void BSP_uart_termios_isr_com2(); void BSP_uart_termios_isr_com2(void *unused);
void BSP_uart_dbgisr_com1(void); void BSP_uart_dbgisr_com1(void);
void BSP_uart_dbgisr_com2(void); void BSP_uart_dbgisr_com2(void);
int BSP_uart_install_isr(int uart, rtems_irq_hdl handler); int BSP_uart_install_isr(int uart, rtems_irq_hdl handler);

6
c/src/lib/libbsp/powerpc/shared/irq/irq.c
View File

@@ -518,7 +518,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[BSP_DECREMENTER].hdl(); rtems_hdl_tbl[BSP_DECREMENTER].hdl(rtems_hdl_tbl[BSP_DECREMENTER].handle);
_CPU_MSR_SET(msr); _CPU_MSR_SET(msr);
return; return;
@@ -550,14 +550,14 @@ 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); */
{ {
rtems_irq_connect_data* vchain; rtems_irq_connect_data* vchain;
for( vchain = &rtems_hdl_tbl[irq]; for( vchain = &rtems_hdl_tbl[irq];
((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl); ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl);
vchain = (rtems_irq_connect_data*)vchain->next_handler ) vchain = (rtems_irq_connect_data*)vchain->next_handler )
{ {
vchain->hdl(); vchain->hdl(vchain->handle);
} }
} }

7
c/src/lib/libbsp/powerpc/shared/irq/irq.h
View File

@@ -147,7 +147,8 @@ extern volatile rtems_i8259_masks i8259s_cache;
struct __rtems_irq_connect_data__; /* forward declaratiuon */ struct __rtems_irq_connect_data__; /* forward declaratiuon */
typedef void (*rtems_irq_hdl) (void); typedef void *rtems_irq_hdl_param;
typedef void (*rtems_irq_hdl) (rtems_irq_hdl_param);
typedef void (*rtems_irq_enable) (const struct __rtems_irq_connect_data__*); typedef void (*rtems_irq_enable) (const struct __rtems_irq_connect_data__*);
typedef void (*rtems_irq_disable) (const struct __rtems_irq_connect_data__*); typedef void (*rtems_irq_disable) (const struct __rtems_irq_connect_data__*);
typedef int (*rtems_irq_is_enabled) (const struct __rtems_irq_connect_data__*); typedef int (*rtems_irq_is_enabled) (const struct __rtems_irq_connect_data__*);
@@ -161,6 +162,10 @@ typedef struct __rtems_irq_connect_data__ {
* handler. See comment on handler properties below in function prototype. * handler. See comment on handler properties below in function prototype.
*/ */
rtems_irq_hdl hdl; rtems_irq_hdl hdl;
/*
* Handler handle to store private data
*/
rtems_irq_hdl_param handle;
/* /*
* function for enabling interrupts at device level (ONLY!). * function for enabling interrupts at device level (ONLY!).
* The BSP code will automatically enable it at i8259s level and openpic level. * The BSP code will automatically enable it at i8259s level and openpic level.

4
c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
View File

@@ -59,8 +59,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_func , NULL , nop_func , nop_func , not_connected
}; };
static rtems_irq_prio irqPrioTable[BSP_IRQ_NUMBER]={ static rtems_irq_prio irqPrioTable[BSP_IRQ_NUMBER]={
/* /*