From dd5fb8ab2e4662ab7d69743d708368816c65bd9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Thu, 19 Nov 2015 20:27:49 +0000 Subject: [PATCH] fix consistency #if and #if defined() --- flash/flash.c | 4 ++-- pci/pci.c | 4 ++-- sys/exceptions.S | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flash/flash.c b/flash/flash.c index 423d9b0..6442015 100644 --- a/flash/flash.c +++ b/flash/flash.c @@ -1,9 +1,9 @@ #include #include "bas_types.h" -#if MACHINE_FIREBEE +#if defined(MACHINE_FIREBEE) #include "firebee.h" -#elif MACHINE_M5484LITE +#elif defined(MACHINE_M5484LITE) #include "m5484l.h" #endif /* MACHINE_FIREBEE */ diff --git a/pci/pci.c b/pci/pci.c index 99055a7..440e2a5 100644 --- a/pci/pci.c +++ b/pci/pci.c @@ -1104,9 +1104,9 @@ void init_eport(void) /* configure IRQ1-7 pins on EPORT falling edge triggered */ MCF_EPORT_EPPAR = MCF_EPORT_EPPAR_EPPA7(MCF_EPORT_EPPAR_FALLING) | MCF_EPORT_EPPAR_EPPA6(MCF_EPORT_EPPAR_FALLING) | -#if MACHINE_FIREBEE /* irq5 level triggered on FireBee */ +#if defined(MACHINE_FIREBEE) /* irq5 level triggered on FireBee */ MCF_EPORT_EPPAR_EPPA5(MCF_EPORT_EPPAR_LEVEL) | -#elif MACHINE_M5484LITE +#elif defined(MACHINE_M5484LITE) MCF_EPORT_EPPAR_EPPA5(MCF_EPORT_EPPAR_FALLING) | #endif /* MACHINE_FIREBEE */ MCF_EPORT_EPPAR_EPPA4(MCF_EPORT_EPPAR_FALLING) | diff --git a/sys/exceptions.S b/sys/exceptions.S index ac45356..d8ae2f7 100644 --- a/sys/exceptions.S +++ b/sys/exceptions.S @@ -21,9 +21,9 @@ */ #include "startcf.h" -#if MACHINE_FIREBEE +#if defined(MACHINE_FIREBEE) #include "firebee.h" -#elif MACHINE_M5484LITE +#elif defined(MACHINE_M5484LITE) #include "m5484l.h" #endif /* MACHINE_FIREBEE */ @@ -446,8 +446,8 @@ irq6: move.w #0x2700,sr // disable interrupt move.l 8(a6),-(sp) // format status word move.l 12(a6),-(sp) // pc at exception - jsr _irq6_handler // call C handler - lea 8(sp),sp // fix stack + jsr _irq6_handler // call C handler + lea 8(sp),sp // fix stack tst.b d0 // interrupt handled? beq irq6_forward // no, forward to TOS