Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix consistency #if and #if defined()

Browse Source
This commit is contained in:
Markus Fröschle
2015-11-19 20:27:49 +00:00
parent 86d141b577
commit 1964c0c3a8
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaS_gcc/flash/flash.c
View File

@@ -1,9 +1,9 @@
#include <stddef.h> #include <stddef.h>
#include "bas_types.h" #include "bas_types.h"
#if MACHINE_FIREBEE #if defined(MACHINE_FIREBEE)
#include "firebee.h" #include "firebee.h"
#elif MACHINE_M5484LITE #elif defined(MACHINE_M5484LITE)
#include "m5484l.h" #include "m5484l.h"
#endif /* MACHINE_FIREBEE */ #endif /* MACHINE_FIREBEE */

4
BaS_gcc/pci/pci.c
View File

@@ -1104,9 +1104,9 @@ void init_eport(void)
/* configure IRQ1-7 pins on EPORT falling edge triggered */ /* configure IRQ1-7 pins on EPORT falling edge triggered */
MCF_EPORT_EPPAR = MCF_EPORT_EPPAR_EPPA7(MCF_EPORT_EPPAR_FALLING) | MCF_EPORT_EPPAR = MCF_EPORT_EPPAR_EPPA7(MCF_EPORT_EPPAR_FALLING) |
MCF_EPORT_EPPAR_EPPA6(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) | MCF_EPORT_EPPAR_EPPA5(MCF_EPORT_EPPAR_LEVEL) |
#elif MACHINE_M5484LITE #elif defined(MACHINE_M5484LITE)
MCF_EPORT_EPPAR_EPPA5(MCF_EPORT_EPPAR_FALLING) | MCF_EPORT_EPPAR_EPPA5(MCF_EPORT_EPPAR_FALLING) |
#endif /* MACHINE_FIREBEE */ #endif /* MACHINE_FIREBEE */
MCF_EPORT_EPPAR_EPPA4(MCF_EPORT_EPPAR_FALLING) | MCF_EPORT_EPPAR_EPPA4(MCF_EPORT_EPPAR_FALLING) |

8
BaS_gcc/sys/exceptions.S
View File

@@ -21,9 +21,9 @@
*/ */
#include "startcf.h" #include "startcf.h"
#if MACHINE_FIREBEE #if defined(MACHINE_FIREBEE)
#include "firebee.h" #include "firebee.h"
#elif MACHINE_M5484LITE #elif defined(MACHINE_M5484LITE)
#include "m5484l.h" #include "m5484l.h"
#endif /* MACHINE_FIREBEE */ #endif /* MACHINE_FIREBEE */
@@ -446,8 +446,8 @@ irq6: move.w #0x2700,sr // disable interrupt
move.l 8(a6),-(sp) // format status word move.l 8(a6),-(sp) // format status word
move.l 12(a6),-(sp) // pc at exception move.l 12(a6),-(sp) // pc at exception
jsr _irq6_handler // call C handler jsr _irq6_handler // call C handler
lea 8(sp),sp // fix stack lea 8(sp),sp // fix stack
tst.b d0 // interrupt handled? tst.b d0 // interrupt handled?
beq irq6_forward // no, forward to TOS beq irq6_forward // no, forward to TOS