diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-10 23:51:17 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2004-11-10 23:51:17 +0000 |
| commit | e79a194755c89fc9330ce74d6af450fa7c18c802 (patch) | |
| tree | 8b4ba416f0d5996b89bb1a342e8b40b84d86b42e /c/src/lib/libbsp/powerpc/shared/openpic | |
| parent | 2004-11-10 Richard Campbell <richard.campbell@oarcorp.com> (diff) | |
| download | rtems-e79a194755c89fc9330ce74d6af450fa7c18c802.tar.bz2 | |
2004-11-10 Richard Campbell <richard.campbell@oarcorp.com>
* Makefile.am, bootloader/misc.c, bootloader/pci.c, bootloader/pci.h,
console/console.c, console/inch.c, console/reboot.c, console/uart.c,
console/uart.h, irq/irq.c, irq/irq.h, irq/irq_init.c,
motorola/motorola.c, motorola/motorola.h, openpic/openpic.c,
openpic/openpic.h, pci/detect_raven_bridge.c, pci/pci.c,
start/start.S, startup/bspstart.c, vectors/vectors_init.c,
vme/vmeconfig.c: Add MVME2100 BSP and MPC8240 support. There was also
a significant amount of spelling and whitespace cleanup.
* tod/todcfg.c: New file.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/shared/openpic')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/openpic/openpic.c | 9 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/openpic/openpic.h | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c index b7aa4777ce..80af4d897b 100644 --- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c +++ b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c @@ -20,12 +20,12 @@ */ #include <rtems.h> +#include <bsp.h> #include <rtems/bspIo.h> #include <bsp/openpic.h> #include <bsp/pci.h> #include <libcpu/io.h> #include <libcpu/byteorder.h> -#include <bsp.h> #include <rtems/bspIo.h> #ifndef NULL @@ -189,7 +189,9 @@ void openpic_init(int main_pic, unsigned char *polarities, unsigned char *senses OPENPIC_VENDOR_ID_STEPPING_SHIFT; /* Kludge for the Raven */ +/* pci_read_config_dword(0, 0, 0, 0, &t); +*/ if (t == PCI_VENDOR_ID_MOTOROLA + (PCI_DEVICE_ID_MOTOROLA_RAVEN<<16)) { vendor = "Motorola"; device = "Raven"; @@ -455,6 +457,11 @@ unsigned long flags; void openpic_initirq(unsigned int irq, unsigned int pri, unsigned int vec, int pol, int sense) { +#if 0 + printk("openpic_initirq: irq=%d pri=%d vec=%d pol=%d sense=%d\n", + irq, pri, vec, pol, sense); +#endif + check_arg_irq(irq); check_arg_pri(pri); check_arg_vec(vec); diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h index 776b5ec723..e70a55605b 100644 --- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h +++ b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.h @@ -41,7 +41,11 @@ * OpenPIC supports up to 2048 interrupt sources and up to 32 processors */ +#if defined(mpc8240) || defined(mpc8245) +#define OPENPIC_MAX_SOURCES (2048 - 16) +#else #define OPENPIC_MAX_SOURCES 2048 +#endif #define OPENPIC_MAX_PROCESSORS 32 #define OPENPIC_NUM_TIMERS 4 @@ -151,6 +155,9 @@ typedef struct _OpenPIC_Global { OpenPIC_Reg _Timer_Frequency; /* Read/Write */ OpenPIC_Timer Timer[OPENPIC_NUM_TIMERS]; char Pad1[0xee00]; +#if defined(mpc8240) || defined(mpc8245) + char Pad2[0x0200]; +#endif } OpenPIC_Global; /* |