summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-03-07 13:35:21 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-03-07 13:35:21 +0000
commit250dac1722b9f9f2ff602b4e40c2cd63cd97e504 (patch)
treef49e429b7d123f381c09b5b8e457860af49e48c8 /src
parenta190ceefc53d10fcbb8b2a3b8fc7749975b7a987 (diff)
Shuffle ISA and some more PC related devices around (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/bus/bus.mak63
-rw-r--r--src/emu/bus/cbmiec/c1571.h4
-rw-r--r--src/emu/bus/isa/3c503.c (renamed from src/mess/machine/3c503.c)2
-rw-r--r--src/emu/bus/isa/3c503.h (renamed from src/mess/machine/3c503.h)2
-rw-r--r--src/emu/bus/isa/adlib.c (renamed from src/mess/machine/isa_adlib.c)2
-rw-r--r--src/emu/bus/isa/adlib.h (renamed from src/mess/machine/isa_adlib.h)2
-rw-r--r--src/emu/bus/isa/aha1542.c (renamed from src/mess/machine/isa_aha1542.c)2
-rw-r--r--src/emu/bus/isa/aha1542.h (renamed from src/mess/machine/isa_aha1542.h)2
-rw-r--r--src/emu/bus/isa/cga.c (renamed from src/mess/video/isa_cga.c)2
-rw-r--r--src/emu/bus/isa/cga.h (renamed from src/mess/video/isa_cga.h)2
-rw-r--r--src/emu/bus/isa/com.c (renamed from src/mess/machine/isa_com.c)2
-rw-r--r--src/emu/bus/isa/com.h (renamed from src/mess/machine/isa_com.h)2
-rw-r--r--src/emu/bus/isa/dectalk.c (renamed from src/mess/machine/isa_dectalk.c)2
-rw-r--r--src/emu/bus/isa/dectalk.h (renamed from src/mess/machine/isa_dectalk.h)2
-rw-r--r--src/emu/bus/isa/ega.c (renamed from src/mess/video/isa_ega.c)2
-rw-r--r--src/emu/bus/isa/ega.h (renamed from src/mess/video/isa_ega.h)2
-rw-r--r--src/emu/bus/isa/fdc.c (renamed from src/mess/machine/isa_fdc.c)2
-rw-r--r--src/emu/bus/isa/fdc.h (renamed from src/mess/machine/isa_fdc.h)2
-rw-r--r--src/emu/bus/isa/finalchs.c (renamed from src/mess/machine/isa_finalchs.c)2
-rw-r--r--src/emu/bus/isa/finalchs.h (renamed from src/mess/machine/isa_finalchs.h)2
-rw-r--r--src/emu/bus/isa/gblaster.c (renamed from src/mess/machine/isa_gblaster.c)2
-rw-r--r--src/emu/bus/isa/gblaster.h (renamed from src/mess/machine/isa_gblaster.h)2
-rw-r--r--src/emu/bus/isa/gus.c (renamed from src/mess/machine/isa_gus.c)2
-rw-r--r--src/emu/bus/isa/gus.h (renamed from src/mess/machine/isa_gus.h)2
-rw-r--r--src/emu/bus/isa/hdc.c (renamed from src/mess/machine/isa_hdc.c)2
-rw-r--r--src/emu/bus/isa/hdc.h (renamed from src/mess/machine/isa_hdc.h)2
-rw-r--r--src/emu/bus/isa/ibm_mfc.c (renamed from src/mess/machine/isa_ibm_mfc.c)2
-rw-r--r--src/emu/bus/isa/ibm_mfc.h (renamed from src/mess/machine/isa_ibm_mfc.h)2
-rw-r--r--src/emu/bus/isa/ide.c (renamed from src/mess/machine/isa_ide.c)2
-rw-r--r--src/emu/bus/isa/ide.h (renamed from src/mess/machine/isa_ide.h)2
-rw-r--r--src/emu/bus/isa/isa.c (renamed from src/mess/machine/isa.c)2
-rw-r--r--src/emu/bus/isa/isa.h (renamed from src/mess/machine/isa.h)0
-rw-r--r--src/emu/bus/isa/isa_cards.c (renamed from src/mess/machine/isa_cards.c)0
-rw-r--r--src/emu/bus/isa/isa_cards.h66
-rw-r--r--src/emu/bus/isa/lpt.c67
-rw-r--r--src/emu/bus/isa/lpt.h48
-rw-r--r--src/emu/bus/isa/mc1502_fdc.c (renamed from src/mess/machine/mc1502_fdc.c)0
-rw-r--r--src/emu/bus/isa/mc1502_fdc.h (renamed from src/mess/machine/mc1502_fdc.h)2
-rw-r--r--src/emu/bus/isa/mc1502_rom.c (renamed from src/mess/machine/mc1502_rom.c)0
-rw-r--r--src/emu/bus/isa/mc1502_rom.h (renamed from src/mess/machine/mc1502_rom.h)2
-rw-r--r--src/emu/bus/isa/mda.c (renamed from src/mess/video/isa_mda.c)2
-rw-r--r--src/emu/bus/isa/mda.h (renamed from src/mess/video/isa_mda.h)2
-rw-r--r--src/emu/bus/isa/mpu401.c (renamed from src/mess/machine/isa_mpu401.c)2
-rw-r--r--src/emu/bus/isa/mpu401.h (renamed from src/mess/machine/isa_mpu401.h)2
-rw-r--r--src/emu/bus/isa/mufdc.c (renamed from src/mess/machine/isa_mufdc.c)2
-rw-r--r--src/emu/bus/isa/mufdc.h (renamed from src/mess/machine/isa_mufdc.h)0
-rw-r--r--src/emu/bus/isa/ne1000.c (renamed from src/mess/machine/ne1000.c)2
-rw-r--r--src/emu/bus/isa/ne1000.h (renamed from src/mess/machine/ne1000.h)2
-rw-r--r--src/emu/bus/isa/ne2000.c (renamed from src/mess/machine/ne2000.c)2
-rw-r--r--src/emu/bus/isa/ne2000.h (renamed from src/mess/machine/ne2000.h)2
-rw-r--r--src/emu/bus/isa/omti8621.c (renamed from src/mess/machine/omti8621.c)2
-rw-r--r--src/emu/bus/isa/omti8621.h (renamed from src/mess/machine/omti8621.h)2
-rw-r--r--src/emu/bus/isa/p1_fdc.c (renamed from src/mess/machine/p1_fdc.c)0
-rw-r--r--src/emu/bus/isa/p1_fdc.h (renamed from src/mess/machine/p1_fdc.h)2
-rw-r--r--src/emu/bus/isa/p1_hdc.c (renamed from src/mess/machine/p1_hdc.c)0
-rw-r--r--src/emu/bus/isa/p1_hdc.h (renamed from src/mess/machine/p1_hdc.h)2
-rw-r--r--src/emu/bus/isa/p1_rom.c (renamed from src/mess/machine/p1_rom.c)0
-rw-r--r--src/emu/bus/isa/p1_rom.h (renamed from src/mess/machine/p1_rom.h)2
-rw-r--r--src/emu/bus/isa/pc1640_iga.c (renamed from src/mess/video/isa_pc1640_iga.c)2
-rw-r--r--src/emu/bus/isa/pc1640_iga.h (renamed from src/mess/video/isa_pc1640_iga.h)4
-rw-r--r--src/emu/bus/isa/pds.c (renamed from src/mess/machine/isa_pds.c)2
-rw-r--r--src/emu/bus/isa/pds.h (renamed from src/mess/machine/isa_pds.h)2
-rw-r--r--src/emu/bus/isa/s3virge.c (renamed from src/mess/video/s3virge.c)2
-rw-r--r--src/emu/bus/isa/s3virge.h (renamed from src/mess/video/s3virge.h)0
-rw-r--r--src/emu/bus/isa/sblaster.c (renamed from src/mess/machine/isa_sblaster.c)2
-rw-r--r--src/emu/bus/isa/sblaster.h (renamed from src/mess/machine/isa_sblaster.h)4
-rw-r--r--src/emu/bus/isa/side116.c (renamed from src/mess/machine/isa_side116.c)2
-rw-r--r--src/emu/bus/isa/side116.h (renamed from src/mess/machine/isa_side116.h)0
-rw-r--r--src/emu/bus/isa/ssi2001.c (renamed from src/mess/machine/isa_ssi2001.c)2
-rw-r--r--src/emu/bus/isa/ssi2001.h (renamed from src/mess/machine/isa_ssi2001.h)4
-rw-r--r--src/emu/bus/isa/stereo_fx.c (renamed from src/mess/machine/isa_stereo_fx.c)2
-rw-r--r--src/emu/bus/isa/stereo_fx.h (renamed from src/mess/machine/isa_stereo_fx.h)4
-rw-r--r--src/emu/bus/isa/svga_cirrus.c (renamed from src/mess/video/isa_svga_cirrus.c)2
-rw-r--r--src/emu/bus/isa/svga_cirrus.h (renamed from src/mess/video/isa_svga_cirrus.h)2
-rw-r--r--src/emu/bus/isa/svga_s3.c (renamed from src/mess/video/isa_svga_s3.c)2
-rw-r--r--src/emu/bus/isa/svga_s3.h (renamed from src/mess/video/isa_svga_s3.h)4
-rw-r--r--src/emu/bus/isa/svga_tseng.c (renamed from src/mess/video/isa_svga_tseng.c)2
-rw-r--r--src/emu/bus/isa/svga_tseng.h (renamed from src/mess/video/isa_svga_tseng.h)2
-rw-r--r--src/emu/bus/isa/vga.c (renamed from src/mess/video/isa_vga.c)2
-rw-r--r--src/emu/bus/isa/vga.h (renamed from src/mess/video/isa_vga.h)2
-rw-r--r--src/emu/bus/isa/vga_ati.c (renamed from src/mess/video/isa_vga_ati.c)2
-rw-r--r--src/emu/bus/isa/vga_ati.h (renamed from src/mess/video/isa_vga_ati.h)2
-rw-r--r--src/emu/bus/isa/wd1002a_wx1.c (renamed from src/mess/machine/isa_wd1002a_wx1.c)2
-rw-r--r--src/emu/bus/isa/wd1002a_wx1.h (renamed from src/mess/machine/isa_wd1002a_wx1.h)2
-rw-r--r--src/emu/bus/isa/wdxt_gen.c (renamed from src/mess/machine/isa_wdxt_gen.c)2
-rw-r--r--src/emu/bus/isa/wdxt_gen.h (renamed from src/mess/machine/isa_wdxt_gen.h)2
-rw-r--r--src/emu/bus/isa/xsu_cards.c (renamed from src/mess/machine/xsu_cards.c)0
-rw-r--r--src/emu/bus/isa/xsu_cards.h (renamed from src/mess/machine/xsu_cards.h)16
-rw-r--r--src/emu/bus/isa/xtide.c (renamed from src/mess/machine/isa_xtide.c)2
-rw-r--r--src/emu/bus/isa/xtide.h (renamed from src/mess/machine/isa_xtide.h)2
-rw-r--r--src/emu/bus/pc_joy/pc_joy.c (renamed from src/mess/machine/pc_joy.c)0
-rw-r--r--src/emu/bus/pc_joy/pc_joy.h (renamed from src/mess/machine/pc_joy.h)0
-rw-r--r--src/emu/bus/pc_joy/pc_joy_sw.c (renamed from src/mess/machine/pc_joy_sw.c)2
-rw-r--r--src/emu/bus/pc_joy/pc_joy_sw.h (renamed from src/mess/machine/pc_joy_sw.h)2
-rw-r--r--src/emu/emu.mak2
-rw-r--r--src/emu/machine/dp8390.c (renamed from src/mess/machine/dp8390.c)0
-rw-r--r--src/emu/machine/dp8390.h (renamed from src/mess/machine/dp8390.h)0
-rw-r--r--src/emu/machine/machine.mak37
-rw-r--r--src/emu/machine/mpu401.c (renamed from src/mess/machine/mpu401.c)0
-rw-r--r--src/emu/machine/mpu401.h (renamed from src/mess/machine/mpu401.h)0
-rw-r--r--src/emu/machine/pc_fdc.c (renamed from src/mess/machine/pc_fdc.c)0
-rw-r--r--src/emu/machine/pc_fdc.h (renamed from src/mess/machine/pc_fdc.h)0
-rw-r--r--src/emu/machine/pc_lpt.c (renamed from src/mess/machine/pc_lpt.c)56
-rw-r--r--src/emu/machine/pc_lpt.h (renamed from src/mess/machine/pc_lpt.h)38
-rw-r--r--src/emu/video/crtc_ega.c (renamed from src/mess/video/crtc_ega.c)0
-rw-r--r--src/emu/video/crtc_ega.h (renamed from src/mess/video/crtc_ega.h)0
-rw-r--r--src/emu/video/video.mak10
-rw-r--r--src/mess/drivers/amstr_pc.c2
-rw-r--r--src/mess/drivers/ct486.c4
-rw-r--r--src/mess/drivers/ibmpc.c4
-rw-r--r--src/mess/drivers/indiana.c4
-rw-r--r--src/mess/drivers/pc.c2
-rw-r--r--src/mess/drivers/pc1512.c2
-rw-r--r--src/mess/drivers/pt68k4.c4
-rw-r--r--src/mess/includes/apollo.h4
-rw-r--r--src/mess/includes/at.h4
-rw-r--r--src/mess/includes/genpc.h4
-rw-r--r--src/mess/includes/mc1502.h5
-rw-r--r--src/mess/includes/pc1512.h6
-rw-r--r--src/mess/includes/poisk1.h4
-rw-r--r--src/mess/machine/apollo.c2
-rw-r--r--src/mess/machine/isa_cards.h66
-rw-r--r--src/mess/machine/southbridge.h4
-rw-r--r--src/mess/mess.mak60
124 files changed, 418 insertions, 330 deletions
diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak
index de21d12b3f5..b63079e04f1 100644
--- a/src/emu/bus/bus.mak
+++ b/src/emu/bus/bus.mak
@@ -292,6 +292,58 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/isa/isa.h,BUSES += ISA
+#-------------------------------------------------
+
+ifneq ($(filter ISA,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/isa/isa.o
+BUSOBJS += $(BUSOBJ)/isa/isa_cards.o
+BUSOBJS += $(BUSOBJ)/isa/mda.o
+BUSOBJS += $(BUSOBJ)/isa/wdxt_gen.o
+BUSOBJS += $(BUSOBJ)/isa/adlib.o
+BUSOBJS += $(BUSOBJ)/isa/com.o
+BUSOBJS += $(BUSOBJ)/isa/fdc.o
+BUSOBJS += $(BUSOBJ)/isa/mufdc.o
+BUSOBJS += $(BUSOBJ)/isa/finalchs.o
+BUSOBJS += $(BUSOBJ)/isa/gblaster.o
+BUSOBJS += $(BUSOBJ)/isa/gus.o
+BUSOBJS += $(BUSOBJ)/isa/hdc.o
+BUSOBJS += $(BUSOBJ)/isa/ibm_mfc.o
+BUSOBJS += $(BUSOBJ)/isa/mpu401.o
+BUSOBJS += $(BUSOBJ)/isa/sblaster.o
+BUSOBJS += $(BUSOBJ)/isa/stereo_fx.o
+BUSOBJS += $(BUSOBJ)/isa/ssi2001.o
+BUSOBJS += $(BUSOBJ)/isa/ide.o
+BUSOBJS += $(BUSOBJ)/isa/xtide.o
+BUSOBJS += $(BUSOBJ)/isa/side116.o
+BUSOBJS += $(BUSOBJ)/isa/aha1542.o
+BUSOBJS += $(BUSOBJ)/isa/wd1002a_wx1.o
+BUSOBJS += $(BUSOBJ)/isa/dectalk.o
+BUSOBJS += $(BUSOBJ)/isa/pds.o
+BUSOBJS += $(BUSOBJ)/isa/omti8621.o
+BUSOBJS += $(BUSOBJ)/isa/cga.o
+BUSOBJS += $(BUSOBJ)/isa/svga_cirrus.o
+BUSOBJS += $(BUSOBJ)/isa/ega.o
+BUSOBJS += $(BUSOBJ)/isa/vga.o
+BUSOBJS += $(BUSOBJ)/isa/vga_ati.o
+BUSOBJS += $(BUSOBJ)/isa/svga_tseng.o
+BUSOBJS += $(BUSOBJ)/isa/svga_s3.o
+BUSOBJS += $(BUSOBJ)/isa/s3virge.o
+BUSOBJS += $(BUSOBJ)/isa/pc1640_iga.o
+BUSOBJS += $(BUSOBJ)/isa/3c503.o
+BUSOBJS += $(BUSOBJ)/isa/ne1000.o
+BUSOBJS += $(BUSOBJ)/isa/ne2000.o
+BUSOBJS += $(BUSOBJ)/isa/lpt.o
+BUSOBJS += $(BUSOBJ)/isa/p1_fdc.o
+BUSOBJS += $(BUSOBJ)/isa/p1_hdc.o
+BUSOBJS += $(BUSOBJ)/isa/p1_rom.o
+BUSOBJS += $(BUSOBJ)/isa/mc1502_fdc.o
+BUSOBJS += $(BUSOBJ)/isa/mc1502_rom.o
+BUSOBJS += $(BUSOBJ)/isa/xsu_cards.o
+endif
+
+#-------------------------------------------------
+#
#@src/emu/bus/isbx/isbx.h,BUSES += ISBX
#-------------------------------------------------
@@ -317,6 +369,17 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/pc_joy/pc_joy.h,BUSES += PC_JOY
+#-------------------------------------------------
+
+ifneq ($(filter PC_JOY,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/pc_joy/pc_joy.o
+BUSOBJS += $(BUSOBJ)/pc_joy/pc_joy_sw.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/pc_kbd/pc_kbdc.h,BUSES += PC_KBD
#-------------------------------------------------
diff --git a/src/emu/bus/cbmiec/c1571.h b/src/emu/bus/cbmiec/c1571.h
index 73406ecadfe..519ed496fe2 100644
--- a/src/emu/bus/cbmiec/c1571.h
+++ b/src/emu/bus/cbmiec/c1571.h
@@ -20,8 +20,8 @@
#include "cpu/m6502/m6502.h"
#include "machine/64h156.h"
#include "machine/6522via.h"
-#include "machine/isa.h"
-#include "machine/isa_wd1002a_wx1.h"
+#include "bus/isa/isa.h"
+#include "bus/isa/wd1002a_wx1.h"
#include "machine/mos6526.h"
#include "machine/wd_fdc.h"
diff --git a/src/mess/machine/3c503.c b/src/emu/bus/isa/3c503.c
index 500721bfbbd..285de414271 100644
--- a/src/mess/machine/3c503.c
+++ b/src/emu/bus/isa/3c503.c
@@ -1,5 +1,5 @@
#include "emu.h"
-#include "machine/3c503.h"
+#include "3c503.h"
#define SADDR 0xcc000
diff --git a/src/mess/machine/3c503.h b/src/emu/bus/isa/3c503.h
index a94b706abc1..a8e4bc8722d 100644
--- a/src/mess/machine/3c503.h
+++ b/src/emu/bus/isa/3c503.h
@@ -4,7 +4,7 @@
#define __3C503_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/dp8390.h"
class el2_3c503_device: public device_t,
diff --git a/src/mess/machine/isa_adlib.c b/src/emu/bus/isa/adlib.c
index d36289e6c1d..de59cb48fe8 100644
--- a/src/mess/machine/isa_adlib.c
+++ b/src/emu/bus/isa/adlib.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "isa_adlib.h"
+#include "adlib.h"
#include "sound/speaker.h"
#include "sound/3812intf.h"
diff --git a/src/mess/machine/isa_adlib.h b/src/emu/bus/isa/adlib.h
index da630de355f..7f773112b78 100644
--- a/src/mess/machine/isa_adlib.h
+++ b/src/emu/bus/isa/adlib.h
@@ -4,7 +4,7 @@
#define __ISA_ADLIB_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/isa_aha1542.c b/src/emu/bus/isa/aha1542.c
index 005539ef571..6a335d26fc6 100644
--- a/src/mess/machine/isa_aha1542.c
+++ b/src/emu/bus/isa/aha1542.c
@@ -77,7 +77,7 @@
* source: http://download.adaptec.com/pdfs/installation_guides/1540cfig.pdf
*/
-#include "isa_aha1542.h"
+#include "aha1542.h"
#include "cpu/z80/z80.h"
// I/O Port interface
diff --git a/src/mess/machine/isa_aha1542.h b/src/emu/bus/isa/aha1542.h
index 668d3531815..1a6122c8d74 100644
--- a/src/mess/machine/isa_aha1542.h
+++ b/src/emu/bus/isa/aha1542.h
@@ -18,7 +18,7 @@
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
//*********************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/isa_cga.c b/src/emu/bus/isa/cga.c
index 6a851ca98dd..d24d91a6567 100644
--- a/src/mess/video/isa_cga.c
+++ b/src/emu/bus/isa/cga.c
@@ -82,7 +82,7 @@ TODO:
#include "emu.h"
#include "video/mc6845.h"
-#include "video/isa_cga.h"
+#include "cga.h"
#define VERBOSE_CGA 0 /* CGA (Color Graphics Adapter) */
diff --git a/src/mess/video/isa_cga.h b/src/emu/bus/isa/cga.h
index d7fdcac5c08..d5f5755f30f 100644
--- a/src/mess/video/isa_cga.h
+++ b/src/emu/bus/isa/cga.h
@@ -4,7 +4,7 @@
#define __ISA_CGA_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "video/mc6845.h"
//**************************************************************************
diff --git a/src/mess/machine/isa_com.c b/src/emu/bus/isa/com.c
index a51cad5b682..c4b1d292d28 100644
--- a/src/mess/machine/isa_com.c
+++ b/src/emu/bus/isa/com.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "isa_com.h"
+#include "com.h"
#include "bus/rs232/rs232.h"
#include "bus/rs232/ser_mouse.h"
#include "bus/rs232/terminal.h"
diff --git a/src/mess/machine/isa_com.h b/src/emu/bus/isa/com.h
index cc847905837..baf390e4166 100644
--- a/src/mess/machine/isa_com.h
+++ b/src/emu/bus/isa/com.h
@@ -4,7 +4,7 @@
#define __ISA_COM_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
//**************************************************************************
diff --git a/src/mess/machine/isa_dectalk.c b/src/emu/bus/isa/dectalk.c
index 0a26a968fc6..aaae4c7285f 100644
--- a/src/mess/machine/isa_dectalk.c
+++ b/src/emu/bus/isa/dectalk.c
@@ -1,4 +1,4 @@
-#include "isa_dectalk.h"
+#include "dectalk.h"
const device_type ISA8_DECTALK = &device_creator<dectalk_isa_device>;
diff --git a/src/mess/machine/isa_dectalk.h b/src/emu/bus/isa/dectalk.h
index 3956a57a681..66168980a89 100644
--- a/src/mess/machine/isa_dectalk.h
+++ b/src/emu/bus/isa/dectalk.h
@@ -2,7 +2,7 @@
#define ISA_DECTALK_H_
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "sound/dac.h"
#include "cpu/i86/i186.h"
#include "cpu/tms32010/tms32010.h"
diff --git a/src/mess/video/isa_ega.c b/src/emu/bus/isa/ega.c
index febb0e6e346..ac1c12bf589 100644
--- a/src/mess/video/isa_ega.c
+++ b/src/emu/bus/isa/ega.c
@@ -442,7 +442,7 @@ located at I/O port 0x3CE, and a data register located at I/O port 0x3CF.
***************************************************************************/
#include "emu.h"
-#include "video/isa_ega.h"
+#include "ega.h"
#define VERBOSE_EGA 1
diff --git a/src/mess/video/isa_ega.h b/src/emu/bus/isa/ega.h
index f8722c52d92..2914e13abbd 100644
--- a/src/mess/video/isa_ega.h
+++ b/src/emu/bus/isa/ega.h
@@ -4,7 +4,7 @@
#define __ISA_EGA_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "video/crtc_ega.h"
//**************************************************************************
diff --git a/src/mess/machine/isa_fdc.c b/src/emu/bus/isa/fdc.c
index 6bc23320bdd..303f832d078 100644
--- a/src/mess/machine/isa_fdc.c
+++ b/src/emu/bus/isa/fdc.c
@@ -5,7 +5,7 @@
**********************************************************************/
#include "emu.h"
-#include "machine/isa_fdc.h"
+#include "fdc.h"
#include "machine/pc_fdc.h"
#include "imagedev/flopdrv.h"
#include "formats/pc_dsk.h"
diff --git a/src/mess/machine/isa_fdc.h b/src/emu/bus/isa/fdc.h
index 662724d7017..f0b3423f673 100644
--- a/src/mess/machine/isa_fdc.h
+++ b/src/emu/bus/isa/fdc.h
@@ -9,7 +9,7 @@
#define ISA_FDC_H
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/upd765.h"
//**************************************************************************
diff --git a/src/mess/machine/isa_finalchs.c b/src/emu/bus/isa/finalchs.c
index 515502fa82f..f3acb8cadcd 100644
--- a/src/mess/machine/isa_finalchs.c
+++ b/src/emu/bus/isa/finalchs.c
@@ -8,7 +8,7 @@
***************************************************************************/
#include "emu.h"
-#include "isa_finalchs.h"
+#include "finalchs.h"
#include "cpu/m6502/m65c02.h"
WRITE8_MEMBER( isa8_finalchs_device::io7ff8_write )
diff --git a/src/mess/machine/isa_finalchs.h b/src/emu/bus/isa/finalchs.h
index 414fb0bb9c4..3016095fd6c 100644
--- a/src/mess/machine/isa_finalchs.h
+++ b/src/emu/bus/isa/finalchs.h
@@ -4,7 +4,7 @@
#define __ISA_FINALCHS_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/isa_gblaster.c b/src/emu/bus/isa/gblaster.c
index 921a4af9022..bde6d1b36ce 100644
--- a/src/mess/machine/isa_gblaster.c
+++ b/src/emu/bus/isa/gblaster.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "isa_gblaster.h"
+#include "gblaster.h"
#include "sound/speaker.h"
#include "sound/saa1099.h"
diff --git a/src/mess/machine/isa_gblaster.h b/src/emu/bus/isa/gblaster.h
index c74f406428f..b846ee0f81a 100644
--- a/src/mess/machine/isa_gblaster.h
+++ b/src/emu/bus/isa/gblaster.h
@@ -4,7 +4,7 @@
#define __ISA_GAME_BLASTER_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/isa_gus.c b/src/emu/bus/isa/gus.c
index db37e8a8a74..694fba1d991 100644
--- a/src/mess/machine/isa_gus.c
+++ b/src/emu/bus/isa/gus.c
@@ -5,7 +5,7 @@
*/
-#include "isa_gus.h"
+#include "gus.h"
#include "bus/midi/midi.h"
#include "machine/clock.h"
diff --git a/src/mess/machine/isa_gus.h b/src/emu/bus/isa/gus.h
index d9ffaf1f64d..01e63685874 100644
--- a/src/mess/machine/isa_gus.h
+++ b/src/emu/bus/isa/gus.h
@@ -41,7 +41,7 @@
#define __ISA_GUS_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/6850acia.h"
#define MCFG_GF1_TXIRQ_HANDLER(_devcb) \
diff --git a/src/mess/machine/isa_hdc.c b/src/emu/bus/isa/hdc.c
index 13b369713d0..658f9e857ad 100644
--- a/src/mess/machine/isa_hdc.c
+++ b/src/emu/bus/isa/hdc.c
@@ -5,7 +5,7 @@
**********************************************************************/
#include "emu.h"
-#include "machine/isa_hdc.h"
+#include "hdc.h"
#define LOG_HDC_STATUS 0
#define LOG_HDC_CALL 0
diff --git a/src/mess/machine/isa_hdc.h b/src/emu/bus/isa/hdc.h
index febbd463497..35e9a0feb8a 100644
--- a/src/mess/machine/isa_hdc.h
+++ b/src/emu/bus/isa/hdc.h
@@ -9,7 +9,7 @@
#define ISA_HDC_H
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "imagedev/harddriv.h"
//**************************************************************************
diff --git a/src/mess/machine/isa_ibm_mfc.c b/src/emu/bus/isa/ibm_mfc.c
index e9beae68368..24868f6da01 100644
--- a/src/mess/machine/isa_ibm_mfc.c
+++ b/src/emu/bus/isa/ibm_mfc.c
@@ -15,7 +15,7 @@
#include "emu.h"
-#include "isa_ibm_mfc.h"
+#include "ibm_mfc.h"
#include "cpu/z80/z80.h"
#include "machine/clock.h"
#include "machine/pit8253.h"
diff --git a/src/mess/machine/isa_ibm_mfc.h b/src/emu/bus/isa/ibm_mfc.h
index 11f37a8f399..5eb4b4331da 100644
--- a/src/mess/machine/isa_ibm_mfc.h
+++ b/src/emu/bus/isa/ibm_mfc.h
@@ -11,7 +11,7 @@
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/i8255.h"
#include "machine/i8251.h"
#include "machine/pit8253.h"
diff --git a/src/mess/machine/isa_ide.c b/src/emu/bus/isa/ide.c
index 0e29f43c0b8..a45721b1a76 100644
--- a/src/mess/machine/isa_ide.c
+++ b/src/emu/bus/isa/ide.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "isa_ide.h"
+#include "ide.h"
#include "machine/idectrl.h"
#include "imagedev/harddriv.h"
diff --git a/src/mess/machine/isa_ide.h b/src/emu/bus/isa/ide.h
index 31d0637b6d0..cc38fd1c868 100644
--- a/src/mess/machine/isa_ide.h
+++ b/src/emu/bus/isa/ide.h
@@ -4,7 +4,7 @@
#define __ISA_IDE_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/idectrl.h"
//**************************************************************************
diff --git a/src/mess/machine/isa.c b/src/emu/bus/isa/isa.c
index 65640938c79..9dc1c05b3f8 100644
--- a/src/mess/machine/isa.c
+++ b/src/emu/bus/isa/isa.c
@@ -6,7 +6,7 @@
#include "emu.h"
#include "emuopts.h"
-#include "machine/isa.h"
+#include "isa.h"
//**************************************************************************
diff --git a/src/mess/machine/isa.h b/src/emu/bus/isa/isa.h
index 8a991804243..8a991804243 100644
--- a/src/mess/machine/isa.h
+++ b/src/emu/bus/isa/isa.h
diff --git a/src/mess/machine/isa_cards.c b/src/emu/bus/isa/isa_cards.c
index ab1bfe449c6..ab1bfe449c6 100644
--- a/src/mess/machine/isa_cards.c
+++ b/src/emu/bus/isa/isa_cards.c
diff --git a/src/emu/bus/isa/isa_cards.h b/src/emu/bus/isa/isa_cards.h
new file mode 100644
index 00000000000..e7af7dd9116
--- /dev/null
+++ b/src/emu/bus/isa/isa_cards.h
@@ -0,0 +1,66 @@
+/**********************************************************************
+
+ ISA cards
+
+ license: MAME, GPL-2.0+
+ copyright-holders: Dirk Best
+
+**********************************************************************/
+
+#pragma once
+
+#ifndef __ISA_CARDS_H__
+#define __ISA_CARDS_H__
+
+#include "emu.h"
+
+// video
+#include "mda.h"
+#include "cga.h"
+#include "ega.h"
+#include "vga.h"
+#include "vga_ati.h"
+#include "svga_cirrus.h"
+#include "svga_s3.h"
+#include "svga_tseng.h"
+
+// storage
+#include "fdc.h"
+#include "mufdc.h"
+#include "hdc.h"
+#include "wdxt_gen.h"
+#include "ide.h"
+#include "xtide.h"
+#include "side116.h"
+#include "aha1542.h"
+#include "wd1002a_wx1.h"
+
+// sound
+#include "adlib.h"
+#include "gblaster.h"
+#include "gus.h"
+#include "ibm_mfc.h"
+#include "mpu401.h"
+#include "sblaster.h"
+#include "ssi2001.h"
+#include "stereo_fx.h"
+#include "dectalk.h"
+
+// network
+#include "3c503.h"
+#include "ne1000.h"
+#include "ne2000.h"
+
+// communication ports
+#include "lpt.h"
+#include "com.h"
+#include "pds.h"
+
+// other
+#include "finalchs.h"
+
+// supported devices
+SLOT_INTERFACE_EXTERN( pc_isa8_cards );
+SLOT_INTERFACE_EXTERN( pc_isa16_cards );
+
+#endif // __ISA_CARDS_H__
diff --git a/src/emu/bus/isa/lpt.c b/src/emu/bus/isa/lpt.c
new file mode 100644
index 00000000000..6dc19606a49
--- /dev/null
+++ b/src/emu/bus/isa/lpt.c
@@ -0,0 +1,67 @@
+/***************************************************************************
+
+ IBM-PC printer interface
+
+***************************************************************************/
+
+#include "emu.h"
+#include "lpt.h"
+#include "machine/pc_lpt.h"
+#include "bus/centronics/covox.h"
+#include "bus/centronics/image.h"
+
+const device_type ISA8_LPT = &device_creator<isa8_lpt_device>;
+
+isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock, "isa_lpt", __FILE__),
+ device_isa8_card_interface(mconfig, *this)
+{
+}
+
+static MACHINE_CONFIG_FRAGMENT( lpt_config )
+ MCFG_DEVICE_ADD("lpt", PC_LPT, 0)
+ MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(isa8_lpt_device, pc_cpu_line))
+MACHINE_CONFIG_END
+
+machine_config_constructor isa8_lpt_device::device_mconfig_additions() const
+{
+ return MACHINE_CONFIG_NAME( lpt_config );
+}
+
+static INPUT_PORTS_START( lpt_dsw )
+ PORT_START("DSW")
+ PORT_DIPNAME( 0x01, 0x00, "Base address")
+ PORT_DIPSETTING( 0x00, "0x378" )
+ PORT_DIPSETTING( 0x01, "0x278" )
+INPUT_PORTS_END
+
+ioport_constructor isa8_lpt_device::device_input_ports() const
+{
+ return INPUT_PORTS_NAME( lpt_dsw );
+}
+
+void isa8_lpt_device::device_start()
+{
+ set_isa_device();
+}
+
+void isa8_lpt_device::device_reset()
+{
+ m_is_primary = (ioport("DSW")->read() & 1) ? false : true;
+ if (m_is_primary)
+ {
+ m_isa->install_device(0x0378, 0x037b, 0, 0, read8_delegate(FUNC(pc_lpt_device::read), subdevice<pc_lpt_device>("lpt")), write8_delegate(FUNC(pc_lpt_device::write), subdevice<pc_lpt_device>("lpt")));
+ }
+ else
+ {
+ m_isa->install_device(0x0278, 0x027b, 0, 0, read8_delegate(FUNC(pc_lpt_device::read), subdevice<pc_lpt_device>("lpt")), write8_delegate(FUNC(pc_lpt_device::write), subdevice<pc_lpt_device>("lpt")));
+ }
+}
+
+WRITE_LINE_MEMBER(isa8_lpt_device::pc_cpu_line)
+{
+ if (is_primary())
+ m_isa->irq7_w(state);
+ else
+ m_isa->irq5_w(state);
+}
diff --git a/src/emu/bus/isa/lpt.h b/src/emu/bus/isa/lpt.h
new file mode 100644
index 00000000000..28d239e208b
--- /dev/null
+++ b/src/emu/bus/isa/lpt.h
@@ -0,0 +1,48 @@
+/***************************************************************************
+
+ IBM-PC printer interface
+
+***************************************************************************/
+
+#ifndef __ISA_LPT_H__
+#define __ISA_LPT_H__
+
+#include "isa.h"
+
+
+//**************************************************************************
+// TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> isa8_lpt_device
+
+class isa8_lpt_device : public device_t,
+ public device_isa8_card_interface
+{
+public:
+ // construction/destruction
+ isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+ // optional information overrides
+ virtual machine_config_constructor device_mconfig_additions() const;
+ virtual ioport_constructor device_input_ports() const;
+
+ bool is_primary() { return m_is_primary; }
+
+ WRITE_LINE_MEMBER(pc_cpu_line);
+
+protected:
+ // device-level overrides
+ virtual void device_start();
+ virtual void device_reset();
+
+private:
+
+ // internal state
+ bool m_is_primary;
+};
+
+// device type definition
+extern const device_type ISA8_LPT;
+
+#endif /* __ISA_LPT_H__ */
diff --git a/src/mess/machine/mc1502_fdc.c b/src/emu/bus/isa/mc1502_fdc.c
index 6fbf87681f7..6fbf87681f7 100644
--- a/src/mess/machine/mc1502_fdc.c
+++ b/src/emu/bus/isa/mc1502_fdc.c
diff --git a/src/mess/machine/mc1502_fdc.h b/src/emu/bus/isa/mc1502_fdc.h
index af5832e2d4c..8454eb88b5d 100644
--- a/src/mess/machine/mc1502_fdc.h
+++ b/src/emu/bus/isa/mc1502_fdc.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/flopdrv.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/wd_fdc.h"
//**************************************************************************
diff --git a/src/mess/machine/mc1502_rom.c b/src/emu/bus/isa/mc1502_rom.c
index 6dfc16f7799..6dfc16f7799 100644
--- a/src/mess/machine/mc1502_rom.c
+++ b/src/emu/bus/isa/mc1502_rom.c
diff --git a/src/mess/machine/mc1502_rom.h b/src/emu/bus/isa/mc1502_rom.h
index a8fa2a2e771..dbf00713c76 100644
--- a/src/mess/machine/mc1502_rom.h
+++ b/src/emu/bus/isa/mc1502_rom.h
@@ -15,7 +15,7 @@
#define __MC1502_ROM__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/isa_mda.c b/src/emu/bus/isa/mda.c
index 4109771ce83..f0088c9fede 100644
--- a/src/mess/video/isa_mda.c
+++ b/src/emu/bus/isa/mda.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "isa_mda.h"
+#include "mda.h"
#include "video/mc6845.h"
#include "machine/pc_lpt.h"
diff --git a/src/mess/video/isa_mda.h b/src/emu/bus/isa/mda.h
index 0da42bc0051..08ef8c9e403 100644
--- a/src/mess/video/isa_mda.h
+++ b/src/emu/bus/isa/mda.h
@@ -4,7 +4,7 @@
#define __ISA_MDA_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "video/mc6845.h"
//**************************************************************************
diff --git a/src/mess/machine/isa_mpu401.c b/src/emu/bus/isa/mpu401.c
index 46a39a44e61..d52cfc3d6c5 100644
--- a/src/mess/machine/isa_mpu401.c
+++ b/src/emu/bus/isa/mpu401.c
@@ -8,7 +8,7 @@
***************************************************************************/
#include "emu.h"
-#include "isa_mpu401.h"
+#include "mpu401.h"
#include "machine/pic8259.h"
#define MPU_CORE_TAG "mpu401"
diff --git a/src/mess/machine/isa_mpu401.h b/src/emu/bus/isa/mpu401.h
index 7fabb06b70e..1b521931ff4 100644
--- a/src/mess/machine/isa_mpu401.h
+++ b/src/emu/bus/isa/mpu401.h
@@ -4,7 +4,7 @@
#define __ISA_MPU401_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/mpu401.h"
//**************************************************************************
diff --git a/src/mess/machine/isa_mufdc.c b/src/emu/bus/isa/mufdc.c
index e2c0781268d..837cc2e7950 100644
--- a/src/mess/machine/isa_mufdc.c
+++ b/src/emu/bus/isa/mufdc.c
@@ -15,7 +15,7 @@
***************************************************************************/
-#include "isa_mufdc.h"
+#include "mufdc.h"
#include "formats/naslite_dsk.h"
#include "formats/pc_dsk.h"
diff --git a/src/mess/machine/isa_mufdc.h b/src/emu/bus/isa/mufdc.h
index e258bcadc09..e258bcadc09 100644
--- a/src/mess/machine/isa_mufdc.h
+++ b/src/emu/bus/isa/mufdc.h
diff --git a/src/mess/machine/ne1000.c b/src/emu/bus/isa/ne1000.c
index 771c3c091cd..156fae044f2 100644
--- a/src/mess/machine/ne1000.c
+++ b/src/emu/bus/isa/ne1000.c
@@ -1,5 +1,5 @@
#include "emu.h"
-#include "machine/ne1000.h"
+#include "ne1000.h"
static const dp8390_interface ne1000_dp8390_interface = {
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, ne1000_device, ne1000_irq_w),
diff --git a/src/mess/machine/ne1000.h b/src/emu/bus/isa/ne1000.h
index a55fdabf189..b92f561f958 100644
--- a/src/mess/machine/ne1000.h
+++ b/src/emu/bus/isa/ne1000.h
@@ -4,7 +4,7 @@
// NE1000 is 8bit has 8KB ram; NE2000 is 16bit has 16KB ram
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/dp8390.h"
class ne1000_device: public device_t,
diff --git a/src/mess/machine/ne2000.c b/src/emu/bus/isa/ne2000.c
index ec0ef281134..9d572665f56 100644
--- a/src/mess/machine/ne2000.c
+++ b/src/emu/bus/isa/ne2000.c
@@ -1,5 +1,5 @@
#include "emu.h"
-#include "machine/ne2000.h"
+#include "ne2000.h"
static const dp8390_interface ne2000_dp8390_interface = {
DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, ne2000_device, ne2000_irq_w),
diff --git a/src/mess/machine/ne2000.h b/src/emu/bus/isa/ne2000.h
index 3b25b14cad9..855400ad6e6 100644
--- a/src/mess/machine/ne2000.h
+++ b/src/emu/bus/isa/ne2000.h
@@ -2,7 +2,7 @@
#define __NE2000_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/dp8390.h"
class ne2000_device: public device_t,
diff --git a/src/mess/machine/omti8621.c b/src/emu/bus/isa/omti8621.c
index 1b76be197fa..59a84038781 100644
--- a/src/mess/machine/omti8621.c
+++ b/src/emu/bus/isa/omti8621.c
@@ -17,7 +17,7 @@
static int verbose = VERBOSE;
-#include "machine/omti8621.h"
+#include "omti8621.h"
#include "image.h"
#include "formats/pc_dsk.h"
#include "formats/naslite_dsk.h"
diff --git a/src/mess/machine/omti8621.h b/src/emu/bus/isa/omti8621.h
index 57db103205c..b89bf2b91d9 100644
--- a/src/mess/machine/omti8621.h
+++ b/src/emu/bus/isa/omti8621.h
@@ -17,7 +17,7 @@
#define ISA_OMTI8621_H_
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/pc_fdc.h"
#define OMTI_MAX_LUN 1
diff --git a/src/mess/machine/p1_fdc.c b/src/emu/bus/isa/p1_fdc.c
index 6035b677463..6035b677463 100644
--- a/src/mess/machine/p1_fdc.c
+++ b/src/emu/bus/isa/p1_fdc.c
diff --git a/src/mess/machine/p1_fdc.h b/src/emu/bus/isa/p1_fdc.h
index b6ad7457546..b85a6812b99 100644
--- a/src/mess/machine/p1_fdc.h
+++ b/src/emu/bus/isa/p1_fdc.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/flopdrv.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/wd_fdc.h"
//**************************************************************************
diff --git a/src/mess/machine/p1_hdc.c b/src/emu/bus/isa/p1_hdc.c
index 5a52d9df534..5a52d9df534 100644
--- a/src/mess/machine/p1_hdc.c
+++ b/src/emu/bus/isa/p1_hdc.c
diff --git a/src/mess/machine/p1_hdc.h b/src/emu/bus/isa/p1_hdc.h
index 4a7f498604c..0d27af123ec 100644
--- a/src/mess/machine/p1_hdc.h
+++ b/src/emu/bus/isa/p1_hdc.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/harddriv.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/wd2010.h"
//**************************************************************************
diff --git a/src/mess/machine/p1_rom.c b/src/emu/bus/isa/p1_rom.c
index 4da8ca0f89d..4da8ca0f89d 100644
--- a/src/mess/machine/p1_rom.c
+++ b/src/emu/bus/isa/p1_rom.c
diff --git a/src/mess/machine/p1_rom.h b/src/emu/bus/isa/p1_rom.h
index 022ba6a6c7c..8228c8df052 100644
--- a/src/mess/machine/p1_rom.h
+++ b/src/emu/bus/isa/p1_rom.h
@@ -15,7 +15,7 @@
#define __P1_ROM__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/isa_pc1640_iga.c b/src/emu/bus/isa/pc1640_iga.c
index b8f6b4f1225..e456266d33b 100644
--- a/src/mess/video/isa_pc1640_iga.c
+++ b/src/emu/bus/isa/pc1640_iga.c
@@ -21,7 +21,7 @@
**********************************************************************/
-#include "isa_pc1640_iga.h"
+#include "pc1640_iga.h"
diff --git a/src/mess/video/isa_pc1640_iga.h b/src/emu/bus/isa/pc1640_iga.h
index da5614919f2..6ec42730150 100644
--- a/src/mess/video/isa_pc1640_iga.h
+++ b/src/emu/bus/isa/pc1640_iga.h
@@ -15,8 +15,8 @@
#define __ISA8_PC1640_IGA__
#include "emu.h"
-#include "machine/isa.h"
-#include "video/isa_ega.h"
+#include "isa.h"
+#include "ega.h"
diff --git a/src/mess/machine/isa_pds.c b/src/emu/bus/isa/pds.c
index 2bda9059120..054e4fad750 100644
--- a/src/mess/machine/isa_pds.c
+++ b/src/emu/bus/isa/pds.c
@@ -14,7 +14,7 @@
* Created on: 31/01/2014
*/
-#include "isa_pds.h"
+#include "pds.h"
const device_type ISA8_PDS = &device_creator<isa8_pds_device>;
diff --git a/src/mess/machine/isa_pds.h b/src/emu/bus/isa/pds.h
index d0b69c9a195..c0d111f296a 100644
--- a/src/mess/machine/isa_pds.h
+++ b/src/emu/bus/isa/pds.h
@@ -8,7 +8,7 @@
#define ISA_PDS_H_
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/i8255.h"
class isa8_pds_device :
diff --git a/src/mess/video/s3virge.c b/src/emu/bus/isa/s3virge.c
index 6ecb2d01749..a0c1d5ec5fe 100644
--- a/src/mess/video/s3virge.c
+++ b/src/emu/bus/isa/s3virge.c
@@ -9,7 +9,7 @@
* - S3D is not implemented at all, so no 2D/3D acceleration yet.
*/
-#include "video/s3virge.h"
+#include "s3virge.h"
#define CRTC_PORT_ADDR ((vga.miscellaneous_output&1)?0x3d0:0x3b0)
#define LOG_REG 1
diff --git a/src/mess/video/s3virge.h b/src/emu/bus/isa/s3virge.h
index b714c77773e..b714c77773e 100644
--- a/src/mess/video/s3virge.h
+++ b/src/emu/bus/isa/s3virge.h
diff --git a/src/mess/machine/isa_sblaster.c b/src/emu/bus/isa/sblaster.c
index e349d7a13f4..5046e90ecef 100644
--- a/src/mess/machine/isa_sblaster.c
+++ b/src/emu/bus/isa/sblaster.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "isa_sblaster.h"
+#include "sblaster.h"
#include "sound/speaker.h"
#include "sound/3812intf.h"
#include "sound/262intf.h"
diff --git a/src/mess/machine/isa_sblaster.h b/src/emu/bus/isa/sblaster.h
index fbda1a87cd3..7772f94cb62 100644
--- a/src/mess/machine/isa_sblaster.h
+++ b/src/emu/bus/isa/sblaster.h
@@ -4,9 +4,9 @@
#define __ISA_SOUND_BLASTER_H__
#include "bus/midi/midi.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "sound/dac.h"
-#include "machine/pc_joy.h"
+#include "bus/pc_joy/pc_joy.h"
#define SIXTEENBIT 0x01
#define STEREO 0x02
diff --git a/src/mess/machine/isa_side116.c b/src/emu/bus/isa/side116.c
index 31cbdc04def..6036f3faa2e 100644
--- a/src/mess/machine/isa_side116.c
+++ b/src/emu/bus/isa/side116.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "isa_side116.h"
+#include "side116.h"
//**************************************************************************
diff --git a/src/mess/machine/isa_side116.h b/src/emu/bus/isa/side116.h
index 588d0b2aedb..588d0b2aedb 100644
--- a/src/mess/machine/isa_side116.h
+++ b/src/emu/bus/isa/side116.h
diff --git a/src/mess/machine/isa_ssi2001.c b/src/emu/bus/isa/ssi2001.c
index 24ababd1bfa..172f4f0be65 100644
--- a/src/mess/machine/isa_ssi2001.c
+++ b/src/emu/bus/isa/ssi2001.c
@@ -1,6 +1,6 @@
// Innovation SSI-2001
-#include "isa_ssi2001.h"
+#include "ssi2001.h"
const device_type ISA8_SSI2001 = &device_creator<ssi2001_device>;
diff --git a/src/mess/machine/isa_ssi2001.h b/src/emu/bus/isa/ssi2001.h
index 306d3e416ff..8454d63fd5b 100644
--- a/src/mess/machine/isa_ssi2001.h
+++ b/src/emu/bus/isa/ssi2001.h
@@ -2,9 +2,9 @@
#define __SSI2001__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "sound/mos6581.h"
-#include "machine/pc_joy.h"
+#include "bus/pc_joy/pc_joy.h"
//*********************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/isa_stereo_fx.c b/src/emu/bus/isa/stereo_fx.c
index b4349911dfc..344fbadddb3 100644
--- a/src/mess/machine/isa_stereo_fx.c
+++ b/src/emu/bus/isa/stereo_fx.c
@@ -2,7 +2,7 @@
//
// TODO: UART is connected to MIDI port
-#include "isa_stereo_fx.h"
+#include "stereo_fx.h"
const device_type ISA8_STEREO_FX = &device_creator<stereo_fx_device>;
diff --git a/src/mess/machine/isa_stereo_fx.h b/src/emu/bus/isa/stereo_fx.h
index a87191551fe..4910979463c 100644
--- a/src/mess/machine/isa_stereo_fx.h
+++ b/src/emu/bus/isa/stereo_fx.h
@@ -2,9 +2,9 @@
#define __STEREO_FX__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "sound/dac.h"
-#include "machine/pc_joy.h"
+#include "bus/pc_joy/pc_joy.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/3812intf.h"
diff --git a/src/mess/video/isa_svga_cirrus.c b/src/emu/bus/isa/svga_cirrus.c
index 326d0bf2e4e..1c766ee6511 100644
--- a/src/mess/video/isa_svga_cirrus.c
+++ b/src/emu/bus/isa/svga_cirrus.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "isa_svga_cirrus.h"
+#include "svga_cirrus.h"
#include "video/pc_vga.h"
ROM_START( dm_clgd5430 )
diff --git a/src/mess/video/isa_svga_cirrus.h b/src/emu/bus/isa/svga_cirrus.h
index 31a7fa15969..099c00eeb6c 100644
--- a/src/mess/video/isa_svga_cirrus.h
+++ b/src/emu/bus/isa/svga_cirrus.h
@@ -4,7 +4,7 @@
#define __ISA_SVGA_CIRRUS_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "video/pc_vga.h"
//**************************************************************************
diff --git a/src/mess/video/isa_svga_s3.c b/src/emu/bus/isa/svga_s3.c
index ae87a6e8138..5494ae4ccb0 100644
--- a/src/mess/video/isa_svga_s3.c
+++ b/src/emu/bus/isa/svga_s3.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "isa_svga_s3.h"
+#include "svga_s3.h"
ROM_START( s3_764 )
ROM_REGION(0x8000,"s3_764", 0)
diff --git a/src/mess/video/isa_svga_s3.h b/src/emu/bus/isa/svga_s3.h
index 83bf9561451..bd01043e3c5 100644
--- a/src/mess/video/isa_svga_s3.h
+++ b/src/emu/bus/isa/svga_s3.h
@@ -4,9 +4,9 @@
#define __ISA_SVGA_S3_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "video/pc_vga.h"
-#include "video/s3virge.h"
+#include "s3virge.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/isa_svga_tseng.c b/src/emu/bus/isa/svga_tseng.c
index cfb0e7f35de..58bdf6fff8d 100644
--- a/src/mess/video/isa_svga_tseng.c
+++ b/src/emu/bus/isa/svga_tseng.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "isa_svga_tseng.h"
+#include "svga_tseng.h"
#include "video/pc_vga.h"
ROM_START( et4000 )
diff --git a/src/mess/video/isa_svga_tseng.h b/src/emu/bus/isa/svga_tseng.h
index d7d15c3d103..ecaf8982e55 100644
--- a/src/mess/video/isa_svga_tseng.h
+++ b/src/emu/bus/isa/svga_tseng.h
@@ -4,7 +4,7 @@
#define __ISA_SVGA_ET4K_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "video/pc_vga.h"
//**************************************************************************
diff --git a/src/mess/video/isa_vga.c b/src/emu/bus/isa/vga.c
index 6c9791a8616..4f04d6bc166 100644
--- a/src/mess/video/isa_vga.c
+++ b/src/emu/bus/isa/vga.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "isa_vga.h"
+#include "vga.h"
#include "video/pc_vga.h"
ROM_START( ibm_vga )
diff --git a/src/mess/video/isa_vga.h b/src/emu/bus/isa/vga.h
index 24d5814d3a9..7614bbdb0ff 100644
--- a/src/mess/video/isa_vga.h
+++ b/src/emu/bus/isa/vga.h
@@ -4,7 +4,7 @@
#define __ISA_VGA_H__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "video/pc_vga.h"
//**************************************************************************
diff --git a/src/mess/video/isa_vga_ati.c b/src/emu/bus/isa/vga_ati.c
index e92e842df2a..4637a99ac14 100644
--- a/src/mess/video/isa_vga_ati.c
+++ b/src/emu/bus/isa/vga_ati.c
@@ -8,7 +8,7 @@
*/
#include "emu.h"
-#include "isa_vga_ati.h"
+#include "vga_ati.h"
#include "video/pc_vga.h"
ROM_START( gfxultra )
diff --git a/src/mess/video/isa_vga_ati.h b/src/emu/bus/isa/vga_ati.h
index 004de9706c4..4f7161cc6a1 100644
--- a/src/mess/video/isa_vga_ati.h
+++ b/src/emu/bus/isa/vga_ati.h
@@ -11,7 +11,7 @@
#define ISA_VGA_ATI_H_
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "video/pc_vga.h"
//**************************************************************************
diff --git a/src/mess/machine/isa_wd1002a_wx1.c b/src/emu/bus/isa/wd1002a_wx1.c
index b82802f613b..449ab6ce5c6 100644
--- a/src/mess/machine/isa_wd1002a_wx1.c
+++ b/src/emu/bus/isa/wd1002a_wx1.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "isa_wd1002a_wx1.h"
+#include "wd1002a_wx1.h"
diff --git a/src/mess/machine/isa_wd1002a_wx1.h b/src/emu/bus/isa/wd1002a_wx1.h
index a6cbdaa930a..e0cb75f18b6 100644
--- a/src/mess/machine/isa_wd1002a_wx1.h
+++ b/src/emu/bus/isa/wd1002a_wx1.h
@@ -15,7 +15,7 @@
#define __ISA_WD1002A_WX1__
#include "emu.h"
-#include "machine/isa.h"
+#include "isa.h"
diff --git a/src/mess/machine/isa_wdxt_gen.c b/src/emu/bus/isa/wdxt_gen.c
index 22b75587d19..3bd03013eae 100644
--- a/src/mess/machine/isa_wdxt_gen.c
+++ b/src/emu/bus/isa/wdxt_gen.c
@@ -46,7 +46,7 @@ Notes:
*/
-#include "machine/isa_wdxt_gen.h"
+#include "wdxt_gen.h"
diff --git a/src/mess/machine/isa_wdxt_gen.h b/src/emu/bus/isa/wdxt_gen.h
index 87509e58081..b5019cd8800 100644
--- a/src/mess/machine/isa_wdxt_gen.h
+++ b/src/emu/bus/isa/wdxt_gen.h
@@ -24,7 +24,7 @@
#include "emu.h"
#include "cpu/mcs48/mcs48.h"
-#include "machine/isa.h"
+#include "isa.h"
#include "machine/wd11c00_17.h"
#include "machine/wd2010.h"
#include "imagedev/harddriv.h"
diff --git a/src/mess/machine/xsu_cards.c b/src/emu/bus/isa/xsu_cards.c
index b93ccc9a406..b93ccc9a406 100644
--- a/src/mess/machine/xsu_cards.c
+++ b/src/emu/bus/isa/xsu_cards.c
diff --git a/src/mess/machine/xsu_cards.h b/src/emu/bus/isa/xsu_cards.h
index 6e6918b7510..966b89ff07e 100644
--- a/src/mess/machine/xsu_cards.h
+++ b/src/emu/bus/isa/xsu_cards.h
@@ -15,18 +15,18 @@
#include "emu.h"
// storage
-#include "machine/mc1502_fdc.h"
-#include "machine/p1_fdc.h"
-#include "machine/p1_hdc.h"
+#include "mc1502_fdc.h"
+#include "p1_fdc.h"
+#include "p1_hdc.h"
// misc
-#include "machine/mc1502_rom.h"
-#include "machine/p1_rom.h"
+#include "mc1502_rom.h"
+#include "p1_rom.h"
// non-native
-#include "machine/isa_com.h"
-#include "machine/isa_xtide.h"
-#include "machine/pc_lpt.h"
+#include "com.h"
+#include "xtide.h"
+#include "lpt.h"
// supported devices
SLOT_INTERFACE_EXTERN( p1_isa8_cards );
diff --git a/src/mess/machine/isa_xtide.c b/src/emu/bus/isa/xtide.c
index 221f0a4b69c..137fd00f631 100644
--- a/src/mess/machine/isa_xtide.c
+++ b/src/emu/bus/isa/xtide.c
@@ -51,7 +51,7 @@ Device Control (out) 14 7
-#include "machine/isa_xtide.h"
+#include "xtide.h"
READ8_MEMBER( xtide_device::read )
diff --git a/src/mess/machine/isa_xtide.h b/src/emu/bus/isa/xtide.h
index 9e946a128be..6c17dc8bc14 100644
--- a/src/mess/machine/isa_xtide.h
+++ b/src/emu/bus/isa/xtide.h
@@ -6,7 +6,7 @@
#include "emu.h"
#include "machine/ataintf.h"
#include "machine/eeprompar.h"
-#include "machine/isa.h"
+#include "isa.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/pc_joy.c b/src/emu/bus/pc_joy/pc_joy.c
index 665bd68d42b..665bd68d42b 100644
--- a/src/mess/machine/pc_joy.c
+++ b/src/emu/bus/pc_joy/pc_joy.c
diff --git a/src/mess/machine/pc_joy.h b/src/emu/bus/pc_joy/pc_joy.h
index 8247bdfd87a..8247bdfd87a 100644
--- a/src/mess/machine/pc_joy.h
+++ b/src/emu/bus/pc_joy/pc_joy.h
diff --git a/src/mess/machine/pc_joy_sw.c b/src/emu/bus/pc_joy/pc_joy_sw.c
index 9ebd173d513..06b9e792a07 100644
--- a/src/mess/machine/pc_joy_sw.c
+++ b/src/emu/bus/pc_joy/pc_joy_sw.c
@@ -1,6 +1,6 @@
//TODO: determine when to switch modes and add single bit mode
-#include "machine/pc_joy_sw.h"
+#include "pc_joy_sw.h"
const device_type PC_MSSW_PAD = &device_creator<pc_mssw_pad_device>;
diff --git a/src/mess/machine/pc_joy_sw.h b/src/emu/bus/pc_joy/pc_joy_sw.h
index 041ab8ad3dc..654b10f63c6 100644
--- a/src/mess/machine/pc_joy_sw.h
+++ b/src/emu/bus/pc_joy/pc_joy_sw.h
@@ -1,7 +1,7 @@
#ifndef PC_JOY_SW_H_
#define PC_JOY_SW_H_
-#include "machine/pc_joy.h"
+#include "pc_joy.h"
class pc_mssw_pad_device : public device_t,
public device_pc_joy_interface
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 5c1704b7bcb..423aef3f902 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -42,8 +42,10 @@ OBJDIRS += \
$(EMUOBJ)/bus/ep64 \
$(EMUOBJ)/bus/ieee488 \
$(EMUOBJ)/bus/imi7000 \
+ $(EMUOBJ)/bus/isa \
$(EMUOBJ)/bus/isbx \
$(EMUOBJ)/bus/midi \
+ $(EMUOBJ)/bus/pc_joy \
$(EMUOBJ)/bus/pc_kbd \
$(EMUOBJ)/bus/pet \
$(EMUOBJ)/bus/plus4 \
diff --git a/src/mess/machine/dp8390.c b/src/emu/machine/dp8390.c
index a1ac879b12c..a1ac879b12c 100644
--- a/src/mess/machine/dp8390.c
+++ b/src/emu/machine/dp8390.c
diff --git a/src/mess/machine/dp8390.h b/src/emu/machine/dp8390.h
index f98b5411eab..f98b5411eab 100644
--- a/src/mess/machine/dp8390.h
+++ b/src/emu/machine/dp8390.h
diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak
index 5ee7139cfa3..15300e77c2b 100644
--- a/src/emu/machine/machine.mak
+++ b/src/emu/machine/machine.mak
@@ -1615,3 +1615,40 @@ ifneq ($(filter MM58167,$(MACHINES)),)
MACHINEOBJS += $(MACHINEOBJ)/mm58167.o
endif
+
+#-------------------------------------------------
+#
+#@src/emu/machine/dp8390.h,MACHINES += DP8390
+#-------------------------------------------------
+
+ifneq ($(filter DP8390,$(MACHINES)),)
+MACHINEOBJS += $(MACHINEOBJ)/dp8390.o
+endif
+
+#-------------------------------------------------
+#
+#@src/emu/machine/pc_lpt.h,MACHINES += PC_LPT
+#-------------------------------------------------
+
+ifneq ($(filter PC_LPT,$(MACHINES)),)
+MACHINEOBJS += $(MACHINEOBJ)/pc_lpt.o
+endif
+
+#-------------------------------------------------
+#
+#@src/emu/machine/pc_fdc.h,MACHINES += PC_FDC
+#-------------------------------------------------
+
+ifneq ($(filter PC_FDC,$(MACHINES)),)
+MACHINEOBJS += $(MACHINEOBJ)/pc_fdc.o
+endif
+
+#-------------------------------------------------
+#
+#@src/emu/machine/mpu401.h,MACHINES += MPU401
+#-------------------------------------------------
+
+ifneq ($(filter MPU401,$(MACHINES)),)
+MACHINEOBJS += $(MACHINEOBJ)/mpu401.o
+endif
+
diff --git a/src/mess/machine/mpu401.c b/src/emu/machine/mpu401.c
index 7e654cb0662..7e654cb0662 100644
--- a/src/mess/machine/mpu401.c
+++ b/src/emu/machine/mpu401.c
diff --git a/src/mess/machine/mpu401.h b/src/emu/machine/mpu401.h
index 972484cb27c..972484cb27c 100644
--- a/src/mess/machine/mpu401.h
+++ b/src/emu/machine/mpu401.h
diff --git a/src/mess/machine/pc_fdc.c b/src/emu/machine/pc_fdc.c
index 6fd182d01ef..6fd182d01ef 100644
--- a/src/mess/machine/pc_fdc.c
+++ b/src/emu/machine/pc_fdc.c
diff --git a/src/mess/machine/pc_fdc.h b/src/emu/machine/pc_fdc.h
index b081f95d221..b081f95d221 100644
--- a/src/mess/machine/pc_fdc.h
+++ b/src/emu/machine/pc_fdc.h
diff --git a/src/mess/machine/pc_lpt.c b/src/emu/machine/pc_lpt.c
index 719ad4e2586..e5558835e21 100644
--- a/src/mess/machine/pc_lpt.c
+++ b/src/emu/machine/pc_lpt.c
@@ -168,59 +168,3 @@ WRITE_LINE_MEMBER( pc_lpt_device::write_centronics_ack )
update_irq();
}
-
-const device_type ISA8_LPT = &device_creator<isa8_lpt_device>;
-
-isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
- device_t(mconfig, ISA8_LPT, "Printer Adapter", tag, owner, clock, "isa_lpt", __FILE__),
- device_isa8_card_interface(mconfig, *this)
-{
-}
-
-static MACHINE_CONFIG_FRAGMENT( lpt_config )
- MCFG_DEVICE_ADD("lpt", PC_LPT, 0)
- MCFG_PC_LPT_IRQ_HANDLER(WRITELINE(isa8_lpt_device, pc_cpu_line))
-MACHINE_CONFIG_END
-
-machine_config_constructor isa8_lpt_device::device_mconfig_additions() const
-{
- return MACHINE_CONFIG_NAME( lpt_config );
-}
-
-static INPUT_PORTS_START( lpt_dsw )
- PORT_START("DSW")
- PORT_DIPNAME( 0x01, 0x00, "Base address")
- PORT_DIPSETTING( 0x00, "0x378" )
- PORT_DIPSETTING( 0x01, "0x278" )
-INPUT_PORTS_END
-
-ioport_constructor isa8_lpt_device::device_input_ports() const
-{
- return INPUT_PORTS_NAME( lpt_dsw );
-}
-
-void isa8_lpt_device::device_start()
-{
- set_isa_device();
-}
-
-void isa8_lpt_device::device_reset()
-{
- m_is_primary = (ioport("DSW")->read() & 1) ? false : true;
- if (m_is_primary)
- {
- m_isa->install_device(0x0378, 0x037b, 0, 0, read8_delegate(FUNC(pc_lpt_device::read), subdevice<pc_lpt_device>("lpt")), write8_delegate(FUNC(pc_lpt_device::write), subdevice<pc_lpt_device>("lpt")));
- }
- else
- {
- m_isa->install_device(0x0278, 0x027b, 0, 0, read8_delegate(FUNC(pc_lpt_device::read), subdevice<pc_lpt_device>("lpt")), write8_delegate(FUNC(pc_lpt_device::write), subdevice<pc_lpt_device>("lpt")));
- }
-}
-
-WRITE_LINE_MEMBER(isa8_lpt_device::pc_cpu_line)
-{
- if (is_primary())
- m_isa->irq7_w(state);
- else
- m_isa->irq5_w(state);
-}
diff --git a/src/mess/machine/pc_lpt.h b/src/emu/machine/pc_lpt.h
index 0e8dcda1334..04e8e9a8105 100644
--- a/src/mess/machine/pc_lpt.h
+++ b/src/emu/machine/pc_lpt.h
@@ -7,10 +7,8 @@
#ifndef __PC_LPT_H__
#define __PC_LPT_H__
-#include "isa.h"
#include "bus/centronics/ctronics.h"
-
#define MCFG_PC_LPT_IRQ_HANDLER(_devcb) \
devcb = &pc_lpt_device::set_irq_handler(*device, DEVCB2_##_devcb);
@@ -84,40 +82,4 @@ private:
extern const device_type PC_LPT;
-
-//**************************************************************************
-// TYPE DEFINITIONS
-//**************************************************************************
-
-// ======================> isa8_lpt_device
-
-class isa8_lpt_device : public device_t,
- public device_isa8_card_interface
-{
-public:
- // construction/destruction
- isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- // optional information overrides
- virtual machine_config_constructor device_mconfig_additions() const;
- virtual ioport_constructor device_input_ports() const;
-
- bool is_primary() { return m_is_primary; }
-
- WRITE_LINE_MEMBER(pc_cpu_line);
-
-protected:
- // device-level overrides
- virtual void device_start();
- virtual void device_reset();
-
-private:
-
- // internal state
- bool m_is_primary;
-};
-
-// device type definition
-extern const device_type ISA8_LPT;
-
#endif /* __PC_LPT__ */
diff --git a/src/mess/video/crtc_ega.c b/src/emu/video/crtc_ega.c
index b7ba092c75b..b7ba092c75b 100644
--- a/src/mess/video/crtc_ega.c
+++ b/src/emu/video/crtc_ega.c
diff --git a/src/mess/video/crtc_ega.h b/src/emu/video/crtc_ega.h
index d211a63b888..d211a63b888 100644
--- a/src/mess/video/crtc_ega.h
+++ b/src/emu/video/crtc_ega.h
diff --git a/src/emu/video/video.mak b/src/emu/video/video.mak
index cf95ea7b813..19df5c86abd 100644
--- a/src/emu/video/video.mak
+++ b/src/emu/video/video.mak
@@ -507,3 +507,13 @@ endif
ifneq ($(filter VOODOO,$(VIDEOS)),)
VIDEOOBJS+= $(VIDEOOBJ)/voodoo.o
endif
+
+
+#-------------------------------------------------
+#
+#@src/emu/video/crtc_ega.h,VIDEOS += CRTC_EGA
+#-------------------------------------------------
+
+ifneq ($(filter CRTC_EGA,$(VIDEOS)),)
+VIDEOOBJS+= $(VIDEOOBJ)/crtc_ega.o
+endif
diff --git a/src/mess/drivers/amstr_pc.c b/src/mess/drivers/amstr_pc.c
index a4d148476c0..7013febb91e 100644
--- a/src/mess/drivers/amstr_pc.c
+++ b/src/mess/drivers/amstr_pc.c
@@ -40,7 +40,7 @@ More information can be found at http://www.seasip.info/AmstradXT/1640tech/index
#include "video/pc_aga.h"
#include "machine/pc_fdc.h"
-#include "machine/pc_joy.h"
+#include "bus/pc_joy/pc_joy.h"
#include "machine/pckeybrd.h"
#include "machine/pc_lpt.h"
diff --git a/src/mess/drivers/ct486.c b/src/mess/drivers/ct486.c
index 6d78b01b19a..0859f33ddb1 100644
--- a/src/mess/drivers/ct486.c
+++ b/src/mess/drivers/ct486.c
@@ -14,8 +14,8 @@
#include "machine/at_keybc.h"
#include "bus/pc_kbd/pc_kbdc.h"
#include "bus/pc_kbd/keyboards.h"
-#include "machine/isa.h"
-#include "machine/isa_cards.h"
+#include "bus/isa/isa.h"
+#include "bus/isa/isa_cards.h"
#include "sound/speaker.h"
diff --git a/src/mess/drivers/ibmpc.c b/src/mess/drivers/ibmpc.c
index b8d9dfdf9f3..7b9235a918d 100644
--- a/src/mess/drivers/ibmpc.c
+++ b/src/mess/drivers/ibmpc.c
@@ -256,8 +256,8 @@ XT U44 IBM.bin: IBM 5160 PC/XT Bank-selection decoding ROM (256x4 bit). Not mapp
#include "emu.h"
#include "cpu/i86/i86.h"
#include "machine/ram.h"
-#include "machine/isa.h"
-#include "machine/isa_cards.h"
+#include "bus/isa/isa.h"
+#include "bus/isa/isa_cards.h"
#include "machine/pc_lpt.h"
#include "bus/pc_kbd/keyboards.h"
#include "includes/genpc.h"
diff --git a/src/mess/drivers/indiana.c b/src/mess/drivers/indiana.c
index b1e6497816a..36b9455b790 100644
--- a/src/mess/drivers/indiana.c
+++ b/src/mess/drivers/indiana.c
@@ -14,8 +14,8 @@
#include "bus/rs232/keyboard.h"
#include "cpu/m68000/m68000.h"
-#include "machine/isa.h"
-#include "machine/isa_cards.h"
+#include "bus/isa/isa.h"
+#include "bus/isa/isa_cards.h"
#include "machine/mc68901.h"
#define M68K_TAG "maincpu"
diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c
index f78b916c662..d5b87eb89f4 100644
--- a/src/mess/drivers/pc.c
+++ b/src/mess/drivers/pc.c
@@ -77,7 +77,7 @@ video HW too.
#include "video/pc_t1t.h"
#include "machine/pc_fdc.h"
-#include "machine/pc_joy.h"
+#include "bus/pc_joy/pc_joy.h"
#include "machine/pckeybrd.h"
#include "machine/pc_lpt.h"
diff --git a/src/mess/drivers/pc1512.c b/src/mess/drivers/pc1512.c
index a32b8f82555..e6cdb691c09 100644
--- a/src/mess/drivers/pc1512.c
+++ b/src/mess/drivers/pc1512.c
@@ -88,7 +88,7 @@ This is done by following steps 11 and 12.
#include "includes/pc1512.h"
#include "bus/rs232/rs232.h"
-#include "video/isa_ega.h"
+#include "bus/isa/ega.h"
diff --git a/src/mess/drivers/pt68k4.c b/src/mess/drivers/pt68k4.c
index fc0d8d92cec..b06afd5005d 100644
--- a/src/mess/drivers/pt68k4.c
+++ b/src/mess/drivers/pt68k4.c
@@ -48,8 +48,8 @@ TODO: 68230 device. Better hardware documentation would be nice too, and workin
#include "machine/timekpr.h"
#include "machine/pc_fdc.h"
#include "formats/imd_dsk.h"
-#include "machine/isa.h"
-#include "machine/isa_cards.h"
+#include "bus/isa/isa.h"
+#include "bus/isa/isa_cards.h"
#include "bus/pc_kbd/pc_kbdc.h"
#include "bus/pc_kbd/keyboards.h"
#include "sound/speaker.h"
diff --git a/src/mess/includes/apollo.h b/src/mess/includes/apollo.h
index 2cd80d8a03d..03c08ed95e2 100644
--- a/src/mess/includes/apollo.h
+++ b/src/mess/includes/apollo.h
@@ -29,8 +29,8 @@
#include "machine/mc146818.h"
#include "machine/apollo_kbd.h"
#include "machine/clock.h"
-#include "machine/isa.h"
-#include "machine/isa_cards.h"
+#include "bus/isa/isa.h"
+#include "bus/isa/isa_cards.h"
#ifndef VERBOSE
#define VERBOSE 0
diff --git a/src/mess/includes/at.h b/src/mess/includes/at.h
index f55c9da83f9..c3d98a42366 100644
--- a/src/mess/includes/at.h
+++ b/src/mess/includes/at.h
@@ -35,8 +35,8 @@
#include "sound/speaker.h"
#include "machine/ram.h"
#include "machine/nvram.h"
-#include "machine/isa.h"
-#include "machine/isa_cards.h"
+#include "bus/isa/isa.h"
+#include "bus/isa/isa_cards.h"
#include "machine/pc_lpt.h"
#include "bus/pc_kbd/pc_kbdc.h"
diff --git a/src/mess/includes/genpc.h b/src/mess/includes/genpc.h
index 44d5a20cefd..aaa7af47d72 100644
--- a/src/mess/includes/genpc.h
+++ b/src/mess/includes/genpc.h
@@ -10,8 +10,8 @@
#include "machine/ins8250.h"
#include "machine/i8255.h"
#include "machine/am9517a.h"
-#include "machine/isa.h"
-#include "machine/isa_cards.h"
+#include "bus/isa/isa.h"
+#include "bus/isa/isa_cards.h"
#include "bus/pc_kbd/pc_kbdc.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
diff --git a/src/mess/includes/mc1502.h b/src/mess/includes/mc1502.h
index cc13f3b64c4..d90ffddaf3a 100644
--- a/src/mess/includes/mc1502.h
+++ b/src/mess/includes/mc1502.h
@@ -10,12 +10,13 @@
#include "imagedev/cassette.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
-#include "machine/isa.h"
+#include "bus/isa/isa.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
-#include "machine/xsu_cards.h"
+#include "bus/isa/xsu_cards.h"
#include "sound/speaker.h"
+#include "bus/centronics/ctronics.h"
class mc1502_state : public driver_device
{
diff --git a/src/mess/includes/pc1512.h b/src/mess/includes/pc1512.h
index 390691f158c..9f7b8ab6db1 100644
--- a/src/mess/includes/pc1512.h
+++ b/src/mess/includes/pc1512.h
@@ -13,8 +13,8 @@
#include "machine/buffer.h"
#include "bus/centronics/ctronics.h"
#include "machine/ins8250.h"
-#include "machine/isa.h"
-#include "machine/isa_cards.h"
+#include "bus/isa/isa.h"
+#include "bus/isa/isa_cards.h"
#include "machine/mc146818.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
@@ -23,7 +23,7 @@
#include "machine/ram.h"
#include "sound/speaker.h"
#include "video/mc6845.h"
-#include "video/isa_pc1640_iga.h"
+#include "bus/isa/pc1640_iga.h"
#define I8086_TAG "ic120"
#define I8087_TAG "ic119"
diff --git a/src/mess/includes/poisk1.h b/src/mess/includes/poisk1.h
index e4877d9b232..27f59231d46 100644
--- a/src/mess/includes/poisk1.h
+++ b/src/mess/includes/poisk1.h
@@ -9,11 +9,11 @@
#include "imagedev/cassette.h"
#include "machine/i8255.h"
-#include "machine/isa.h"
+#include "bus/isa/isa.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
-#include "machine/xsu_cards.h"
+#include "bus/isa/xsu_cards.h"
#include "sound/speaker.h"
#define POISK1_UPDATE_ROW(name) \
diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c
index abd88b266ee..c1e9c87e40b 100644
--- a/src/mess/machine/apollo.c
+++ b/src/mess/machine/apollo.c
@@ -30,7 +30,7 @@
#include "includes/apollo.h"
-#include "machine/omti8621.h"
+#include "bus/isa/omti8621.h"
#define APOLLO_IRQ_VECTOR 0xa0
#define APOLLO_IRQ_PTM 0
diff --git a/src/mess/machine/isa_cards.h b/src/mess/machine/isa_cards.h
deleted file mode 100644
index 27287765521..00000000000
--- a/src/mess/machine/isa_cards.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-
- ISA cards
-
- license: MAME, GPL-2.0+
- copyright-holders: Dirk Best
-
-**********************************************************************/
-
-#pragma once
-
-#ifndef __ISA_CARDS_H__
-#define __ISA_CARDS_H__
-
-#include "emu.h"
-
-// video
-#include "video/isa_mda.h"
-#include "video/isa_cga.h"
-#include "video/isa_ega.h"
-#include "video/isa_vga.h"
-#include "video/isa_vga_ati.h"
-#include "video/isa_svga_cirrus.h"
-#include "video/isa_svga_s3.h"
-#include "video/isa_svga_tseng.h"
-
-// storage
-#include "machine/isa_fdc.h"
-#include "machine/isa_mufdc.h"
-#include "machine/isa_hdc.h"
-#include "machine/isa_wdxt_gen.h"
-#include "machine/isa_ide.h"
-#include "machine/isa_xtide.h"
-#include "machine/isa_side116.h"
-#include "machine/isa_aha1542.h"
-#include "machine/isa_wd1002a_wx1.h"
-
-// sound
-#include "machine/isa_adlib.h"
-#include "machine/isa_gblaster.h"
-#include "machine/isa_gus.h"
-#include "machine/isa_ibm_mfc.h"
-#include "machine/isa_mpu401.h"
-#include "machine/isa_sblaster.h"
-#include "machine/isa_ssi2001.h"
-#include "machine/isa_stereo_fx.h"
-#include "machine/isa_dectalk.h"
-
-// network
-#include "machine/3c503.h"
-#include "machine/ne1000.h"
-#include "machine/ne2000.h"
-
-// communication ports
-#include "machine/pc_lpt.h"
-#include "machine/isa_com.h"
-#include "machine/isa_pds.h"
-
-// other
-#include "machine/isa_finalchs.h"
-
-// supported devices
-SLOT_INTERFACE_EXTERN( pc_isa8_cards );
-SLOT_INTERFACE_EXTERN( pc_isa16_cards );
-
-#endif // __ISA_CARDS_H__
diff --git a/src/mess/machine/southbridge.h b/src/mess/machine/southbridge.h
index 4a800604817..92977ae9d0c 100644
--- a/src/mess/machine/southbridge.h
+++ b/src/mess/machine/southbridge.h
@@ -20,8 +20,8 @@
#include "sound/speaker.h"
#include "machine/ram.h"
#include "machine/nvram.h"
-#include "machine/isa.h"
-#include "machine/isa_cards.h"
+#include "bus/isa/isa.h"
+#include "bus/isa/isa_cards.h"
#include "machine/pc_lpt.h"
#include "bus/pc_kbd/pc_kbdc.h"
diff --git a/src/mess/mess.mak b/src/mess/mess.mak
index 2caaef1356d..40fbe63bb64 100644
--- a/src/mess/mess.mak
+++ b/src/mess/mess.mak
@@ -307,6 +307,7 @@ VIDEOS += UPD7220
VIDEOS += UPD7227
VIDEOS += V9938
#VIDEOS += VOODOO
+VIDEOS += CRTC_EGA
#-------------------------------------------------
# specify available machine cores
@@ -480,6 +481,10 @@ MACHINES += Z80SIO
MACHINES += Z80STI
MACHINES += Z8536
MACHINES += MM58167
+MACHINES += PC_LPT
+MACHINES += PC_FDC
+MACHINES += DP8390
+MACHINES += MPU401
#MACHINES += PROFILE
#-------------------------------------------------
@@ -502,10 +507,12 @@ BUSES += EP64
BUSES += IEEE488
BUSES += IMI7000
BUSES += IQ151
+BUSES += ISA
BUSES += ISBX
BUSES += KC
BUSES += MIDI
BUSES += NUBUS
+BUSES += PC_JOY
BUSES += PC_KBD
BUSES += PET
BUSES += PLUS4
@@ -601,7 +608,6 @@ DRVLIBS += \
$(MESSOBJ)/intel.a \
$(MESSOBJ)/interton.a \
$(MESSOBJ)/intv.a \
- $(MESSOBJ)/isa.a \
$(MESSOBJ)/isc.a \
$(MESSOBJ)/kaypro.a \
$(MESSOBJ)/koei.a \
@@ -795,12 +801,10 @@ $(MESSOBJ)/mame.a: \
$(MESSOBJ)/shared.a: \
$(MESS_AUDIO)/mea8000.o \
- $(MESS_MACHINE)/3c503.o \
$(MESS_MACHINE)/68561mpcc.o \
$(MESS_MACHINE)/8530scc.o \
$(MESS_MACHINE)/appldriv.o \
$(MESS_MACHINE)/applefdc.o \
- $(MESS_MACHINE)/dp8390.o \
$(MESS_MACHINE)/hd63450.o \
$(MESS_MACHINE)/i8271.o \
$(MESS_MACHINE)/kb3600.o \
@@ -808,13 +812,9 @@ $(MESSOBJ)/shared.a: \
$(MESS_MACHINE)/mb8795.o \
$(MESS_MACHINE)/microdrv.o \
$(MESS_MACHINE)/mpc105.o \
- $(MESS_MACHINE)/mpu401.o \
$(MESS_MACHINE)/msm6222b.o \
$(MESS_MACHINE)/ncr5380.o \
$(MESS_MACHINE)/ncr5390.o \
- $(MESS_MACHINE)/ne1000.o \
- $(MESS_MACHINE)/ne2000.o \
- $(MESS_MACHINE)/pc_lpt.o \
$(MESS_MACHINE)/s1410.o \
$(MESS_MACHINE)/sa1403d.o \
$(MESS_MACHINE)/sed1200.o \
@@ -825,42 +825,6 @@ $(MESSOBJ)/shared.a: \
$(MESS_MACHINE)/teleprinter.o \
$(MESS_MACHINE)/z80bin.o \
-$(MESSOBJ)/isa.a: \
- $(MESS_MACHINE)/isa.o \
- $(MESS_MACHINE)/isa_cards.o \
- $(MESS_VIDEO)/isa_mda.o \
- $(MESS_MACHINE)/isa_wdxt_gen.o \
- $(MESS_MACHINE)/isa_adlib.o \
- $(MESS_MACHINE)/isa_com.o \
- $(MESS_MACHINE)/isa_fdc.o \
- $(MESS_MACHINE)/isa_mufdc.o \
- $(MESS_MACHINE)/isa_finalchs.o \
- $(MESS_MACHINE)/isa_gblaster.o \
- $(MESS_MACHINE)/isa_gus.o \
- $(MESS_MACHINE)/isa_hdc.o \
- $(MESS_MACHINE)/isa_ibm_mfc.o \
- $(MESS_MACHINE)/isa_mpu401.o \
- $(MESS_MACHINE)/isa_sblaster.o \
- $(MESS_MACHINE)/isa_stereo_fx.o \
- $(MESS_MACHINE)/isa_ssi2001.o \
- $(MESS_MACHINE)/isa_ide.o \
- $(MESS_MACHINE)/isa_xtide.o \
- $(MESS_MACHINE)/isa_side116.o \
- $(MESS_MACHINE)/isa_aha1542.o \
- $(MESS_MACHINE)/isa_wd1002a_wx1.o\
- $(MESS_MACHINE)/isa_dectalk.o \
- $(MESS_MACHINE)/isa_pds.o \
- $(MESS_MACHINE)/omti8621.o \
- $(MESS_VIDEO)/isa_cga.o \
- $(MESS_VIDEO)/isa_svga_cirrus.o \
- $(MESS_VIDEO)/isa_ega.o \
- $(MESS_VIDEO)/isa_vga.o \
- $(MESS_VIDEO)/isa_vga_ati.o \
- $(MESS_VIDEO)/isa_svga_tseng.o \
- $(MESS_VIDEO)/isa_svga_s3.o \
- $(MESS_VIDEO)/s3virge.o \
- $(MESS_VIDEO)/isa_pc1640_iga.o \
-
#-------------------------------------------------
# manufacturer-specific groupings for drivers
#-------------------------------------------------
@@ -1677,10 +1641,6 @@ $(MESSOBJ)/pc9801.a: \
$(MESS_MACHINE)/pc9801_kbd.o\
$(MESSOBJ)/pcshare.a: \
- $(MESS_MACHINE)/pc_fdc.o \
- $(MESS_MACHINE)/pc_joy.o \
- $(MESS_MACHINE)/pc_joy_sw.o \
- $(MESS_VIDEO)/crtc_ega.o \
$(MESS_MACHINE)/i82371ab.o \
$(MESS_MACHINE)/i82371sb.o \
$(MESS_MACHINE)/i82439tx.o \
@@ -2166,14 +2126,8 @@ $(MESSOBJ)/xussrpc.a: \
$(MESS_DRIVERS)/ec184x.o \
$(MESS_DRIVERS)/iskr103x.o \
$(MESS_DRIVERS)/poisk1.o \
- $(MESS_MACHINE)/p1_fdc.o \
- $(MESS_MACHINE)/p1_hdc.o \
- $(MESS_MACHINE)/p1_rom.o \
$(MESS_VIDEO)/poisk1.o \
$(MESS_DRIVERS)/mc1502.o \
- $(MESS_MACHINE)/mc1502_fdc.o\
- $(MESS_MACHINE)/mc1502_rom.o\
- $(MESS_MACHINE)/xsu_cards.o \
$(MESSOBJ)/yamaha.a: \
$(MESS_DRIVERS)/ymmu100.o \