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

modified to throw errors if an unknown machine type is detected

Browse Source
This commit is contained in:
Markus Fröschle
2014-01-28 15:49:05 +00:00
parent 8a1da417e7
commit 1fb6c756ae
11 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -170,21 +170,24 @@ clean:
# flags for targets # flags for targets
m5484lite/bas.$(EXE): MACHINE=MACHINE_M5484LITE m5484lite/bas.$(EXE): MACHINE=MACHINE_M5484LITE
m54455/bas.$(EXE): MACHINE=MACHINE_M54455
firebee/bas.$(EXE): MACHINE=MACHINE_FIREBEE firebee/bas.$(EXE): MACHINE=MACHINE_FIREBEE
m5484lite/ram.$(EXE): MACHINE=MACHINE_M5484LITE m5484lite/ram.$(EXE): MACHINE=MACHINE_M5484LITE
m54455/ram.$(EXE): MACHINE=MACHINE_M54455
firebee/ram.$(EXE): MACHINE=MACHINE_FIREBEE firebee/ram.$(EXE): MACHINE=MACHINE_FIREBEE
m5484lite/basflash.$(EXE): MACHINE=MACHINE_M5484LITE m5484lite/basflash.$(EXE): MACHINE=MACHINE_M5484LITE
m54455/basflash.$(EXE): MACHINE=MACHINE_M54455
firebee/basflash.$(EXE): MACHINE=MACHINE_FIREBEE firebee/basflash.$(EXE): MACHINE=MACHINE_FIREBEE
# #
# generate pattern rules for different object files # generate pattern rules for different object files
# #
define CC_TEMPLATE define CC_TEMPLATE
ifeq (firebee,$(1)) #ifeq (firebee,$(1))
MACHINE=MACHINE_FIREBEE #MACHINE=MACHINE_FIREBEE
else #else
MACHINE=MACHINE_M5484LITE #MACHINE=MACHINE_M5484LITE
endif #endif
# always optimize x86 emulator objects # always optimize x86 emulator objects
$(1)/objs/x86decode.o: CFLAGS=$(CFLAGS_OPTIMIZED) $(1)/objs/x86decode.o: CFLAGS=$(CFLAGS_OPTIMIZED)

10
bas.lk.in
View File

@@ -1,9 +1,11 @@
#ifdef MACHINE_FIREBEE #if defined(MACHINE_FIREBEE)
#include "firebee.h" #include "firebee.h"
#endif /* MACHINE_FIREBEE */ #elif defined(MACHINE_M5484LITE)
#ifdef MACHINE_M5484LITE
#include "m5484l.h" #include "m5484l.h"
#elif defined(MACHINE_M54455)
#include "m54455.h"
#else
#error "unknown machine!"
#endif /* MACHINE_M5484LITE */ #endif /* MACHINE_M5484LITE */
/* make bas_rom access flags rx if compiling to RAM */ /* make bas_rom access flags rx if compiling to RAM */

8
dma/dma.c
View File

@@ -29,10 +29,14 @@
#include "cache.h" #include "cache.h"
#include "exceptions.h" #include "exceptions.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"
#elif defined(MACHINE_M54455)
#include "m54455.h"
#else
#error "unknown machine!"
#endif /* MACHINE_FIREBEE */ #endif /* MACHINE_FIREBEE */
//#define DBG_DMA //#define DBG_DMA

8
include/wait.h
View File

@@ -29,10 +29,14 @@
#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"
#elif defined(MACHINE_M54455)
#include "m54455.h"
#else
#error "unknown machine"
#endif /* MACHINE_FIREBEE */ #endif /* MACHINE_FIREBEE */
#include "MCF5475.h" #include "MCF5475.h"

4
net/am79c874.c
View File

@@ -13,8 +13,10 @@
#include "firebee.h" #include "firebee.h"
#elif defined(MACHINE_M5484LITE) #elif defined(MACHINE_M5484LITE)
#include "m5484l.h" #include "m5484l.h"
#elif defined(MACHINE_M54455)
#include "m54455.h"
#else #else
#error "unknown machine" #error "unknown machine!"
#endif #endif
//#define DBG_AM79 //#define DBG_AM79

2
net/bcm5222.c
View File

@@ -18,6 +18,8 @@
#include "firebee.h" #include "firebee.h"
#elif defined(MACHINE_M5484LITE) #elif defined(MACHINE_M5484LITE)
#include "m5484l.h" #include "m5484l.h"
#elif defined(MACHINE_M54455)
#include "m54455.h"
#else #else
#error "Unknown machine!" #error "Unknown machine!"
#endif #endif

2
net/fec.c
View File

@@ -26,6 +26,8 @@
#include "firebee.h" #include "firebee.h"
#elif defined(MACHINE_M5484LITE) #elif defined(MACHINE_M5484LITE)
#include "m5484l.h" #include "m5484l.h"
#elif defined(MACHINE_M54455)
#include "m54455.h"
#else #else
#error Unknown machine! #error Unknown machine!
#endif #endif

2
net/net_timer.c
View File

@@ -24,6 +24,8 @@
#include "firebee.h" #include "firebee.h"
#elif defined(MACHINE_M5484LITE) #elif defined(MACHINE_M5484LITE)
#include "m5484l.h" #include "m5484l.h"
#elif defined(MACHINE_M54455)
#include "m54455.h"
#else #else
#error unknown machine! #error unknown machine!
#endif #endif

8
sys/driver_mem.c
View File

@@ -18,10 +18,14 @@
#include "usb.h" #include "usb.h"
#include "exceptions.h" /* set_ipl() */ #include "exceptions.h" /* set_ipl() */
#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"
#elif defined(MACHINE_M54455)
#include "m54455.h"
#else
#error "unknown machine!"
#endif #endif
//#define DBG_DM //#define DBG_DM

2
sys/mmu.c
View File

@@ -36,6 +36,8 @@
#include "firebee.h" #include "firebee.h"
#elif defined(MACHINE_M5484LITE) #elif defined(MACHINE_M5484LITE)
#include "m5484l.h" #include "m5484l.h"
#elif defined(MACHINE_M54455)
#include "m54455.h"
#else #else
#error "unknown machine!" #error "unknown machine!"
#endif /* MACHINE_FIREBEE */ #endif /* MACHINE_FIREBEE */

11
sys/sysinit.c
View File

@@ -37,14 +37,17 @@
#include "wait.h" #include "wait.h"
#include "util.h" #include "util.h"
#include "version.h" #include "version.h"
#ifdef MACHINE_FIREBEE #if defined(MACHINE_FIREBEE)
#include "firebee.h" #include "firebee.h"
#endif /* MACHINE_FIREBEE */ #elif defined(MACHINE_M5484LITE)
#ifdef MACHINE_M5484LITE
#include "m5484l.h" #include "m5484l.h"
#elif defined(MACHINE_M54455)
#include "m54455.h"
#else
#error "unknown machine"
#endif /* MACHINE_M5484LITE */ #endif /* MACHINE_M5484LITE */
#
#include "dma.h" #include "dma.h"
#include "mod_devicetable.h" #include "mod_devicetable.h"
#include "pci_ids.h" #include "pci_ids.h"