diff --git a/.gitattributes b/.gitattributes index 898ad5b2f9e..8ea93df7b00 100644 --- a/.gitattributes +++ b/.gitattributes @@ -639,6 +639,10 @@ src/emu/bus/cbmiec/interpod.c svneol=native#text/plain src/emu/bus/cbmiec/interpod.h svneol=native#text/plain src/emu/bus/cbmiec/serialbox.c svneol=native#text/plain src/emu/bus/cbmiec/serialbox.h svneol=native#text/plain +src/emu/bus/centronics/covox.c svneol=native#text/plain +src/emu/bus/centronics/covox.h svneol=native#text/plain +src/emu/bus/centronics/ctronics.c svneol=native#text/plain +src/emu/bus/centronics/ctronics.h svneol=native#text/plain src/emu/bus/comx35/clm.c svneol=native#text/plain src/emu/bus/comx35/clm.h svneol=native#text/plain src/emu/bus/comx35/eprom.c svneol=native#text/plain @@ -1750,8 +1754,6 @@ src/emu/machine/com8116.c svneol=native#text/plain src/emu/machine/com8116.h svneol=native#text/plain src/emu/machine/cr589.c svneol=native#text/plain src/emu/machine/cr589.h svneol=native#text/plain -src/emu/machine/ctronics.c svneol=native#text/plain -src/emu/machine/ctronics.h svneol=native#text/plain src/emu/machine/ds1302.c svneol=native#text/plain src/emu/machine/ds1302.h svneol=native#text/plain src/emu/machine/ds2401.c svneol=native#text/plain @@ -7630,8 +7632,6 @@ src/mess/machine/c65.c svneol=native#text/plain src/mess/machine/cbm_snqk.c svneol=native#text/plain src/mess/machine/cbm_snqk.h svneol=native#text/plain src/mess/machine/cgenie.c svneol=native#text/plain -src/mess/machine/cntr_covox.c svneol=native#text/plain -src/mess/machine/cntr_covox.h svneol=native#text/plain src/mess/machine/coco.c svneol=native#text/plain src/mess/machine/coco12.c svneol=native#text/plain src/mess/machine/coco3.c svneol=native#text/plain diff --git a/src/emu/bus/adam/ide.h b/src/emu/bus/adam/ide.h index 11950249301..4d28c6c418e 100644 --- a/src/emu/bus/adam/ide.h +++ b/src/emu/bus/adam/ide.h @@ -16,7 +16,7 @@ #include "emu.h" #include "exp.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/ataintf.h" diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak index 3dd7090ef2f..0fca98beb96 100644 --- a/src/emu/bus/bus.mak +++ b/src/emu/bus/bus.mak @@ -489,3 +489,12 @@ BUSOBJS += $(BUSOBJ)/nubus/pds30_30hr.o BUSOBJS += $(BUSOBJ)/nubus/pds30_mc30.o endif +#------------------------------------------------- +# +#@src/emu/bus/centronics/ctronics.h,BUSES += CENTRONICS +#------------------------------------------------- + +ifneq ($(filter CENTRONICS,$(BUSES)),) +BUSOBJS += $(BUSOBJ)/centronics/ctronics.o +BUSOBJS += $(BUSOBJ)/centronics/covox.o +endif diff --git a/src/emu/bus/c64/geocable.h b/src/emu/bus/c64/geocable.h index 240e267bc78..2b8a0a4de20 100644 --- a/src/emu/bus/c64/geocable.h +++ b/src/emu/bus/c64/geocable.h @@ -17,7 +17,7 @@ #include "emu.h" #include "user.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" diff --git a/src/emu/bus/cbmiec/c1541.h b/src/emu/bus/cbmiec/c1541.h index bd526ab39f2..85538aa2712 100644 --- a/src/emu/bus/cbmiec/c1541.h +++ b/src/emu/bus/cbmiec/c1541.h @@ -24,7 +24,7 @@ #include "machine/64h156.h" #include "machine/6522via.h" #include "machine/6821pia.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" diff --git a/src/mess/machine/cntr_covox.c b/src/emu/bus/centronics/covox.c similarity index 97% rename from src/mess/machine/cntr_covox.c rename to src/emu/bus/centronics/covox.c index a2582a5b04b..076569166c5 100644 --- a/src/mess/machine/cntr_covox.c +++ b/src/emu/bus/centronics/covox.c @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Miodrag Milanovic /*************************************************************************** Covox Speech Thing @@ -6,7 +8,7 @@ #include "emu.h" #include "sound/dac.h" -#include "cntr_covox.h" +#include "covox.h" //************************************************************************** // COVOX DEVICE diff --git a/src/mess/machine/cntr_covox.h b/src/emu/bus/centronics/covox.h similarity index 94% rename from src/mess/machine/cntr_covox.h rename to src/emu/bus/centronics/covox.h index 408d69f5a0d..f4a5fa5d8eb 100644 --- a/src/mess/machine/cntr_covox.h +++ b/src/emu/bus/centronics/covox.h @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Miodrag Milanovic /*************************************************************************** Covox Speech Thing @@ -7,7 +9,7 @@ #ifndef __CENTRONICS_COVOX_H__ #define __CENTRONICS_COVOX_H__ -#include "machine/ctronics.h" +#include "ctronics.h" #include "sound/dac.h" // ======================> centronics_covox_device diff --git a/src/emu/machine/ctronics.c b/src/emu/bus/centronics/ctronics.c similarity index 100% rename from src/emu/machine/ctronics.c rename to src/emu/bus/centronics/ctronics.c diff --git a/src/emu/machine/ctronics.h b/src/emu/bus/centronics/ctronics.h similarity index 100% rename from src/emu/machine/ctronics.h rename to src/emu/bus/centronics/ctronics.h diff --git a/src/emu/bus/comx35/printer.h b/src/emu/bus/comx35/printer.h index 5f0f4763c2b..1656401f01a 100644 --- a/src/emu/bus/comx35/printer.h +++ b/src/emu/bus/comx35/printer.h @@ -16,7 +16,7 @@ #include "emu.h" #include "exp.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" diff --git a/src/emu/bus/ecbbus/grip.h b/src/emu/bus/ecbbus/grip.h index 269cade9752..c4751e37c13 100644 --- a/src/emu/bus/ecbbus/grip.h +++ b/src/emu/bus/ecbbus/grip.h @@ -18,7 +18,7 @@ #include "ecbbus.h" #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/keyboard.h" #include "machine/z80sti.h" diff --git a/src/emu/bus/econet/e01.h b/src/emu/bus/econet/e01.h index bea01f4768c..84544baccf3 100644 --- a/src/emu/bus/econet/e01.h +++ b/src/emu/bus/econet/e01.h @@ -18,7 +18,7 @@ #include "econet.h" #include "cpu/m6502/m65c02.h" #include "machine/6522via.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/mc146818.h" #include "machine/mc6854.h" #include "machine/ram.h" diff --git a/src/emu/emu.mak b/src/emu/emu.mak index bda24983acc..0f94fb2c3c2 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -53,6 +53,7 @@ OBJDIRS += \ $(EMUOBJ)/bus/wangpc \ $(EMUOBJ)/bus/a2bus \ $(EMUOBJ)/bus/nubus \ + $(EMUOBJ)/bus/centronics \ $(EMUOBJ)/drivers \ $(EMUOBJ)/machine \ $(EMUOBJ)/layout \ diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak index ad402869303..64243b54dad 100644 --- a/src/emu/machine/machine.mak +++ b/src/emu/machine/machine.mak @@ -381,15 +381,6 @@ ifneq ($(filter CR589,$(MACHINES)),) MACHINEOBJS += $(MACHINEOBJ)/cr589.o endif -#------------------------------------------------- -# -#@src/emu/machine/ctronics.h,MACHINES += CTRONICS -#------------------------------------------------- - -ifneq ($(filter CTRONICS,$(MACHINES)),) -MACHINEOBJS += $(MACHINEOBJ)/ctronics.o -endif - #------------------------------------------------- # #@src/emu/machine/ds1302.h,MACHINES += DS1302 diff --git a/src/mame/mame.mak b/src/mame/mame.mak index baf5a388c34..e03a5d52ddb 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -363,7 +363,6 @@ MACHINES += CDP1871 MACHINES += CDU76S MACHINES += COM8116 MACHINES += CR589 -MACHINES += CTRONICS MACHINES += DS1302 MACHINES += DS2401 MACHINES += DS2404 diff --git a/src/mess/drivers/ace.c b/src/mess/drivers/ace.c index 278f684e9ce..14d01b73997 100644 --- a/src/mess/drivers/ace.c +++ b/src/mess/drivers/ace.c @@ -47,7 +47,7 @@ Ports: #include "formats/ace_tap.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/ram.h" #include "machine/z80pio.h" diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index b1e6c8b766a..711af8d579d 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -61,7 +61,7 @@ very fussy with the state machine. #include "machine/amigacd.h" #include "machine/amigacrt.h" #include "machine/msm6242.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/nvram.h" #include "sound/cdda.h" #include "machine/i2cmem.h" diff --git a/src/mess/drivers/amstrad.c b/src/mess/drivers/amstrad.c index 5955a6ec555..9ad04e87db5 100644 --- a/src/mess/drivers/amstrad.c +++ b/src/mess/drivers/amstrad.c @@ -98,7 +98,7 @@ Some bugs left : #include "sound/ay8910.h" #include "sound/wave.h" #include "machine/mc146818.h" /* Aleste RTC */ -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" /* Devices */ #include "imagedev/snapquik.h" diff --git a/src/mess/drivers/applix.c b/src/mess/drivers/applix.c index 3419c261a2f..285fe9bc2d1 100644 --- a/src/mess/drivers/applix.c +++ b/src/mess/drivers/applix.c @@ -47,7 +47,7 @@ #include "machine/wd_fdc.h" #include "formats/applix_dsk.h" #include "imagedev/cassette.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c index ec9ea281a24..9e17305de03 100644 --- a/src/mess/drivers/apricot.c +++ b/src/mess/drivers/apricot.c @@ -19,7 +19,7 @@ #include "machine/pic8259.h" #include "machine/z80dart.h" #include "machine/serial.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/wd_fdc.h" #include "video/mc6845.h" #include "sound/sn76496.h" diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c index b479f22b7f9..1d6c9683406 100644 --- a/src/mess/drivers/bbc.c +++ b/src/mess/drivers/bbc.c @@ -18,7 +18,7 @@ #include "machine/mc146818.h" #include "machine/mc6854.h" #include "machine/upd7002.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "imagedev/flopdrv.h" #include "formats/basicdsk.h" #include "imagedev/cartslot.h" diff --git a/src/mess/drivers/elwro800.c b/src/mess/drivers/elwro800.c index 0b259531ea5..ebf1f3ddeac 100644 --- a/src/mess/drivers/elwro800.c +++ b/src/mess/drivers/elwro800.c @@ -21,7 +21,7 @@ #include "machine/i8255.h" #include "sound/speaker.h" #include "sound/wave.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8251.h" /* Devices */ diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c index b6ad05fd164..b93fdeaf84f 100644 --- a/src/mess/drivers/fm7.c +++ b/src/mess/drivers/fm7.c @@ -48,7 +48,7 @@ #include "formats/fm7_cas.h" #include "machine/wd17xx.h" #include "imagedev/flopdrv.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "includes/fm7.h" diff --git a/src/mess/drivers/m5.c b/src/mess/drivers/m5.c index f7a539ca3e1..cb6d35de041 100644 --- a/src/mess/drivers/m5.c +++ b/src/mess/drivers/m5.c @@ -27,7 +27,7 @@ #include "formats/sord_cas.h" #include "imagedev/cartslot.h" #include "imagedev/cassette.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/ram.h" #include "machine/upd765.h" diff --git a/src/mess/drivers/mtx.c b/src/mess/drivers/mtx.c index cac8ea43519..b948837717e 100644 --- a/src/mess/drivers/mtx.c +++ b/src/mess/drivers/mtx.c @@ -29,7 +29,7 @@ #include "imagedev/cassette.h" #include "machine/ram.h" #include "imagedev/snapquik.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" #include "video/tms9928a.h" diff --git a/src/mess/drivers/mz700.c b/src/mess/drivers/mz700.c index eb87cc20dea..558048edb94 100644 --- a/src/mess/drivers/mz700.c +++ b/src/mess/drivers/mz700.c @@ -69,7 +69,7 @@ #include "machine/pit8253.h" #include "machine/z80pio.h" #include "machine/74145.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "sound/sn76496.h" #include "sound/speaker.h" #include "sound/wave.h" diff --git a/src/mess/drivers/nc.c b/src/mess/drivers/nc.c index 8b106b14b8c..993e9e90094 100644 --- a/src/mess/drivers/nc.c +++ b/src/mess/drivers/nc.c @@ -97,7 +97,7 @@ #include "emuopts.h" #include "cpu/z80/z80.h" #include "includes/nc.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8251.h" /* for NC100 uart */ #include "machine/mc146818.h" /* for NC200 real time clock */ #include "machine/rp5c01.h" /* for NC100 real time clock */ diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c index 8fc5e28ef83..e77a75f5728 100644 --- a/src/mess/drivers/pc8801.c +++ b/src/mess/drivers/pc8801.c @@ -257,7 +257,7 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "imagedev/cassette.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/upd1990a.h" #include "machine/upd765.h" diff --git a/src/mess/drivers/pencil2.c b/src/mess/drivers/pencil2.c index 1f9eb924475..114b07f30e6 100644 --- a/src/mess/drivers/pencil2.c +++ b/src/mess/drivers/pencil2.c @@ -77,7 +77,7 @@ ToDo: #include "cpu/z80/z80.h" #include "video/tms9928a.h" #include "sound/sn76496.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" //#include "imagedev/cartslot.h" #include "imagedev/cassette.h" #include "sound/wave.h" diff --git a/src/mess/drivers/prof180x.c b/src/mess/drivers/prof180x.c index 37359677984..717fd34d256 100644 --- a/src/mess/drivers/prof180x.c +++ b/src/mess/drivers/prof180x.c @@ -26,7 +26,7 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "machine/ram.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/upd765.h" #include "includes/prof180x.h" diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c index bd87038d7a9..1ebd4faa3ac 100644 --- a/src/mess/drivers/px4.c +++ b/src/mess/drivers/px4.c @@ -14,7 +14,7 @@ #include "cpu/z80/z80.h" #include "machine/ram.h" #include "machine/epson_sio.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "imagedev/cartslot.h" #include "imagedev/cassette.h" #include "machine/ram.h" diff --git a/src/mess/drivers/rmnimbus.c b/src/mess/drivers/rmnimbus.c index 6a268250728..8c6898a1d0b 100644 --- a/src/mess/drivers/rmnimbus.c +++ b/src/mess/drivers/rmnimbus.c @@ -20,7 +20,7 @@ #include "machine/s1410.h" #include "machine/acb4070.h" #include "machine/6522via.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "sound/ay8910.h" #include "sound/msm5205.h" diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c index e90602afa05..1e51cba9fb3 100644 --- a/src/mess/drivers/samcoupe.c +++ b/src/mess/drivers/samcoupe.c @@ -34,7 +34,7 @@ #include "cpu/z80/z80.h" #include "machine/wd_fdc.h" #include "machine/msm6242.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "sound/saa1099.h" #include "sound/speaker.h" diff --git a/src/mess/drivers/svi318.c b/src/mess/drivers/svi318.c index 3b91184ef43..30679b36e6f 100644 --- a/src/mess/drivers/svi318.c +++ b/src/mess/drivers/svi318.c @@ -17,7 +17,7 @@ #include "video/tms9928a.h" #include "machine/i8255.h" #include "machine/wd17xx.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "imagedev/flopdrv.h" #include "formats/svi_dsk.h" #include "imagedev/cartslot.h" diff --git a/src/mess/drivers/thomson.c b/src/mess/drivers/thomson.c index ecd94890df7..7a9a3851702 100644 --- a/src/mess/drivers/thomson.c +++ b/src/mess/drivers/thomson.c @@ -71,7 +71,7 @@ #include "includes/thomson.h" #include "machine/6821pia.h" #include "machine/wd17xx.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "imagedev/flopdrv.h" #include "imagedev/serial.h" #include "formats/basicdsk.h" diff --git a/src/mess/drivers/tutor.c b/src/mess/drivers/tutor.c index 1abf30f3935..f048de1ab85 100644 --- a/src/mess/drivers/tutor.c +++ b/src/mess/drivers/tutor.c @@ -179,7 +179,7 @@ A=AMA, P=PRO, these keys don't exist, and so the games cannot be played. #include "imagedev/cartslot.h" #include "imagedev/cassette.h" #include "sound/sn76496.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" class tutor_state : public driver_device diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c index 5483c9f9b6f..65dfd75e914 100644 --- a/src/mess/drivers/vtech1.c +++ b/src/mess/drivers/vtech1.c @@ -100,7 +100,7 @@ Notes: #include "formats/imageutl.h" #include "cpu/z80/z80.h" #include "video/mc6847.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "sound/wave.h" #include "sound/speaker.h" #include "imagedev/cartslot.h" diff --git a/src/mess/includes/amstrad.h b/src/mess/includes/amstrad.h index d20585d558f..165f243cff1 100644 --- a/src/mess/includes/amstrad.h +++ b/src/mess/includes/amstrad.h @@ -19,7 +19,7 @@ #include "machine/mface2.h" #include "machine/ram.h" #include "imagedev/cassette.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" /**************************** * Gate Array data (CPC) - diff --git a/src/mess/includes/apricotf.h b/src/mess/includes/apricotf.h index d9c8c312b79..d966d6a1c35 100644 --- a/src/mess/includes/apricotf.h +++ b/src/mess/includes/apricotf.h @@ -10,7 +10,7 @@ #include "formats/basicdsk.h" #include "imagedev/flopdrv.h" #include "machine/apricotkb.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/wd_fdc.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" diff --git a/src/mess/includes/apricotp.h b/src/mess/includes/apricotp.h index 5dc56708fde..b1a9d69629d 100644 --- a/src/mess/includes/apricotp.h +++ b/src/mess/includes/apricotp.h @@ -9,7 +9,7 @@ #include "cpu/m6800/m6800.h" #include "machine/am9517a.h" #include "machine/apricotkb.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/ram.h" diff --git a/src/mess/includes/atarist.h b/src/mess/includes/atarist.h index 58f7e717d23..e264a0508bb 100644 --- a/src/mess/includes/atarist.h +++ b/src/mess/includes/atarist.h @@ -11,7 +11,7 @@ #include "imagedev/cartslot.h" #include "machine/6850acia.h" #include "machine/8530scc.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/mc68901.h" #include "machine/midiinport.h" #include "machine/midioutport.h" diff --git a/src/mess/includes/atom.h b/src/mess/includes/atom.h index e9fba6dfa7f..c67342d54cb 100644 --- a/src/mess/includes/atom.h +++ b/src/mess/includes/atom.h @@ -14,7 +14,7 @@ #include "formats/atom_tap.h" #include "formats/basicdsk.h" #include "formats/uef_cas.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/6522via.h" #include "machine/i8255.h" #include "machine/i8271.h" diff --git a/src/mess/includes/bullet.h b/src/mess/includes/bullet.h index 6fdd02fa291..c2a54b8a0b8 100644 --- a/src/mess/includes/bullet.h +++ b/src/mess/includes/bullet.h @@ -7,7 +7,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/ram.h" #include "machine/scsibus.h" #include "machine/scsicb.h" diff --git a/src/mess/includes/bw12.h b/src/mess/includes/bw12.h index 445526819ea..f543bdc36b7 100644 --- a/src/mess/includes/bw12.h +++ b/src/mess/includes/bw12.h @@ -6,7 +6,7 @@ #include "machine/ram.h" #include "formats/bw12_dsk.h" #include "machine/6821pia.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/kb3600.h" #include "machine/pit8253.h" #include "machine/ram.h" diff --git a/src/mess/includes/bw2.h b/src/mess/includes/bw2.h index d6f1ef682c3..f27b8c4a03c 100644 --- a/src/mess/includes/bw2.h +++ b/src/mess/includes/bw2.h @@ -9,7 +9,7 @@ #include "bus/bw2/exp.h" #include "cpu/z80/z80.h" #include "formats/bw2_dsk.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8251.h" #include "machine/i8255.h" #include "machine/pit8253.h" diff --git a/src/mess/includes/compis.h b/src/mess/includes/compis.h index 225f18b1ac5..d47c6e63976 100644 --- a/src/mess/includes/compis.h +++ b/src/mess/includes/compis.h @@ -18,7 +18,7 @@ #include "cpu/mcs48/mcs48.h" #include "imagedev/cassette.h" #include "machine/compiskb.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8251.h" #include "machine/i8255.h" #include "machine/mm58274c.h" diff --git a/src/mess/includes/crvision.h b/src/mess/includes/crvision.h index 10301edb0af..035112a6083 100644 --- a/src/mess/includes/crvision.h +++ b/src/mess/includes/crvision.h @@ -9,7 +9,7 @@ #include "imagedev/cartslot.h" #include "imagedev/cassette.h" #include "machine/6821pia.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/ram.h" #include "sound/sn76496.h" #include "sound/wave.h" diff --git a/src/mess/includes/einstein.h b/src/mess/includes/einstein.h index ed7444a708e..39ac2a613bf 100644 --- a/src/mess/includes/einstein.h +++ b/src/mess/includes/einstein.h @@ -18,7 +18,7 @@ #include "video/tms9928a.h" #include "machine/ram.h" #include "machine/i8251.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" /*************************************************************************** CONSTANTS diff --git a/src/mess/includes/ep64.h b/src/mess/includes/ep64.h index e827e28d834..08858c22e95 100644 --- a/src/mess/includes/ep64.h +++ b/src/mess/includes/ep64.h @@ -20,7 +20,7 @@ #include "cpu/z80/z80.h" #include "imagedev/cartslot.h" #include "imagedev/cassette.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/ram.h" #include "machine/serial.h" #include "video/nick.h" diff --git a/src/mess/includes/jtc.h b/src/mess/includes/jtc.h index 5a596d45260..7240532551f 100644 --- a/src/mess/includes/jtc.h +++ b/src/mess/includes/jtc.h @@ -7,7 +7,7 @@ #include "emu.h" #include "cpu/z8/z8.h" #include "imagedev/cassette.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/ram.h" #include "sound/speaker.h" #include "sound/wave.h" diff --git a/src/mess/includes/kaypro.h b/src/mess/includes/kaypro.h index ec3ff312d6d..e213e98adf3 100644 --- a/src/mess/includes/kaypro.h +++ b/src/mess/includes/kaypro.h @@ -4,7 +4,7 @@ #include "machine/z80pio.h" #include "machine/z80sio.h" #include "machine/com8116.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "imagedev/snapquik.h" #include "sound/beep.h" #include "video/mc6845.h" diff --git a/src/mess/includes/kyocera.h b/src/mess/includes/kyocera.h index 038772b9917..e8d3a743a29 100644 --- a/src/mess/includes/kyocera.h +++ b/src/mess/includes/kyocera.h @@ -10,7 +10,7 @@ #include "cpu/i8085/i8085.h" #include "imagedev/cartslot.h" #include "imagedev/cassette.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8155.h" #include "machine/i8251.h" #include "machine/im6402.h" diff --git a/src/mess/includes/mbc55x.h b/src/mess/includes/mbc55x.h index 081ffd669c4..82e056097c8 100644 --- a/src/mess/includes/mbc55x.h +++ b/src/mess/includes/mbc55x.h @@ -9,7 +9,7 @@ #include "emu.h" #include "cpu/i86/i86.h" #include "machine/ram.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/pit8253.h" #include "machine/pic8259.h" diff --git a/src/mess/includes/mbee.h b/src/mess/includes/mbee.h index f106d04527b..811008529aa 100644 --- a/src/mess/includes/mbee.h +++ b/src/mess/includes/mbee.h @@ -11,7 +11,7 @@ #include "imagedev/snapquik.h" #include "machine/z80pio.h" #include "imagedev/cassette.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/mc146818.h" #include "video/mc6845.h" #include "sound/speaker.h" diff --git a/src/mess/includes/mc1000.h b/src/mess/includes/mc1000.h index efa7dbe5539..93595940f79 100644 --- a/src/mess/includes/mc1000.h +++ b/src/mess/includes/mc1000.h @@ -10,7 +10,7 @@ #include "video/mc6845.h" #include "video/mc6847.h" #include "sound/ay8910.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/rescap.h" #include "machine/ram.h" diff --git a/src/mess/includes/msx.h b/src/mess/includes/msx.h index 81ce5a7f431..205f686a013 100644 --- a/src/mess/includes/msx.h +++ b/src/mess/includes/msx.h @@ -12,7 +12,7 @@ #include "machine/i8255.h" #include "machine/rp5c01.h" #include "machine/wd17xx.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "sound/ay8910.h" #include "sound/dac.h" #include "sound/wave.h" diff --git a/src/mess/includes/mtx.h b/src/mess/includes/mtx.h index 3620171a17b..2b84f0f2a0e 100644 --- a/src/mess/includes/mtx.h +++ b/src/mess/includes/mtx.h @@ -12,7 +12,7 @@ #include "imagedev/snapquik.h" #include "imagedev/cassette.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/z80dart.h" #include "machine/z80ctc.h" #include "sound/sn76496.h" diff --git a/src/mess/includes/oric.h b/src/mess/includes/oric.h index c226ca29e54..2f5991691ab 100644 --- a/src/mess/includes/oric.h +++ b/src/mess/includes/oric.h @@ -13,7 +13,7 @@ #include "sound/wave.h" #include "machine/6522via.h" #include "machine/mos6551.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/wd17xx.h" //#include #include "machine/applefdc.h" diff --git a/src/mess/includes/pc.h b/src/mess/includes/pc.h index 91daf65a151..3acf0debaa3 100644 --- a/src/mess/includes/pc.h +++ b/src/mess/includes/pc.h @@ -20,7 +20,7 @@ #include "machine/ram.h" #include "machine/pic8259.h" #include "machine/pit8253.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" class pc_state : public driver_device { diff --git a/src/mess/includes/pc1512.h b/src/mess/includes/pc1512.h index caf2a518a29..268c7753362 100644 --- a/src/mess/includes/pc1512.h +++ b/src/mess/includes/pc1512.h @@ -10,7 +10,7 @@ #include "cpu/mcs48/mcs48.h" #include "formats/pc_dsk.h" #include "machine/am9517a.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/ins8250.h" #include "machine/isa.h" #include "machine/isa_cards.h" diff --git a/src/mess/includes/pc8001.h b/src/mess/includes/pc8001.h index f0c113bb82d..1d6438f301b 100644 --- a/src/mess/includes/pc8001.h +++ b/src/mess/includes/pc8001.h @@ -9,7 +9,7 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "imagedev/cassette.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/8257dma.h" #include "machine/i8255.h" #include "machine/i8251.h" diff --git a/src/mess/includes/phc25.h b/src/mess/includes/phc25.h index ca1df977858..d8aa4fd6734 100644 --- a/src/mess/includes/phc25.h +++ b/src/mess/includes/phc25.h @@ -10,7 +10,7 @@ #include "cpu/z80/z80.h" #include "imagedev/cassette.h" #include "machine/ram.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "video/mc6847.h" #include "sound/ay8910.h" diff --git a/src/mess/includes/portfoli.h b/src/mess/includes/portfoli.h index cacfdbf0e55..e1f70972086 100644 --- a/src/mess/includes/portfoli.h +++ b/src/mess/includes/portfoli.h @@ -9,7 +9,7 @@ #include "cpu/i86/i86.h" #include "imagedev/cartslot.h" #include "imagedev/printer.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/ins8250.h" #include "machine/nvram.h" diff --git a/src/mess/includes/sage2.h b/src/mess/includes/sage2.h index 10dab16e2fc..8550e0d8936 100644 --- a/src/mess/includes/sage2.h +++ b/src/mess/includes/sage2.h @@ -3,7 +3,7 @@ #include "emu.h" #include "cpu/m68000/m68000.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8251.h" #include "machine/i8255.h" #include "bus/ieee488/ieee488.h" diff --git a/src/mess/includes/sg1000.h b/src/mess/includes/sg1000.h index 9ee050b7a21..37aabe47b93 100644 --- a/src/mess/includes/sg1000.h +++ b/src/mess/includes/sg1000.h @@ -10,7 +10,7 @@ #include "imagedev/cartslot.h" #include "imagedev/cassette.h" #include "imagedev/printer.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/i8251.h" #include "machine/ram.h" diff --git a/src/mess/includes/sorcerer.h b/src/mess/includes/sorcerer.h index 7329babdb64..b09d19fb2c6 100644 --- a/src/mess/includes/sorcerer.h +++ b/src/mess/includes/sorcerer.h @@ -12,7 +12,7 @@ #include "sound/dac.h" #include "sound/wave.h" #include "machine/ay31015.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/ram.h" #include "imagedev/cartslot.h" #include "imagedev/cassette.h" diff --git a/src/mess/includes/super80.h b/src/mess/includes/super80.h index 0d11d2df066..59a18910908 100644 --- a/src/mess/includes/super80.h +++ b/src/mess/includes/super80.h @@ -6,7 +6,7 @@ #include "imagedev/cartslot.h" #include "imagedev/cassette.h" #include "sound/speaker.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "video/mc6845.h" #include "machine/z80pio.h" diff --git a/src/mess/includes/svi318.h b/src/mess/includes/svi318.h index a1007d1f6cf..ec97b7e9d3a 100644 --- a/src/mess/includes/svi318.h +++ b/src/mess/includes/svi318.h @@ -15,7 +15,7 @@ #include "imagedev/cassette.h" #include "sound/dac.h" #include "machine/ram.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" struct SVI_318 diff --git a/src/mess/includes/tandy2k.h b/src/mess/includes/tandy2k.h index 382be478b13..446e2f2c782 100644 --- a/src/mess/includes/tandy2k.h +++ b/src/mess/includes/tandy2k.h @@ -8,7 +8,7 @@ #include "cpu/i86/i186.h" #include "cpu/mcs48/mcs48.h" #include "imagedev/harddriv.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/i8251.h" #include "machine/pit8253.h" diff --git a/src/mess/includes/thomson.h b/src/mess/includes/thomson.h index 2503e34b5bd..da1a6bd2858 100644 --- a/src/mess/includes/thomson.h +++ b/src/mess/includes/thomson.h @@ -17,7 +17,7 @@ #include "machine/mos6551.h" #include "sound/dac.h" #include "audio/mea8000.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "imagedev/cartslot.h" #include "imagedev/cassette.h" #include "machine/mc6843.h" diff --git a/src/mess/includes/tmc600.h b/src/mess/includes/tmc600.h index 6e6bee2ca1c..cfdae9b359c 100644 --- a/src/mess/includes/tmc600.h +++ b/src/mess/includes/tmc600.h @@ -10,7 +10,7 @@ #include "cpu/cosmac/cosmac.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/ram.h" #include "sound/cdp1869.h" diff --git a/src/mess/includes/trs80.h b/src/mess/includes/trs80.h index f53f6fd7f3b..c6a7e37d91e 100644 --- a/src/mess/includes/trs80.h +++ b/src/mess/includes/trs80.h @@ -12,7 +12,7 @@ #include "sound/speaker.h" #include "sound/wave.h" #include "machine/ay31015.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/wd17xx.h" #include "imagedev/cassette.h" #include "imagedev/flopdrv.h" diff --git a/src/mess/includes/trs80m2.h b/src/mess/includes/trs80m2.h index 957b5d0a11f..8428112e3be 100644 --- a/src/mess/includes/trs80m2.h +++ b/src/mess/includes/trs80m2.h @@ -11,7 +11,7 @@ #include "cpu/z80/z80daisy.h" #include "cpu/mcs48/mcs48.h" #include "cpu/m68000/m68000.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/keyboard.h" #include "machine/pic8259.h" #include "machine/ram.h" diff --git a/src/mess/includes/tvc.h b/src/mess/includes/tvc.h index 2d6b324778f..022f5d4b08b 100644 --- a/src/mess/includes/tvc.h +++ b/src/mess/includes/tvc.h @@ -12,7 +12,7 @@ #include "cpu/z80/z80.h" #include "video/mc6845.h" #include "machine/ram.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "imagedev/cartslot.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" diff --git a/src/mess/includes/v1050.h b/src/mess/includes/v1050.h index 193e4ee5595..5a4e2e1dfc5 100644 --- a/src/mess/includes/v1050.h +++ b/src/mess/includes/v1050.h @@ -9,7 +9,7 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "cpu/m6502/m6502.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8214.h" #include "machine/i8251.h" #include "machine/i8255.h" diff --git a/src/mess/includes/victor9k.h b/src/mess/includes/victor9k.h index 88b470aa575..fdd0b23f6ff 100644 --- a/src/mess/includes/victor9k.h +++ b/src/mess/includes/victor9k.h @@ -19,7 +19,7 @@ #include "cpu/mcs48/mcs48.h" #include "imagedev/floppy.h" #include "machine/ram.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/6522via.h" #include "bus/ieee488/ieee488.h" #include "machine/mc6852.h" diff --git a/src/mess/includes/wangpc.h b/src/mess/includes/wangpc.h index 7df88a69e46..cff43f900f1 100644 --- a/src/mess/includes/wangpc.h +++ b/src/mess/includes/wangpc.h @@ -10,7 +10,7 @@ #include "cpu/i86/i86.h" #include "formats/pc_dsk.h" #include "machine/am9517a.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/im6402.h" #include "machine/mc2661.h" diff --git a/src/mess/includes/xor100.h b/src/mess/includes/xor100.h index 02dab8a4046..eadbf6482c4 100644 --- a/src/mess/includes/xor100.h +++ b/src/mess/includes/xor100.h @@ -10,7 +10,7 @@ #include "cpu/z80/z80.h" #include "machine/ram.h" #include "machine/com8116.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/i8255.h" #include "machine/i8251.h" #include "machine/serial.h" diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c index ee017d4e3fb..a66e8bb604c 100644 --- a/src/mess/machine/amstrad.c +++ b/src/mess/machine/amstrad.c @@ -40,7 +40,7 @@ This gives a total of 19968 NOPs per frame. #include "machine/i8255.h" #include "machine/mc146818.h" #include "machine/upd765.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/cpc_rom.h" #include "machine/mface2.h" #include "imagedev/cassette.h" diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c index 47299be39e3..dcb5f39189f 100644 --- a/src/mess/machine/bbc.c +++ b/src/mess/machine/bbc.c @@ -21,7 +21,7 @@ #include "machine/i8271.h" #include "machine/mc146818.h" #include "machine/mc6854.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "imagedev/cassette.h" diff --git a/src/mess/machine/comxpl80.h b/src/mess/machine/comxpl80.h index 8462cfc0555..ed3e10dce1b 100644 --- a/src/mess/machine/comxpl80.h +++ b/src/mess/machine/comxpl80.h @@ -16,7 +16,7 @@ #include "emu.h" #include "cpu/m6805/m6805.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" diff --git a/src/mess/machine/mtx.c b/src/mess/machine/mtx.c index 4415cf186b8..78aca733778 100644 --- a/src/mess/machine/mtx.c +++ b/src/mess/machine/mtx.c @@ -14,7 +14,7 @@ #include "imagedev/cassette.h" #include "machine/ram.h" #include "imagedev/snapquik.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/z80ctc.h" #include "machine/z80dart.h" #include "video/tms9928a.h" diff --git a/src/mess/machine/mz700.c b/src/mess/machine/mz700.c index e111e445321..2f5885ac3b4 100644 --- a/src/mess/machine/mz700.c +++ b/src/mess/machine/mz700.c @@ -15,7 +15,7 @@ #include "machine/i8255.h" #include "machine/z80pio.h" #include "machine/74145.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "sound/speaker.h" #include "imagedev/cassette.h" #include "machine/ram.h" diff --git a/src/mess/machine/pc_lpt.h b/src/mess/machine/pc_lpt.h index e6f5c2aafb2..7fb403af40d 100644 --- a/src/mess/machine/pc_lpt.h +++ b/src/mess/machine/pc_lpt.h @@ -8,8 +8,8 @@ #define __PC_LPT_H__ #include "isa.h" -#include "machine/ctronics.h" -#include "cntr_covox.h" +#include "bus/centronics/ctronics.h" +#include "bus/centronics/covox.h" /*************************************************************************** diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c index 535d3435ef9..20b6e974d59 100644 --- a/src/mess/machine/rmnimbus.c +++ b/src/mess/machine/rmnimbus.c @@ -64,7 +64,7 @@ chdman createhd -o ST125N.chd -chs 407,4,26 -ss 512 #include "machine/pic8259.h" #include "machine/pit8253.h" #include "machine/i8251.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/6522via.h" #include "machine/scsibus.h" diff --git a/src/mess/machine/thomson.c b/src/mess/machine/thomson.c index e830f06ece0..07c845d944b 100644 --- a/src/mess/machine/thomson.c +++ b/src/mess/machine/thomson.c @@ -11,7 +11,7 @@ #include "formats/thom_dsk.h" #include "includes/thomson.h" #include "machine/6821pia.h" -#include "machine/ctronics.h" +#include "bus/centronics/ctronics.h" #include "machine/ram.h" #define VERBOSE 0 diff --git a/src/mess/mess.mak b/src/mess/mess.mak index d663f8cb032..437dabf9228 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -338,7 +338,6 @@ MACHINES += CDP1871 MACHINES += CMOS40105 MACHINES += COM8116 MACHINES += CR589 -MACHINES += CTRONICS MACHINES += DS1302 MACHINES += DS2401 MACHINES += DS2404 @@ -507,6 +506,7 @@ BUSES += VIP BUSES += WANGPC BUSES += A2BUS BUSES += NUBUS +BUSES += CENTRONICS #------------------------------------------------- # this is the list of driver libraries that @@ -778,7 +778,6 @@ $(MESSOBJ)/shared.a: \ $(MESS_MACHINE)/8530scc.o \ $(MESS_MACHINE)/appldriv.o \ $(MESS_MACHINE)/applefdc.o \ - $(MESS_MACHINE)/cntr_covox.o\ $(MESS_MACHINE)/dp8390.o \ $(MESS_MACHINE)/hd63450.o \ $(MESS_MACHINE)/i8271.o \