From d1d368c26c8220b0f7e2cac0cc95a4f9d7d084c3 Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Sun, 20 Oct 2013 16:00:54 +0000 Subject: [PATCH] (MESS) ieee488: Moved under emu/bus. (nw) --- .gitattributes | 36 +++++++++---------- src/emu/bus/bus.mak | 22 ++++++++++-- src/{mess/machine => emu/bus/ieee488}/c2031.c | 0 src/{mess/machine => emu/bus/ieee488}/c2031.h | 2 +- src/{mess/machine => emu/bus/ieee488}/c2040.c | 0 src/{mess/machine => emu/bus/ieee488}/c2040.h | 2 +- src/{mess/machine => emu/bus/ieee488}/c8280.c | 0 src/{mess/machine => emu/bus/ieee488}/c8280.h | 2 +- src/{mess/machine => emu/bus/ieee488}/d9060.c | 2 +- src/{mess/machine => emu/bus/ieee488}/d9060.h | 3 +- .../machine => emu/bus/ieee488}/d9060hd.c | 2 +- .../machine => emu/bus/ieee488}/d9060hd.h | 0 .../machine => emu/bus/ieee488}/hardbox.c | 0 .../machine => emu/bus/ieee488}/hardbox.h | 2 +- .../machine => emu/bus/ieee488}/ieee488.c | 0 .../machine => emu/bus/ieee488}/ieee488.h | 14 ++++---- src/{mess/machine => emu/bus/ieee488}/shark.c | 0 src/{mess/machine => emu/bus/ieee488}/shark.h | 2 +- .../machine => emu/bus/ieee488}/softbox.c | 0 .../machine => emu/bus/ieee488}/softbox.h | 2 +- src/emu/emu.mak | 1 + src/mess/includes/cbm2.h | 2 +- src/mess/includes/osborne1.h | 2 +- src/mess/includes/pet.h | 2 +- src/mess/includes/sage2.h | 2 +- src/mess/includes/softbox.h | 2 +- src/mess/includes/tek405x.h | 2 +- src/mess/includes/vic20.h | 1 - src/mess/includes/victor9k.h | 2 +- src/mess/includes/vixen.h | 2 +- src/mess/machine/c64/ieee488.h | 4 +-- src/mess/machine/interpod.h | 2 +- src/mess/machine/vic1112.h | 3 +- src/mess/mess.mak | 10 +----- 34 files changed, 67 insertions(+), 61 deletions(-) rename src/{mess/machine => emu/bus/ieee488}/c2031.c (100%) rename src/{mess/machine => emu/bus/ieee488}/c2031.h (98%) rename src/{mess/machine => emu/bus/ieee488}/c2040.c (100%) rename src/{mess/machine => emu/bus/ieee488}/c2040.h (99%) rename src/{mess/machine => emu/bus/ieee488}/c8280.c (100%) rename src/{mess/machine => emu/bus/ieee488}/c8280.h (98%) rename src/{mess/machine => emu/bus/ieee488}/d9060.c (99%) rename src/{mess/machine => emu/bus/ieee488}/d9060.h (99%) rename src/{mess/machine => emu/bus/ieee488}/d9060hd.c (95%) rename src/{mess/machine => emu/bus/ieee488}/d9060hd.h (100%) rename src/{mess/machine => emu/bus/ieee488}/hardbox.c (100%) rename src/{mess/machine => emu/bus/ieee488}/hardbox.h (98%) rename src/{mess/machine => emu/bus/ieee488}/ieee488.c (100%) rename src/{mess/machine => emu/bus/ieee488}/ieee488.h (97%) rename src/{mess/machine => emu/bus/ieee488}/shark.c (100%) rename src/{mess/machine => emu/bus/ieee488}/shark.h (98%) rename src/{mess/machine => emu/bus/ieee488}/softbox.c (100%) rename src/{mess/machine => emu/bus/ieee488}/softbox.h (98%) diff --git a/.gitattributes b/.gitattributes index 855e683b873..5feb3cd40da 100644 --- a/.gitattributes +++ b/.gitattributes @@ -357,6 +357,24 @@ src/emu/attotime.h svneol=native#text/plain src/emu/audit.c svneol=native#text/plain src/emu/audit.h svneol=native#text/plain src/emu/bus/bus.mak svneol=native#text/plain +src/emu/bus/ieee488/c2031.c svneol=native#text/plain +src/emu/bus/ieee488/c2031.h svneol=native#text/plain +src/emu/bus/ieee488/c2040.c svneol=native#text/plain +src/emu/bus/ieee488/c2040.h svneol=native#text/plain +src/emu/bus/ieee488/c8280.c svneol=native#text/plain +src/emu/bus/ieee488/c8280.h svneol=native#text/plain +src/emu/bus/ieee488/d9060.c svneol=native#text/plain +src/emu/bus/ieee488/d9060.h svneol=native#text/plain +src/emu/bus/ieee488/d9060hd.c svneol=native#text/plain +src/emu/bus/ieee488/d9060hd.h svneol=native#text/plain +src/emu/bus/ieee488/hardbox.c svneol=native#text/plain +src/emu/bus/ieee488/hardbox.h svneol=native#text/plain +src/emu/bus/ieee488/ieee488.c svneol=native#text/plain +src/emu/bus/ieee488/ieee488.h svneol=native#text/plain +src/emu/bus/ieee488/shark.c svneol=native#text/plain +src/emu/bus/ieee488/shark.h svneol=native#text/plain +src/emu/bus/ieee488/softbox.c svneol=native#text/plain +src/emu/bus/ieee488/softbox.h svneol=native#text/plain src/emu/bus/isbx/compis_fdc.c svneol=native#text/plain src/emu/bus/isbx/compis_fdc.h svneol=native#text/plain src/emu/bus/isbx/isbx.c svneol=native#text/plain @@ -7250,10 +7268,6 @@ src/mess/machine/c1571.c svneol=native#text/plain src/mess/machine/c1571.h svneol=native#text/plain src/mess/machine/c1581.c svneol=native#text/plain src/mess/machine/c1581.h svneol=native#text/plain -src/mess/machine/c2031.c svneol=native#text/plain -src/mess/machine/c2031.h svneol=native#text/plain -src/mess/machine/c2040.c svneol=native#text/plain -src/mess/machine/c2040.h svneol=native#text/plain src/mess/machine/c2n.c svneol=native#text/plain src/mess/machine/c2n.h svneol=native#text/plain src/mess/machine/c64/16kb.c svneol=native#text/plain @@ -7403,8 +7417,6 @@ src/mess/machine/c64/zaxxon.h svneol=native#text/plain src/mess/machine/c64_nl10.c svneol=native#text/plain src/mess/machine/c64_nl10.h svneol=native#text/plain src/mess/machine/c65.c svneol=native#text/plain -src/mess/machine/c8280.c svneol=native#text/plain -src/mess/machine/c8280.h svneol=native#text/plain src/mess/machine/cbm2_24k.c svneol=native#text/plain src/mess/machine/cbm2_24k.h svneol=native#text/plain src/mess/machine/cbm2_graphic.c svneol=native#text/plain @@ -7489,10 +7501,6 @@ src/mess/machine/cx4fn.inc svneol=native#text/plain src/mess/machine/cx4oam.inc svneol=native#text/plain src/mess/machine/cx4ops.inc svneol=native#text/plain src/mess/machine/cybiko.c svneol=native#text/plain -src/mess/machine/d9060.c svneol=native#text/plain -src/mess/machine/d9060.h svneol=native#text/plain -src/mess/machine/d9060hd.c svneol=native#text/plain -src/mess/machine/d9060hd.h svneol=native#text/plain src/mess/machine/dai.c svneol=native#text/plain src/mess/machine/dccons.c svneol=native#text/plain src/mess/machine/dec_lk201.c svneol=native#text/plain @@ -7556,8 +7564,6 @@ src/mess/machine/gba_rom.h svneol=native#text/plain src/mess/machine/gba_slot.c svneol=native#text/plain src/mess/machine/gba_slot.h svneol=native#text/plain src/mess/machine/genpc.c svneol=native#text/plain -src/mess/machine/hardbox.c svneol=native#text/plain -src/mess/machine/hardbox.h svneol=native#text/plain src/mess/machine/hd63450.c svneol=native#text/plain src/mess/machine/hd63450.h svneol=native#text/plain src/mess/machine/hd64610.c svneol=native#text/plain @@ -7573,8 +7579,6 @@ src/mess/machine/i82439tx.c svneol=native#text/plain src/mess/machine/i82439tx.h svneol=native#text/plain src/mess/machine/i8271.c svneol=native#text/plain src/mess/machine/i8271.h svneol=native#text/plain -src/mess/machine/ieee488.c svneol=native#text/plain -src/mess/machine/ieee488.h svneol=native#text/plain src/mess/machine/imi5000h.c svneol=native#text/plain src/mess/machine/imi5000h.h svneol=native#text/plain src/mess/machine/interpod.c svneol=native#text/plain @@ -7984,8 +7988,6 @@ src/mess/machine/serialbox.c svneol=native#text/plain src/mess/machine/serialbox.h svneol=native#text/plain src/mess/machine/sgi.c svneol=native#text/plain src/mess/machine/sgi.h svneol=native#text/plain -src/mess/machine/shark.c svneol=native#text/plain -src/mess/machine/shark.h svneol=native#text/plain src/mess/machine/smartmed.c svneol=native#text/plain src/mess/machine/smartmed.h svneol=native#text/plain src/mess/machine/smc92x4.c svneol=native#text/plain @@ -8033,8 +8035,6 @@ src/mess/machine/sns_sufami.c svneol=native#text/plain src/mess/machine/sns_sufami.h svneol=native#text/plain src/mess/machine/sns_upd.c svneol=native#text/plain src/mess/machine/sns_upd.h svneol=native#text/plain -src/mess/machine/softbox.c svneol=native#text/plain -src/mess/machine/softbox.h svneol=native#text/plain src/mess/machine/sonydriv.c svneol=native#text/plain src/mess/machine/sonydriv.h svneol=native#text/plain src/mess/machine/sorcerer.c svneol=native#text/plain diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak index 71667261b16..789dd03343f 100644 --- a/src/emu/bus/bus.mak +++ b/src/emu/bus/bus.mak @@ -16,7 +16,25 @@ BUSOBJ = $(EMUOBJ)/bus #------------------------------------------------- # -#@src/emu/bus/isbx.h,BUSES += ISBX +#@src/emu/bus/ieee488/ieee488.h,BUSES += IEEE488 +#------------------------------------------------- + +ifneq ($(filter IEEE488,$(BUSES)),) +BUSOBJS += $(BUSOBJ)/ieee488/ieee488.o +BUSOBJS += $(BUSOBJ)/ieee488/c2031.o +BUSOBJS += $(BUSOBJ)/ieee488/c2040.o +BUSOBJS += $(BUSOBJ)/ieee488/c8280.o +BUSOBJS += $(BUSOBJ)/ieee488/d9060.o +BUSOBJS += $(BUSOBJ)/ieee488/d9060hd.o +BUSOBJS += $(BUSOBJ)/ieee488/softbox.o +BUSOBJS += $(BUSOBJ)/ieee488/hardbox.o +BUSOBJS += $(BUSOBJ)/ieee488/shark.o +endif + + +#------------------------------------------------- +# +#@src/emu/bus/isbx/isbx.h,BUSES += ISBX #------------------------------------------------- ifneq ($(filter ISBX,$(BUSES)),) @@ -27,7 +45,7 @@ endif #------------------------------------------------- # -#@src/emu/bus/isbx.h,BUSES += S100 +#@src/emu/bus/s100/s100.h,BUSES += S100 #------------------------------------------------- ifneq ($(filter S100,$(BUSES)),) diff --git a/src/mess/machine/c2031.c b/src/emu/bus/ieee488/c2031.c similarity index 100% rename from src/mess/machine/c2031.c rename to src/emu/bus/ieee488/c2031.c diff --git a/src/mess/machine/c2031.h b/src/emu/bus/ieee488/c2031.h similarity index 98% rename from src/mess/machine/c2031.h rename to src/emu/bus/ieee488/c2031.h index e0d48912d4f..0c3026f316b 100644 --- a/src/mess/machine/c2031.h +++ b/src/emu/bus/ieee488/c2031.h @@ -15,12 +15,12 @@ #define __C2031__ #include "emu.h" +#include "ieee488.h" #include "cpu/m6502/m6502.h" #include "imagedev/flopdrv.h" #include "machine/64h156.h" #include "machine/6522via.h" #include "machine/c1541.h" -#include "machine/ieee488.h" diff --git a/src/mess/machine/c2040.c b/src/emu/bus/ieee488/c2040.c similarity index 100% rename from src/mess/machine/c2040.c rename to src/emu/bus/ieee488/c2040.c diff --git a/src/mess/machine/c2040.h b/src/emu/bus/ieee488/c2040.h similarity index 99% rename from src/mess/machine/c2040.h rename to src/emu/bus/ieee488/c2040.h index 37feed1e951..65879f2f2f8 100644 --- a/src/mess/machine/c2040.h +++ b/src/emu/bus/ieee488/c2040.h @@ -15,6 +15,7 @@ #define __C2040__ #include "emu.h" +#include "ieee488.h" #include "cpu/m6502/m6502.h" #include "cpu/m6502/m6504.h" #include "imagedev/flopdrv.h" @@ -22,7 +23,6 @@ #include "formats/g64_dsk.h" #include "machine/6522via.h" #include "machine/6532riot.h" -#include "machine/ieee488.h" #include "machine/mos6530.h" diff --git a/src/mess/machine/c8280.c b/src/emu/bus/ieee488/c8280.c similarity index 100% rename from src/mess/machine/c8280.c rename to src/emu/bus/ieee488/c8280.c diff --git a/src/mess/machine/c8280.h b/src/emu/bus/ieee488/c8280.h similarity index 98% rename from src/mess/machine/c8280.h rename to src/emu/bus/ieee488/c8280.h index 7a2040db3ef..08b334241e0 100644 --- a/src/mess/machine/c8280.h +++ b/src/emu/bus/ieee488/c8280.h @@ -16,9 +16,9 @@ #include "emu.h" +#include "ieee488.h" #include "cpu/m6502/m6502.h" #include "machine/6532riot.h" -#include "machine/ieee488.h" #include "machine/wd_fdc.h" diff --git a/src/mess/machine/d9060.c b/src/emu/bus/ieee488/d9060.c similarity index 99% rename from src/mess/machine/d9060.c rename to src/emu/bus/ieee488/d9060.c index c5edbf023f8..441956d04f2 100644 --- a/src/mess/machine/d9060.c +++ b/src/emu/bus/ieee488/d9060.c @@ -10,9 +10,9 @@ **********************************************************************/ #include "d9060.h" +#include "d9060hd.h" #include "machine/scsibus.h" #include "machine/scsicb.h" -#include "machine/d9060hd.h" diff --git a/src/mess/machine/d9060.h b/src/emu/bus/ieee488/d9060.h similarity index 99% rename from src/mess/machine/d9060.h rename to src/emu/bus/ieee488/d9060.h index c3b34c45933..9f4053af99c 100644 --- a/src/mess/machine/d9060.h +++ b/src/emu/bus/ieee488/d9060.h @@ -25,12 +25,11 @@ #ifndef __D9060__ #define __D9060__ - #include "emu.h" +#include "ieee488.h" #include "cpu/m6502/m6502.h" #include "machine/6522via.h" #include "machine/6532riot.h" -#include "machine/ieee488.h" #include "machine/scsicb.h" diff --git a/src/mess/machine/d9060hd.c b/src/emu/bus/ieee488/d9060hd.c similarity index 95% rename from src/mess/machine/d9060hd.c rename to src/emu/bus/ieee488/d9060hd.c index bc18276d7f0..139c0139845 100644 --- a/src/mess/machine/d9060hd.c +++ b/src/emu/bus/ieee488/d9060hd.c @@ -4,7 +4,7 @@ */ #include "emu.h" -#include "machine/d9060hd.h" +#include "d9060hd.h" // device type definition const device_type D9060HD = &device_creator; diff --git a/src/mess/machine/d9060hd.h b/src/emu/bus/ieee488/d9060hd.h similarity index 100% rename from src/mess/machine/d9060hd.h rename to src/emu/bus/ieee488/d9060hd.h diff --git a/src/mess/machine/hardbox.c b/src/emu/bus/ieee488/hardbox.c similarity index 100% rename from src/mess/machine/hardbox.c rename to src/emu/bus/ieee488/hardbox.c diff --git a/src/mess/machine/hardbox.h b/src/emu/bus/ieee488/hardbox.h similarity index 98% rename from src/mess/machine/hardbox.h rename to src/emu/bus/ieee488/hardbox.h index 88ceee1026d..5c6c4631bdc 100644 --- a/src/mess/machine/hardbox.h +++ b/src/emu/bus/ieee488/hardbox.h @@ -15,11 +15,11 @@ #define __PET_HARDBOX__ #include "emu.h" +#include "ieee488.h" #include "cpu/z80/z80.h" #include "imagedev/harddriv.h" #include "includes/corvushd.h" #include "machine/i8255.h" -#include "machine/ieee488.h" #include "machine/serial.h" diff --git a/src/mess/machine/ieee488.c b/src/emu/bus/ieee488/ieee488.c similarity index 100% rename from src/mess/machine/ieee488.c rename to src/emu/bus/ieee488/ieee488.c diff --git a/src/mess/machine/ieee488.h b/src/emu/bus/ieee488/ieee488.h similarity index 97% rename from src/mess/machine/ieee488.h rename to src/emu/bus/ieee488/ieee488.h index 6732e57c08e..300098a1f1e 100644 --- a/src/mess/machine/ieee488.h +++ b/src/emu/bus/ieee488/ieee488.h @@ -250,13 +250,13 @@ extern const device_type IEEE488_SLOT; // slot devices -#include "machine/c2031.h" -#include "machine/c2040.h" -#include "machine/c8280.h" -#include "machine/d9060.h" -#include "machine/hardbox.h" -#include "machine/shark.h" -#include "machine/softbox.h" +#include "c2031.h" +#include "c2040.h" +#include "c8280.h" +#include "d9060.h" +#include "hardbox.h" +#include "shark.h" +#include "softbox.h" SLOT_INTERFACE_EXTERN( cbm_ieee488_devices ); diff --git a/src/mess/machine/shark.c b/src/emu/bus/ieee488/shark.c similarity index 100% rename from src/mess/machine/shark.c rename to src/emu/bus/ieee488/shark.c diff --git a/src/mess/machine/shark.h b/src/emu/bus/ieee488/shark.h similarity index 98% rename from src/mess/machine/shark.h rename to src/emu/bus/ieee488/shark.h index 55db920494a..f38fbd90501 100644 --- a/src/mess/machine/shark.h +++ b/src/emu/bus/ieee488/shark.h @@ -17,9 +17,9 @@ #define __SHARK__ #include "emu.h" +#include "ieee488.h" #include "cpu/i8085/i8085.h" #include "imagedev/harddriv.h" -#include "machine/ieee488.h" #include "machine/serial.h" diff --git a/src/mess/machine/softbox.c b/src/emu/bus/ieee488/softbox.c similarity index 100% rename from src/mess/machine/softbox.c rename to src/emu/bus/ieee488/softbox.c diff --git a/src/mess/machine/softbox.h b/src/emu/bus/ieee488/softbox.h similarity index 98% rename from src/mess/machine/softbox.h rename to src/emu/bus/ieee488/softbox.h index 2d488175d5b..f72f7ea0f83 100644 --- a/src/mess/machine/softbox.h +++ b/src/emu/bus/ieee488/softbox.h @@ -15,13 +15,13 @@ #define __PET_SOFTBOX__ #include "emu.h" +#include "ieee488.h" #include "cpu/z80/z80.h" #include "imagedev/harddriv.h" #include "includes/corvushd.h" #include "machine/com8116.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/ieee488.h" #include "machine/serial.h" diff --git a/src/emu/emu.mak b/src/emu/emu.mak index c19b76774e4..229a81aad90 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -28,6 +28,7 @@ OBJDIRS += \ $(EMUOBJ)/debugint \ $(EMUOBJ)/audio \ $(EMUOBJ)/bus \ + $(EMUOBJ)/bus/ieee488 \ $(EMUOBJ)/bus/isbx \ $(EMUOBJ)/bus/s100 \ $(EMUOBJ)/drivers \ diff --git a/src/mess/includes/cbm2.h b/src/mess/includes/cbm2.h index 8580554e5da..263baf7e5f0 100644 --- a/src/mess/includes/cbm2.h +++ b/src/mess/includes/cbm2.h @@ -6,6 +6,7 @@ #define __P500__ #include "emu.h" +#include "bus/ieee488/ieee488.h" #include "cpu/m6502/m6509.h" #include "cpu/i86/i86.h" #include "machine/cbm_snqk.h" @@ -14,7 +15,6 @@ #include "machine/cbm2user.h" #include "machine/ds75160a.h" #include "machine/ds75161a.h" -#include "machine/ieee488.h" #include "machine/mos6526.h" #include "machine/mos6551.h" #include "machine/petcass.h" diff --git a/src/mess/includes/osborne1.h b/src/mess/includes/osborne1.h index 4b3b8677260..f37c2fe8262 100644 --- a/src/mess/includes/osborne1.h +++ b/src/mess/includes/osborne1.h @@ -13,7 +13,7 @@ #include "sound/beep.h" #include "machine/6821pia.h" #include "machine/6850acia.h" -#include "machine/ieee488.h" +#include "bus/ieee488/ieee488.h" #include "machine/ram.h" #include "machine/wd17xx.h" #include "imagedev/flopdrv.h" diff --git a/src/mess/includes/pet.h b/src/mess/includes/pet.h index 2f6c1a4d05b..818b70eeb35 100644 --- a/src/mess/includes/pet.h +++ b/src/mess/includes/pet.h @@ -6,12 +6,12 @@ #define __PET__ #include "emu.h" +#include "bus/ieee488/ieee488.h" #include "cpu/m6502/m6502.h" #include "imagedev/cartslot.h" #include "machine/6522via.h" #include "machine/6821pia.h" #include "machine/cbm_snqk.h" -#include "machine/ieee488.h" #include "machine/petcass.h" #include "machine/petexp.h" #include "machine/petuser.h" diff --git a/src/mess/includes/sage2.h b/src/mess/includes/sage2.h index 44b46472b04..10dab16e2fc 100644 --- a/src/mess/includes/sage2.h +++ b/src/mess/includes/sage2.h @@ -6,7 +6,7 @@ #include "machine/ctronics.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/ieee488.h" +#include "bus/ieee488/ieee488.h" #include "machine/pit8253.h" #include "machine/pic8259.h" #include "machine/ram.h" diff --git a/src/mess/includes/softbox.h b/src/mess/includes/softbox.h index 587d22cf66c..1b1cc1fba16 100644 --- a/src/mess/includes/softbox.h +++ b/src/mess/includes/softbox.h @@ -12,7 +12,7 @@ #include "machine/com8116.h" #include "machine/i8251.h" #include "machine/i8255.h" -#include "machine/ieee488.h" +#include "bus/ieee488/ieee488.h" #include "machine/imi5000h.h" #include "machine/serial.h" diff --git a/src/mess/includes/tek405x.h b/src/mess/includes/tek405x.h index 0378bed01ac..f3eea941fa9 100644 --- a/src/mess/includes/tek405x.h +++ b/src/mess/includes/tek405x.h @@ -11,7 +11,7 @@ #include "machine/ram.h" #include "machine/6821pia.h" #include "machine/6850acia.h" -#include "machine/ieee488.h" +#include "bus/ieee488/ieee488.h" #include "machine/ram.h" #include "sound/speaker.h" #include "video/vector.h" diff --git a/src/mess/includes/vic20.h b/src/mess/includes/vic20.h index 65b74b9230d..b236d8eec8a 100644 --- a/src/mess/includes/vic20.h +++ b/src/mess/includes/vic20.h @@ -12,7 +12,6 @@ #include "imagedev/cartslot.h" #include "machine/6522via.h" #include "machine/cbmiec.h" -#include "machine/ieee488.h" #include "machine/petcass.h" #include "machine/ram.h" #include "machine/vcsctrl.h" diff --git a/src/mess/includes/victor9k.h b/src/mess/includes/victor9k.h index 65edb281ed1..88b470aa575 100644 --- a/src/mess/includes/victor9k.h +++ b/src/mess/includes/victor9k.h @@ -21,7 +21,7 @@ #include "machine/ram.h" #include "machine/ctronics.h" #include "machine/6522via.h" -#include "machine/ieee488.h" +#include "bus/ieee488/ieee488.h" #include "machine/mc6852.h" #include "machine/pit8253.h" #include "machine/pic8259.h" diff --git a/src/mess/includes/vixen.h b/src/mess/includes/vixen.h index bfbca9959c3..051a4d6eca7 100644 --- a/src/mess/includes/vixen.h +++ b/src/mess/includes/vixen.h @@ -7,7 +7,7 @@ #include "cpu/z80/z80.h" #include "machine/i8155.h" #include "machine/i8251.h" -#include "machine/ieee488.h" +#include "bus/ieee488/ieee488.h" #include "machine/ram.h" #include "machine/serial.h" #include "machine/wd_fdc.h" diff --git a/src/mess/machine/c64/ieee488.h b/src/mess/machine/c64/ieee488.h index 970a87253f4..f8d0a0d2f04 100644 --- a/src/mess/machine/c64/ieee488.h +++ b/src/mess/machine/c64/ieee488.h @@ -14,12 +14,10 @@ #ifndef __C64_IEEE488__ #define __C64_IEEE488__ - #include "emu.h" +#include "bus/ieee488/ieee488.h" #include "machine/6525tpi.h" #include "machine/c64/exp.h" -#include "machine/ieee488.h" -#include "video/mc6845.h" diff --git a/src/mess/machine/interpod.h b/src/mess/machine/interpod.h index fedfbeee5c8..c4be1f238fe 100644 --- a/src/mess/machine/interpod.h +++ b/src/mess/machine/interpod.h @@ -15,12 +15,12 @@ #define __INTERPOD__ #include "emu.h" +#include "bus/ieee488/ieee488.h" #include "cpu/m6502/m6502.h" #include "machine/6522via.h" #include "machine/6532riot.h" #include "machine/6850acia.h" #include "machine/cbmiec.h" -#include "machine/ieee488.h" diff --git a/src/mess/machine/vic1112.h b/src/mess/machine/vic1112.h index fb97e293e8d..a0db154df27 100644 --- a/src/mess/machine/vic1112.h +++ b/src/mess/machine/vic1112.h @@ -16,11 +16,10 @@ #ifndef __VIC1112__ #define __VIC1112__ - #include "emu.h" +#include "bus/ieee488/ieee488.h" #include "cpu/m6502/m6502.h" #include "machine/6522via.h" -#include "machine/ieee488.h" #include "machine/vic20exp.h" diff --git a/src/mess/mess.mak b/src/mess/mess.mak index 5903c746ee6..1465d745077 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -476,6 +476,7 @@ MACHINES += PCCARD # specify available bus cores #------------------------------------------------- +BUSES += IEEE488 BUSES += ISBX BUSES += S100 @@ -753,15 +754,6 @@ $(MESSOBJ)/shared.a: \ $(MESS_MACHINE)/dp8390.o \ $(MESS_MACHINE)/hd63450.o \ $(MESS_MACHINE)/i8271.o \ - $(MESS_MACHINE)/ieee488.o \ - $(MESS_MACHINE)/c2031.o \ - $(MESS_MACHINE)/c2040.o \ - $(MESS_MACHINE)/c8280.o \ - $(MESS_MACHINE)/d9060.o \ - $(MESS_MACHINE)/d9060hd.o \ - $(MESS_MACHINE)/softbox.o \ - $(MESS_MACHINE)/hardbox.o \ - $(MESS_MACHINE)/shark.o \ $(MESS_MACHINE)/imi5000h.o \ $(MESS_MACHINE)/kb3600.o \ $(MESS_MACHINE)/keyboard.o \