diff --git a/BaS_gcc/sources/exceptions.S b/BaS_gcc/sources/exceptions.S index 5b1bd93..b11e1fa 100644 --- a/BaS_gcc/sources/exceptions.S +++ b/BaS_gcc/sources/exceptions.S @@ -376,8 +376,7 @@ no_protect_vectors: lea _xhdi_sd_install,a1 move.l a1,0x80(a0) // trap #0 exception vector -// ACP interrupts 1-7 (user-defined, generated by FPGA) -// TODO: Do we need to do anything special for m5484LITE here? +// ACP interrupts 1-7 (user-defined, generated by FPGA on the FireBee, M5484LITE has irq7 and irq5 for PCI) lea irq1(pc),a1 move.l a1,0x104(a0) lea irq2(pc),a1 @@ -596,9 +595,17 @@ irq3: irq4: // vbl irq 0x70,4,0x10 -irq5: // acp +irq5: // irq5 is tied to PCI INTC# and PCI INTD# on the M5484LITE irq 0x74,5,0x20 +#if MACHINE_M5484LITE // install "standard" handlers for M5484LITE +irq6: + irq 0x74,5,0x20 + +irq7: // irq7 is tied to PCI INTA# and PCI INTB# on the M5484LITE + irq 0x74,5,0x20 + +#elif MACHINE_FIREBEE /* these handlers are only meaningful for the Firebee */ irq6: // MFP interrupt from FPGA move.w #0x2700,sr // disable interrupt subq.l #8,a7 @@ -1060,7 +1067,7 @@ video_chg_end: movem.l (a7),d0-d4/a0-a1 // restore saved registers lea 7 * 4(sp),a7 rte - +#endif /* MACHINE_FIREBEE */ asm_set_ipl: _asm_set_ipl: