diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-03 20:35:43 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-03 20:35:43 +0000 |
| commit | e36390a662764faf3b38e8f6196e8f77d1b5d00f (patch) | |
| tree | 810a3778767fa392b44ccfe2577fc645e7620ee8 /c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h | |
| parent | 2008-09-03 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-e36390a662764faf3b38e8f6196e8f77d1b5d00f.tar.bz2 | |
2008-09-03 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, configure.ac, console/alloc360.c, console/console.c,
console/console.h, console/m68360.h, console/mc68360_scc.c,
console/ns16550cfg.c, console/rsPMCQ1.c, console/rsPMCQ1.h,
include/bsp.h, irq/irq_init.c, vme/VMEConfig.h: Initiate update and
testing. Add missing files. Does not run hello yet.
* console/debugio.c, console/polled_io.c, irq/openpic_xxx_irq.c: New files.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h b/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h index ecc939e56e..c6ba7d05bb 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h +++ b/c/src/lib/libbsp/powerpc/ep1a/console/rsPMCQ1.h @@ -21,6 +21,9 @@ * */ +#include <libcpu/io.h> +#include <bsp/irq.h> + /* modification history -------------------- @@ -30,9 +33,6 @@ #ifndef __INCPMCQ1H #define __INCPMCQ1H -#include <libcpu/io.h> -#include <bsp/irq.h> - /* * PMCQ1 definitions */ @@ -96,8 +96,8 @@ #define PMCQ1_RAM 0x00200000 /* -#define PMCQ1_Read_EPLD( _base, _reg ) ( *((unsigned long *) ((uint32_t)_base + _reg)) ) -#define PMCQ1_Write_EPLD( _base, _reg, _data ) *((unsigned long *) ((uint32_t)_base + _reg)) = _data +#define PMCQ1_Read_EPLD( _base, _reg ) ( *((unsigned long *) ((unsigned32)_base + _reg)) ) +#define PMCQ1_Write_EPLD( _base, _reg, _data ) *((unsigned long *) ((unsigned32)_base + _reg)) = _data */ uint32_t PMCQ1_Read_EPLD( uint32_t base, uint32_t reg ); void PMCQ1_Write_EPLD( uint32_t base, uint32_t reg, uint32_t data ); @@ -108,6 +108,7 @@ void PMCQ1_Write_EPLD( uint32_t base, uint32_t reg, uint32_t data ); #define QSPAN2_INT_STATUS 0x00000600 +typedef void (*FUNCION_PTR) (int); #define PCI_ID(v, d) ((d << 16) | v) @@ -130,10 +131,10 @@ typedef struct _PMCQ1BoardData unsigned long funcNo; unsigned long baseaddr; unsigned long bridgeaddr; - rtems_irq_hdl quiccInt; - rtems_irq_hdl_param quiccArg; - rtems_irq_hdl maInt; - rtems_irq_hdl_param maArg; + FUNCION_PTR quiccInt; + int quiccArg; + FUNCION_PTR maInt; + int maArg; } PMCQ1BoardData, *PPMCQ1BoardData; extern PPMCQ1BoardData pmcq1BoardData; @@ -141,8 +142,20 @@ extern PPMCQ1BoardData pmcq1BoardData; /* * Function declarations */ -extern unsigned int rsPMCQ1QuiccIntConnect( - unsigned long busNo, unsigned long slotNo,unsigned long funcNo, rtems_irq_hdl routine,rtems_irq_hdl_param arg ); -extern unsigned int rsPMCQ1Init(void); +extern unsigned int rsPMCQ1QuiccIntConnect( + unsigned long busNo, + unsigned long slotNo, + unsigned long funcNo, + FUNCION_PTR routine, + int arg +); +unsigned int rsPMCQ1Init(); +unsigned int rsPMCQ1MaIntConnect ( + unsigned long busNo, /* Pci Bus number of PMCQ1 */ + unsigned long slotNo, /* Pci Slot number of PMCQ1 */ + unsigned long funcNo, /* Pci Function number of PMCQ1 */ + FUNCION_PTR routine,/* interrupt routine */ + int arg /* argument to pass to interrupt routine */ +); #endif /* __INCPMCQ1H */ |