2.6.22-rc2 prepatch breaks compile on Dreamcast
The patch includes:
-#if OFFCHIP_NR_IRQS > 0
-# define OFFCHIP_IRQ_BASE (ONCHIP_NR_IRQS + PINT_NR_IRQS) -#endif
but the OFFCHIP_IRQ_BASE symbol is still referenced in the Dreamcast code, so a compile generates this:
arch/sh/boards/dreamcast/irq.c: In function `disable_systemasic_irq':arch/sh/boards/dreamcast/irq.c:59: error: `OFFCHIP_IRQ_BASE' undeclared (first use in this function) arch/sh/boards/dreamcast/irq.c:59: error: (Each undeclared identifier is reported only oncearch/sh/boards/dreamcast/irq.c:59: error: for each function it appears in.)arch/sh/boards/dreamcast/irq.c: In function `enable_systemasic_irq':arch/sh/boards/dreamcast/irq.c:70: error: `OFFCHIP_IRQ_BASE' undeclared (first use in this function)arch/sh/boards/dreamcast/irq.c: In function `ack_systemasic_irq':arch/sh/boards/dreamcast/irq.c:81: error: `OFFCHIP_IRQ_BASE' undeclared (first use in this function)arch/sh/boards/dreamcast/irq.c: In function `systemasic_irq_demux':arch/sh/boards/dreamcast/irq.c:146: error: `OFFCHIP_IRQ_BASE' undeclared (first use in this function)
Quoted 10 lines · Adrian McMenamin
The patch includes:
(quoted diff) +0
-3-#if OFFCHIP_NR_IRQS > 0 -# define OFFCHIP_IRQ_BASE (ONCHIP_NR_IRQS + PINT_NR_IRQS) -#endifbut the
OFFCHIP_IRQ_BASEsymbol is still referenced in the Dreamcast code, so a compile generates this:
This will fix it, queued for -rc3:
include/asm-sh/dreamcast/sysasic.h +1 -1
@@ -23,7 +23,7 @@takes. */ -#define HW_EVENT_IRQ_BASE OFFCHIP_IRQ_BASE/* 48 */ +#define HW_EVENT_IRQ_BASE 48/* IRQ 13 */ #define HW_EVENT_VSYNC (HW_EVENT_IRQ_BASE + 5)/* VSync */