moved centronics into emu/bus (nw)

.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

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"
 
 

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

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"
 
 
 

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"
 
 
 

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

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

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"
 
 
 

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"

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"

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 \

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

src/mame/mame.mak

@@ -363,7 +363,6 @@ MACHINES += CDP1871
 MACHINES += CDU76S
 MACHINES += COM8116
 MACHINES += CR589
-MACHINES += CTRONICS
 MACHINES += DS1302
 MACHINES += DS2401
 MACHINES += DS2404

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"

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"

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"

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"
 
 
 

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"

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"

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 */

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"
 

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"

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"

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"

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 */

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"

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"

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"
 

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"

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"
 

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"
 

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"

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"

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

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"

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) -

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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 <stdio.h>
 #include "machine/applefdc.h"

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
 {

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"

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"

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"
 

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"

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"

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"

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"

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"
 

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

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"
 
 

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"
 
 
 

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"

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"

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"
 
 
 /***************************************************************************

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"
 

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

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     \