summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2013-10-22 16:45:06 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2013-10-22 16:45:06 +0000
commitcd6f73b9c7a6a8b8ee734051cf4ae9fabff477da (patch)
tree49ff21880abf2d678c4b297fbf12115973af8bf7
parentef774dd504626acb2e7648ada9ea8d8783937795 (diff)
(MESS) Apple II bus moving day (nw)
-rw-r--r--.gitattributes112
-rw-r--r--src/emu/bus/a2bus/a2alfam2.c (renamed from src/mess/machine/a2alfam2.c)0
-rw-r--r--src/emu/bus/a2bus/a2alfam2.h (renamed from src/mess/machine/a2alfam2.h)2
-rw-r--r--src/emu/bus/a2bus/a2applicard.c (renamed from src/mess/machine/a2applicard.c)0
-rw-r--r--src/emu/bus/a2bus/a2applicard.h (renamed from src/mess/machine/a2applicard.h)2
-rw-r--r--src/emu/bus/a2bus/a2arcadebd.c (renamed from src/mess/machine/a2arcadebd.c)2
-rw-r--r--src/emu/bus/a2bus/a2arcadebd.h (renamed from src/mess/machine/a2arcadebd.h)2
-rw-r--r--src/emu/bus/a2bus/a2bus.c (renamed from src/mess/machine/a2bus.c)2
-rw-r--r--src/emu/bus/a2bus/a2bus.h (renamed from src/mess/machine/a2bus.h)0
-rw-r--r--src/emu/bus/a2bus/a2cffa.c (renamed from src/mess/machine/a2cffa.c)0
-rw-r--r--src/emu/bus/a2bus/a2cffa.h (renamed from src/mess/machine/a2cffa.h)2
-rw-r--r--src/emu/bus/a2bus/a2diskii.c (renamed from src/mess/machine/a2diskii.c)2
-rw-r--r--src/emu/bus/a2bus/a2diskii.h (renamed from src/mess/machine/a2diskii.h)2
-rw-r--r--src/emu/bus/a2bus/a2eauxslot.c (renamed from src/mess/machine/a2eauxslot.c)2
-rw-r--r--src/emu/bus/a2bus/a2eauxslot.h (renamed from src/mess/machine/a2eauxslot.h)2
-rw-r--r--src/emu/bus/a2bus/a2echoii.c (renamed from src/mess/machine/a2echoii.c)0
-rw-r--r--src/emu/bus/a2bus/a2echoii.h (renamed from src/mess/machine/a2echoii.h)2
-rw-r--r--src/emu/bus/a2bus/a2eext80col.c (renamed from src/mess/machine/a2eext80col.c)2
-rw-r--r--src/emu/bus/a2bus/a2eext80col.h (renamed from src/mess/machine/a2eext80col.h)2
-rw-r--r--src/emu/bus/a2bus/a2eramworks3.c (renamed from src/mess/machine/a2eramworks3.c)2
-rw-r--r--src/emu/bus/a2bus/a2eramworks3.h (renamed from src/mess/machine/a2eramworks3.h)2
-rw-r--r--src/emu/bus/a2bus/a2estd80col.c (renamed from src/mess/machine/a2estd80col.c)2
-rw-r--r--src/emu/bus/a2bus/a2estd80col.h (renamed from src/mess/machine/a2estd80col.h)2
-rw-r--r--src/emu/bus/a2bus/a2hsscsi.c (renamed from src/mess/machine/a2hsscsi.c)0
-rw-r--r--src/emu/bus/a2bus/a2hsscsi.h (renamed from src/mess/machine/a2hsscsi.h)2
-rw-r--r--src/emu/bus/a2bus/a2lang.c (renamed from src/mess/machine/a2lang.c)2
-rw-r--r--src/emu/bus/a2bus/a2lang.h (renamed from src/mess/machine/a2lang.h)2
-rw-r--r--src/emu/bus/a2bus/a2memexp.c (renamed from src/mess/machine/a2memexp.c)0
-rw-r--r--src/emu/bus/a2bus/a2memexp.h (renamed from src/mess/machine/a2memexp.h)2
-rw-r--r--src/emu/bus/a2bus/a2midi.c (renamed from src/mess/machine/a2midi.c)2
-rw-r--r--src/emu/bus/a2bus/a2midi.h (renamed from src/mess/machine/a2midi.h)2
-rw-r--r--src/emu/bus/a2bus/a2mockingboard.c (renamed from src/mess/machine/a2mockingboard.c)2
-rw-r--r--src/emu/bus/a2bus/a2mockingboard.h (renamed from src/mess/machine/a2mockingboard.h)2
-rw-r--r--src/emu/bus/a2bus/a2sam.c (renamed from src/mess/machine/a2sam.c)0
-rw-r--r--src/emu/bus/a2bus/a2sam.h (renamed from src/mess/machine/a2sam.h)2
-rw-r--r--src/emu/bus/a2bus/a2scsi.c (renamed from src/mess/machine/a2scsi.c)0
-rw-r--r--src/emu/bus/a2bus/a2scsi.h (renamed from src/mess/machine/a2scsi.h)2
-rw-r--r--src/emu/bus/a2bus/a2softcard.c (renamed from src/mess/machine/a2softcard.c)0
-rw-r--r--src/emu/bus/a2bus/a2softcard.h (renamed from src/mess/machine/a2softcard.h)2
-rw-r--r--src/emu/bus/a2bus/a2ssc.c (renamed from src/mess/machine/a2ssc.c)2
-rw-r--r--src/emu/bus/a2bus/a2ssc.h (renamed from src/mess/machine/a2ssc.h)2
-rw-r--r--src/emu/bus/a2bus/a2swyft.c (renamed from src/mess/machine/a2swyft.c)2
-rw-r--r--src/emu/bus/a2bus/a2swyft.h (renamed from src/mess/machine/a2swyft.h)2
-rw-r--r--src/emu/bus/a2bus/a2themill.c (renamed from src/mess/machine/a2themill.c)0
-rw-r--r--src/emu/bus/a2bus/a2themill.h (renamed from src/mess/machine/a2themill.h)2
-rw-r--r--src/emu/bus/a2bus/a2thunderclock.c (renamed from src/mess/machine/a2thunderclock.c)0
-rw-r--r--src/emu/bus/a2bus/a2thunderclock.h (renamed from src/mess/machine/a2thunderclock.h)2
-rw-r--r--src/emu/bus/a2bus/a2videoterm.c (renamed from src/mess/machine/a2videoterm.c)0
-rw-r--r--src/emu/bus/a2bus/a2videoterm.h (renamed from src/mess/machine/a2videoterm.h)2
-rw-r--r--src/emu/bus/a2bus/a2vulcan.c (renamed from src/mess/machine/a2vulcan.c)0
-rw-r--r--src/emu/bus/a2bus/a2vulcan.h (renamed from src/mess/machine/a2vulcan.h)2
-rw-r--r--src/emu/bus/a2bus/a2zipdrive.c (renamed from src/mess/machine/a2zipdrive.c)0
-rw-r--r--src/emu/bus/a2bus/a2zipdrive.h (renamed from src/mess/machine/a2zipdrive.h)2
-rw-r--r--src/emu/bus/a2bus/laser128.c (renamed from src/mess/machine/laser128.c)0
-rw-r--r--src/emu/bus/a2bus/laser128.h (renamed from src/mess/machine/laser128.h)2
-rw-r--r--src/emu/bus/bus.mak36
-rw-r--r--src/emu/emu.mak1
-rw-r--r--src/emu/machine/machine.mak9
-rw-r--r--src/emu/machine/ncr5380n.c (renamed from src/mess/machine/ncr5380n.c)0
-rw-r--r--src/emu/machine/ncr5380n.h (renamed from src/mess/machine/ncr5380n.h)4
-rw-r--r--src/mess/drivers/apple2.c52
-rw-r--r--src/mess/drivers/apple2gs.c38
-rw-r--r--src/mess/includes/apple2.h8
-rw-r--r--src/mess/machine/apple2.c20
-rw-r--r--src/mess/mess.mak30
-rw-r--r--src/mess/video/apple2.c2
66 files changed, 216 insertions, 172 deletions
diff --git a/.gitattributes b/.gitattributes
index f967d4041bc..69ca999d99b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -356,6 +356,60 @@ src/emu/attotime.c svneol=native#text/plain
src/emu/attotime.h svneol=native#text/plain
src/emu/audit.c svneol=native#text/plain
src/emu/audit.h svneol=native#text/plain
+src/emu/bus/a2bus/a2alfam2.c svneol=native#text/plain
+src/emu/bus/a2bus/a2alfam2.h svneol=native#text/plain
+src/emu/bus/a2bus/a2applicard.c svneol=native#text/plain
+src/emu/bus/a2bus/a2applicard.h svneol=native#text/plain
+src/emu/bus/a2bus/a2arcadebd.c svneol=native#text/plain
+src/emu/bus/a2bus/a2arcadebd.h svneol=native#text/plain
+src/emu/bus/a2bus/a2bus.c svneol=native#text/plain
+src/emu/bus/a2bus/a2bus.h svneol=native#text/plain
+src/emu/bus/a2bus/a2cffa.c svneol=native#text/plain
+src/emu/bus/a2bus/a2cffa.h svneol=native#text/plain
+src/emu/bus/a2bus/a2diskii.c svneol=native#text/plain
+src/emu/bus/a2bus/a2diskii.h svneol=native#text/plain
+src/emu/bus/a2bus/a2eauxslot.c svneol=native#text/plain
+src/emu/bus/a2bus/a2eauxslot.h svneol=native#text/plain
+src/emu/bus/a2bus/a2echoii.c svneol=native#text/plain
+src/emu/bus/a2bus/a2echoii.h svneol=native#text/plain
+src/emu/bus/a2bus/a2eext80col.c svneol=native#text/plain
+src/emu/bus/a2bus/a2eext80col.h svneol=native#text/plain
+src/emu/bus/a2bus/a2eramworks3.c svneol=native#text/plain
+src/emu/bus/a2bus/a2eramworks3.h svneol=native#text/plain
+src/emu/bus/a2bus/a2estd80col.c svneol=native#text/plain
+src/emu/bus/a2bus/a2estd80col.h svneol=native#text/plain
+src/emu/bus/a2bus/a2hsscsi.c svneol=native#text/plain
+src/emu/bus/a2bus/a2hsscsi.h svneol=native#text/plain
+src/emu/bus/a2bus/a2lang.c svneol=native#text/plain
+src/emu/bus/a2bus/a2lang.h svneol=native#text/plain
+src/emu/bus/a2bus/a2memexp.c svneol=native#text/plain
+src/emu/bus/a2bus/a2memexp.h svneol=native#text/plain
+src/emu/bus/a2bus/a2midi.c svneol=native#text/plain
+src/emu/bus/a2bus/a2midi.h svneol=native#text/plain
+src/emu/bus/a2bus/a2mockingboard.c svneol=native#text/plain
+src/emu/bus/a2bus/a2mockingboard.h svneol=native#text/plain
+src/emu/bus/a2bus/a2sam.c svneol=native#text/plain
+src/emu/bus/a2bus/a2sam.h svneol=native#text/plain
+src/emu/bus/a2bus/a2scsi.c svneol=native#text/plain
+src/emu/bus/a2bus/a2scsi.h svneol=native#text/plain
+src/emu/bus/a2bus/a2softcard.c svneol=native#text/plain
+src/emu/bus/a2bus/a2softcard.h svneol=native#text/plain
+src/emu/bus/a2bus/a2ssc.c svneol=native#text/plain
+src/emu/bus/a2bus/a2ssc.h svneol=native#text/plain
+src/emu/bus/a2bus/a2swyft.c svneol=native#text/plain
+src/emu/bus/a2bus/a2swyft.h svneol=native#text/plain
+src/emu/bus/a2bus/a2themill.c svneol=native#text/plain
+src/emu/bus/a2bus/a2themill.h svneol=native#text/plain
+src/emu/bus/a2bus/a2thunderclock.c svneol=native#text/plain
+src/emu/bus/a2bus/a2thunderclock.h svneol=native#text/plain
+src/emu/bus/a2bus/a2videoterm.c svneol=native#text/plain
+src/emu/bus/a2bus/a2videoterm.h svneol=native#text/plain
+src/emu/bus/a2bus/a2vulcan.c svneol=native#text/plain
+src/emu/bus/a2bus/a2vulcan.h svneol=native#text/plain
+src/emu/bus/a2bus/a2zipdrive.c svneol=native#text/plain
+src/emu/bus/a2bus/a2zipdrive.h svneol=native#text/plain
+src/emu/bus/a2bus/laser128.c svneol=native#text/plain
+src/emu/bus/a2bus/laser128.h svneol=native#text/plain
src/emu/bus/abc1600/abc1600.c svneol=native#text/plain
src/emu/bus/abc1600/abc1600.h svneol=native#text/plain
src/emu/bus/abc1600/lux4105.c svneol=native#text/plain
@@ -1809,6 +1863,8 @@ src/emu/machine/msm6242.c svneol=native#text/plain
src/emu/machine/msm6242.h svneol=native#text/plain
src/emu/machine/n68681.c svneol=native#text/plain
src/emu/machine/n68681.h svneol=native#text/plain
+src/emu/machine/ncr5380n.c svneol=native#text/plain
+src/emu/machine/ncr5380n.h svneol=native#text/plain
src/emu/machine/ncr539x.c svneol=native#text/plain
src/emu/machine/ncr539x.h svneol=native#text/plain
src/emu/machine/net_lib.c svneol=native#text/plain
@@ -7472,58 +7528,6 @@ src/mess/machine/990_hd.c svneol=native#text/plain
src/mess/machine/990_hd.h svneol=native#text/plain
src/mess/machine/990_tap.c svneol=native#text/plain
src/mess/machine/990_tap.h svneol=native#text/plain
-src/mess/machine/a2alfam2.c svneol=native#text/plain
-src/mess/machine/a2alfam2.h svneol=native#text/plain
-src/mess/machine/a2applicard.c svneol=native#text/plain
-src/mess/machine/a2applicard.h svneol=native#text/plain
-src/mess/machine/a2arcadebd.c svneol=native#text/plain
-src/mess/machine/a2arcadebd.h svneol=native#text/plain
-src/mess/machine/a2bus.c svneol=native#text/plain
-src/mess/machine/a2bus.h svneol=native#text/plain
-src/mess/machine/a2cffa.c svneol=native#text/plain
-src/mess/machine/a2cffa.h svneol=native#text/plain
-src/mess/machine/a2diskii.c svneol=native#text/plain
-src/mess/machine/a2diskii.h svneol=native#text/plain
-src/mess/machine/a2eauxslot.c svneol=native#text/plain
-src/mess/machine/a2eauxslot.h svneol=native#text/plain
-src/mess/machine/a2echoii.c svneol=native#text/plain
-src/mess/machine/a2echoii.h svneol=native#text/plain
-src/mess/machine/a2eext80col.c svneol=native#text/plain
-src/mess/machine/a2eext80col.h svneol=native#text/plain
-src/mess/machine/a2eramworks3.c svneol=native#text/plain
-src/mess/machine/a2eramworks3.h svneol=native#text/plain
-src/mess/machine/a2estd80col.c svneol=native#text/plain
-src/mess/machine/a2estd80col.h svneol=native#text/plain
-src/mess/machine/a2hsscsi.c svneol=native#text/plain
-src/mess/machine/a2hsscsi.h svneol=native#text/plain
-src/mess/machine/a2lang.c svneol=native#text/plain
-src/mess/machine/a2lang.h svneol=native#text/plain
-src/mess/machine/a2memexp.c svneol=native#text/plain
-src/mess/machine/a2memexp.h svneol=native#text/plain
-src/mess/machine/a2midi.c svneol=native#text/plain
-src/mess/machine/a2midi.h svneol=native#text/plain
-src/mess/machine/a2mockingboard.c svneol=native#text/plain
-src/mess/machine/a2mockingboard.h svneol=native#text/plain
-src/mess/machine/a2sam.c svneol=native#text/plain
-src/mess/machine/a2sam.h svneol=native#text/plain
-src/mess/machine/a2scsi.c svneol=native#text/plain
-src/mess/machine/a2scsi.h svneol=native#text/plain
-src/mess/machine/a2softcard.c svneol=native#text/plain
-src/mess/machine/a2softcard.h svneol=native#text/plain
-src/mess/machine/a2ssc.c svneol=native#text/plain
-src/mess/machine/a2ssc.h svneol=native#text/plain
-src/mess/machine/a2swyft.c svneol=native#text/plain
-src/mess/machine/a2swyft.h svneol=native#text/plain
-src/mess/machine/a2themill.c svneol=native#text/plain
-src/mess/machine/a2themill.h svneol=native#text/plain
-src/mess/machine/a2thunderclock.c svneol=native#text/plain
-src/mess/machine/a2thunderclock.h svneol=native#text/plain
-src/mess/machine/a2videoterm.c svneol=native#text/plain
-src/mess/machine/a2videoterm.h svneol=native#text/plain
-src/mess/machine/a2vulcan.c svneol=native#text/plain
-src/mess/machine/a2vulcan.h svneol=native#text/plain
-src/mess/machine/a2zipdrive.c svneol=native#text/plain
-src/mess/machine/a2zipdrive.h svneol=native#text/plain
src/mess/machine/a7800.c svneol=native#text/plain
src/mess/machine/abc1600mac.c svneol=native#text/plain
src/mess/machine/abc1600mac.h svneol=native#text/plain
@@ -7789,8 +7793,6 @@ src/mess/machine/keyboard.h svneol=native#text/plain
src/mess/machine/kr2376.c svneol=native#text/plain
src/mess/machine/kr2376.h svneol=native#text/plain
src/mess/machine/kramermc.c svneol=native#text/plain
-src/mess/machine/laser128.c svneol=native#text/plain
-src/mess/machine/laser128.h svneol=native#text/plain
src/mess/machine/lh5810.c svneol=native#text/plain
src/mess/machine/lh5810.h svneol=native#text/plain
src/mess/machine/lisa.c svneol=native#text/plain
@@ -7857,8 +7859,6 @@ src/mess/machine/nascom1.c svneol=native#text/plain
src/mess/machine/nc.c svneol=native#text/plain
src/mess/machine/ncr5380.c svneol=native#text/plain
src/mess/machine/ncr5380.h svneol=native#text/plain
-src/mess/machine/ncr5380n.c svneol=native#text/plain
-src/mess/machine/ncr5380n.h svneol=native#text/plain
src/mess/machine/ncr5390.c svneol=native#text/plain
src/mess/machine/ncr5390.h svneol=native#text/plain
src/mess/machine/ne1000.c svneol=native#text/plain
diff --git a/src/mess/machine/a2alfam2.c b/src/emu/bus/a2bus/a2alfam2.c
index be0dc235c19..be0dc235c19 100644
--- a/src/mess/machine/a2alfam2.c
+++ b/src/emu/bus/a2bus/a2alfam2.c
diff --git a/src/mess/machine/a2alfam2.h b/src/emu/bus/a2bus/a2alfam2.h
index 9ab0cba9ace..4aab22c5d05 100644
--- a/src/mess/machine/a2alfam2.h
+++ b/src/emu/bus/a2bus/a2alfam2.h
@@ -10,7 +10,7 @@
#define __A2BUS_ALFAM2__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "sound/sn76496.h"
//**************************************************************************
diff --git a/src/mess/machine/a2applicard.c b/src/emu/bus/a2bus/a2applicard.c
index c568f1085d5..c568f1085d5 100644
--- a/src/mess/machine/a2applicard.c
+++ b/src/emu/bus/a2bus/a2applicard.c
diff --git a/src/mess/machine/a2applicard.h b/src/emu/bus/a2bus/a2applicard.h
index e02ce521bfc..14e16296a06 100644
--- a/src/mess/machine/a2applicard.h
+++ b/src/emu/bus/a2bus/a2applicard.h
@@ -10,7 +10,7 @@
#define __A2BUS_APPLICARD__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/a2arcadebd.c b/src/emu/bus/a2bus/a2arcadebd.c
index 7de1209735a..f7a1eb6a71f 100644
--- a/src/mess/machine/a2arcadebd.c
+++ b/src/emu/bus/a2bus/a2arcadebd.c
@@ -12,7 +12,7 @@
*********************************************************************/
#include "emu.h"
-#include "machine/a2arcadebd.h"
+#include "a2arcadebd.h"
/***************************************************************************
diff --git a/src/mess/machine/a2arcadebd.h b/src/emu/bus/a2bus/a2arcadebd.h
index 2df441ee6e1..50a67aa41f8 100644
--- a/src/mess/machine/a2arcadebd.h
+++ b/src/emu/bus/a2bus/a2arcadebd.h
@@ -10,7 +10,7 @@
#define __A2BUS_ARCADEBOARD__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "video/tms9928a.h"
#include "sound/ay8910.h"
diff --git a/src/mess/machine/a2bus.c b/src/emu/bus/a2bus/a2bus.c
index b08a5b9427e..d57bef36dff 100644
--- a/src/mess/machine/a2bus.c
+++ b/src/emu/bus/a2bus/a2bus.c
@@ -70,7 +70,7 @@
#include "emu.h"
#include "emuopts.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
//**************************************************************************
diff --git a/src/mess/machine/a2bus.h b/src/emu/bus/a2bus/a2bus.h
index d08fffdc6e5..d08fffdc6e5 100644
--- a/src/mess/machine/a2bus.h
+++ b/src/emu/bus/a2bus/a2bus.h
diff --git a/src/mess/machine/a2cffa.c b/src/emu/bus/a2bus/a2cffa.c
index f0ccdbcd832..f0ccdbcd832 100644
--- a/src/mess/machine/a2cffa.c
+++ b/src/emu/bus/a2bus/a2cffa.c
diff --git a/src/mess/machine/a2cffa.h b/src/emu/bus/a2bus/a2cffa.h
index 069548b76f1..fda195298bf 100644
--- a/src/mess/machine/a2cffa.h
+++ b/src/emu/bus/a2bus/a2cffa.h
@@ -11,7 +11,7 @@
#define __A2BUS_CFFA2__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "machine/ataintf.h"
//**************************************************************************
diff --git a/src/mess/machine/a2diskii.c b/src/emu/bus/a2bus/a2diskii.c
index c73d1927dd5..5f0bcd11f87 100644
--- a/src/mess/machine/a2diskii.c
+++ b/src/emu/bus/a2bus/a2diskii.c
@@ -12,7 +12,7 @@
#include "formats/ap2_dsk.h"
#include "machine/appldriv.h"
#include "machine/applefdc.h"
-#include "machine/a2diskii.h"
+#include "a2diskii.h"
/***************************************************************************
diff --git a/src/mess/machine/a2diskii.h b/src/emu/bus/a2bus/a2diskii.h
index 50393bc2430..0161a191750 100644
--- a/src/mess/machine/a2diskii.h
+++ b/src/emu/bus/a2bus/a2diskii.h
@@ -10,7 +10,7 @@
#define __A2BUS_DISKII__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/a2eauxslot.c b/src/emu/bus/a2bus/a2eauxslot.c
index 9f4d01f15dd..c712d1d2814 100644
--- a/src/mess/machine/a2eauxslot.c
+++ b/src/emu/bus/a2bus/a2eauxslot.c
@@ -8,7 +8,7 @@
#include "emu.h"
#include "emuopts.h"
-#include "machine/a2eauxslot.h"
+#include "a2eauxslot.h"
//**************************************************************************
diff --git a/src/mess/machine/a2eauxslot.h b/src/emu/bus/a2bus/a2eauxslot.h
index afcf7f1a781..a33b2654255 100644
--- a/src/mess/machine/a2eauxslot.h
+++ b/src/emu/bus/a2bus/a2eauxslot.h
@@ -12,7 +12,7 @@
#define __A2EAUXSLOT_H__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/mess/machine/a2echoii.c b/src/emu/bus/a2bus/a2echoii.c
index 3d4da6b9116..3d4da6b9116 100644
--- a/src/mess/machine/a2echoii.c
+++ b/src/emu/bus/a2bus/a2echoii.c
diff --git a/src/mess/machine/a2echoii.h b/src/emu/bus/a2bus/a2echoii.h
index fee9eefa95e..d38d73654b7 100644
--- a/src/mess/machine/a2echoii.h
+++ b/src/emu/bus/a2bus/a2echoii.h
@@ -10,7 +10,7 @@
#define __A2BUS_ECHOII__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "sound/tms5220.h"
//**************************************************************************
diff --git a/src/mess/machine/a2eext80col.c b/src/emu/bus/a2bus/a2eext80col.c
index 18e8c5b987d..063bf7d2fc4 100644
--- a/src/mess/machine/a2eext80col.c
+++ b/src/emu/bus/a2bus/a2eext80col.c
@@ -8,7 +8,7 @@
#include "emu.h"
#include "includes/apple2.h"
-#include "machine/a2eext80col.h"
+#include "a2eext80col.h"
/***************************************************************************
diff --git a/src/mess/machine/a2eext80col.h b/src/emu/bus/a2bus/a2eext80col.h
index 6c1126d047f..197b882e9f7 100644
--- a/src/mess/machine/a2eext80col.h
+++ b/src/emu/bus/a2bus/a2eext80col.h
@@ -10,7 +10,7 @@
#define __A2EAUX_EXT80COL__
#include "emu.h"
-#include "machine/a2eauxslot.h"
+#include "a2eauxslot.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/a2eramworks3.c b/src/emu/bus/a2bus/a2eramworks3.c
index bd7a24b7807..33c65b5124f 100644
--- a/src/mess/machine/a2eramworks3.c
+++ b/src/emu/bus/a2bus/a2eramworks3.c
@@ -9,7 +9,7 @@
#include "emu.h"
#include "includes/apple2.h"
-#include "machine/a2eramworks3.h"
+#include "a2eramworks3.h"
/***************************************************************************
diff --git a/src/mess/machine/a2eramworks3.h b/src/emu/bus/a2bus/a2eramworks3.h
index 92f128859e2..0c869f8f09a 100644
--- a/src/mess/machine/a2eramworks3.h
+++ b/src/emu/bus/a2bus/a2eramworks3.h
@@ -10,7 +10,7 @@
#define __A2EAUX_RAMWORKS3__
#include "emu.h"
-#include "machine/a2eauxslot.h"
+#include "a2eauxslot.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/a2estd80col.c b/src/emu/bus/a2bus/a2estd80col.c
index 666a8c66081..73186f5b1d4 100644
--- a/src/mess/machine/a2estd80col.c
+++ b/src/emu/bus/a2bus/a2estd80col.c
@@ -8,7 +8,7 @@
#include "emu.h"
#include "includes/apple2.h"
-#include "machine/a2estd80col.h"
+#include "a2estd80col.h"
/***************************************************************************
diff --git a/src/mess/machine/a2estd80col.h b/src/emu/bus/a2bus/a2estd80col.h
index 56cb6d22283..83c0f1f424a 100644
--- a/src/mess/machine/a2estd80col.h
+++ b/src/emu/bus/a2bus/a2estd80col.h
@@ -10,7 +10,7 @@
#define __A2EAUX_STD80COL__
#include "emu.h"
-#include "machine/a2eauxslot.h"
+#include "a2eauxslot.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/a2hsscsi.c b/src/emu/bus/a2bus/a2hsscsi.c
index 3c74d555371..3c74d555371 100644
--- a/src/mess/machine/a2hsscsi.c
+++ b/src/emu/bus/a2bus/a2hsscsi.c
diff --git a/src/mess/machine/a2hsscsi.h b/src/emu/bus/a2bus/a2hsscsi.h
index 1e4f43bf5bd..01c24dfbb4f 100644
--- a/src/mess/machine/a2hsscsi.h
+++ b/src/emu/bus/a2bus/a2hsscsi.h
@@ -10,7 +10,7 @@
#define __A2BUS_HSSCSI__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "machine/ncr5380n.h"
//**************************************************************************
diff --git a/src/mess/machine/a2lang.c b/src/emu/bus/a2bus/a2lang.c
index 82b514a1f5e..29baf052188 100644
--- a/src/mess/machine/a2lang.c
+++ b/src/emu/bus/a2bus/a2lang.c
@@ -12,7 +12,7 @@
#include "emu.h"
#include "includes/apple2.h"
-#include "machine/a2lang.h"
+#include "a2lang.h"
/***************************************************************************
diff --git a/src/mess/machine/a2lang.h b/src/emu/bus/a2bus/a2lang.h
index 510b8ca2cb5..32626b99a8e 100644
--- a/src/mess/machine/a2lang.h
+++ b/src/emu/bus/a2bus/a2lang.h
@@ -10,7 +10,7 @@
#define __A2BUS_LANG__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/a2memexp.c b/src/emu/bus/a2bus/a2memexp.c
index 2608e89e760..2608e89e760 100644
--- a/src/mess/machine/a2memexp.c
+++ b/src/emu/bus/a2bus/a2memexp.c
diff --git a/src/mess/machine/a2memexp.h b/src/emu/bus/a2bus/a2memexp.h
index c6c4044fb9d..03b0ede895e 100644
--- a/src/mess/machine/a2memexp.h
+++ b/src/emu/bus/a2bus/a2memexp.h
@@ -10,7 +10,7 @@
#define __A2BUS_MEMEXP__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/a2midi.c b/src/emu/bus/a2bus/a2midi.c
index d1c2ebd2463..4b5cf6e97e3 100644
--- a/src/mess/machine/a2midi.c
+++ b/src/emu/bus/a2bus/a2midi.c
@@ -8,7 +8,7 @@
#include "emu.h"
#include "includes/apple2.h"
-#include "machine/a2midi.h"
+#include "a2midi.h"
/***************************************************************************
diff --git a/src/mess/machine/a2midi.h b/src/emu/bus/a2bus/a2midi.h
index 5482ca5eff2..f06c4f86630 100644
--- a/src/mess/machine/a2midi.h
+++ b/src/emu/bus/a2bus/a2midi.h
@@ -10,7 +10,7 @@
#define __A2BUS_MIDI__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
#include "machine/serial.h"
diff --git a/src/mess/machine/a2mockingboard.c b/src/emu/bus/a2bus/a2mockingboard.c
index 07ccf0d80ca..9c324ec678b 100644
--- a/src/mess/machine/a2mockingboard.c
+++ b/src/emu/bus/a2bus/a2mockingboard.c
@@ -8,7 +8,7 @@
*********************************************************************/
#include "emu.h"
-#include "machine/a2mockingboard.h"
+#include "a2mockingboard.h"
/***************************************************************************
diff --git a/src/mess/machine/a2mockingboard.h b/src/emu/bus/a2bus/a2mockingboard.h
index 9c779ccf9fe..b2dcdf14094 100644
--- a/src/mess/machine/a2mockingboard.h
+++ b/src/emu/bus/a2bus/a2mockingboard.h
@@ -10,7 +10,7 @@
#define __A2BUS_MOCKINGBOARD__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "machine/6522via.h"
#include "sound/ay8910.h"
#include "sound/tms5220.h"
diff --git a/src/mess/machine/a2sam.c b/src/emu/bus/a2bus/a2sam.c
index b9a73d95d06..b9a73d95d06 100644
--- a/src/mess/machine/a2sam.c
+++ b/src/emu/bus/a2bus/a2sam.c
diff --git a/src/mess/machine/a2sam.h b/src/emu/bus/a2bus/a2sam.h
index ebc91831d8c..9c60958a0bb 100644
--- a/src/mess/machine/a2sam.h
+++ b/src/emu/bus/a2bus/a2sam.h
@@ -10,7 +10,7 @@
#define __A2BUS_SAM__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "sound/dac.h"
//**************************************************************************
diff --git a/src/mess/machine/a2scsi.c b/src/emu/bus/a2bus/a2scsi.c
index d27903464b4..d27903464b4 100644
--- a/src/mess/machine/a2scsi.c
+++ b/src/emu/bus/a2bus/a2scsi.c
diff --git a/src/mess/machine/a2scsi.h b/src/emu/bus/a2bus/a2scsi.h
index 9e0f20661fa..74e2cfb4fce 100644
--- a/src/mess/machine/a2scsi.h
+++ b/src/emu/bus/a2bus/a2scsi.h
@@ -10,7 +10,7 @@
#define __A2BUS_SCSI__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "machine/ncr5380n.h"
//**************************************************************************
diff --git a/src/mess/machine/a2softcard.c b/src/emu/bus/a2bus/a2softcard.c
index abe14856625..abe14856625 100644
--- a/src/mess/machine/a2softcard.c
+++ b/src/emu/bus/a2bus/a2softcard.c
diff --git a/src/mess/machine/a2softcard.h b/src/emu/bus/a2bus/a2softcard.h
index d66595f0917..4c8ab984e45 100644
--- a/src/mess/machine/a2softcard.h
+++ b/src/emu/bus/a2bus/a2softcard.h
@@ -10,7 +10,7 @@
#define __A2BUS_SOFTCARD__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/a2ssc.c b/src/emu/bus/a2bus/a2ssc.c
index 85cf151cdca..72e455f0749 100644
--- a/src/mess/machine/a2ssc.c
+++ b/src/emu/bus/a2bus/a2ssc.c
@@ -8,7 +8,7 @@
#include "emu.h"
#include "includes/apple2.h"
-#include "machine/a2ssc.h"
+#include "a2ssc.h"
#include "machine/terminal.h"
#include "machine/null_modem.h"
#include "machine/serial.h"
diff --git a/src/mess/machine/a2ssc.h b/src/emu/bus/a2bus/a2ssc.h
index 41837a5098f..ada44ea659e 100644
--- a/src/mess/machine/a2ssc.h
+++ b/src/emu/bus/a2bus/a2ssc.h
@@ -10,7 +10,7 @@
#define __A2BUS_SSC__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "machine/mos6551.h"
//**************************************************************************
diff --git a/src/mess/machine/a2swyft.c b/src/emu/bus/a2bus/a2swyft.c
index dae9cefe92a..c326885f289 100644
--- a/src/mess/machine/a2swyft.c
+++ b/src/emu/bus/a2bus/a2swyft.c
@@ -8,7 +8,7 @@
#include "emu.h"
#include "includes/apple2.h"
-#include "machine/a2swyft.h"
+#include "a2swyft.h"
/***************************************************************************
diff --git a/src/mess/machine/a2swyft.h b/src/emu/bus/a2bus/a2swyft.h
index a0f2cb22788..c091f4ea32a 100644
--- a/src/mess/machine/a2swyft.h
+++ b/src/emu/bus/a2bus/a2swyft.h
@@ -10,7 +10,7 @@
#define __A2BUS_SWYFT__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/a2themill.c b/src/emu/bus/a2bus/a2themill.c
index 2eba107063e..2eba107063e 100644
--- a/src/mess/machine/a2themill.c
+++ b/src/emu/bus/a2bus/a2themill.c
diff --git a/src/mess/machine/a2themill.h b/src/emu/bus/a2bus/a2themill.h
index bdbd0c97dcb..f4de01b93e1 100644
--- a/src/mess/machine/a2themill.h
+++ b/src/emu/bus/a2bus/a2themill.h
@@ -10,7 +10,7 @@
#define __A2BUS_THEMILL__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/a2thunderclock.c b/src/emu/bus/a2bus/a2thunderclock.c
index ea5604521b6..ea5604521b6 100644
--- a/src/mess/machine/a2thunderclock.c
+++ b/src/emu/bus/a2bus/a2thunderclock.c
diff --git a/src/mess/machine/a2thunderclock.h b/src/emu/bus/a2bus/a2thunderclock.h
index 296010fe341..53a1eb6b1c7 100644
--- a/src/mess/machine/a2thunderclock.h
+++ b/src/emu/bus/a2bus/a2thunderclock.h
@@ -10,7 +10,7 @@
#define __A2BUS_THUNDERCLOCK__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "machine/upd1990a.h"
//**************************************************************************
diff --git a/src/mess/machine/a2videoterm.c b/src/emu/bus/a2bus/a2videoterm.c
index 35b14f2c3c7..35b14f2c3c7 100644
--- a/src/mess/machine/a2videoterm.c
+++ b/src/emu/bus/a2bus/a2videoterm.c
diff --git a/src/mess/machine/a2videoterm.h b/src/emu/bus/a2bus/a2videoterm.h
index 403bd7af405..f5eb6467e23 100644
--- a/src/mess/machine/a2videoterm.h
+++ b/src/emu/bus/a2bus/a2videoterm.h
@@ -10,7 +10,7 @@
#define __A2BUS_VIDEOTERM__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "video/mc6845.h"
//**************************************************************************
diff --git a/src/mess/machine/a2vulcan.c b/src/emu/bus/a2bus/a2vulcan.c
index 280e100a211..280e100a211 100644
--- a/src/mess/machine/a2vulcan.c
+++ b/src/emu/bus/a2bus/a2vulcan.c
diff --git a/src/mess/machine/a2vulcan.h b/src/emu/bus/a2bus/a2vulcan.h
index 45da45ca27d..21d96483f22 100644
--- a/src/mess/machine/a2vulcan.h
+++ b/src/emu/bus/a2bus/a2vulcan.h
@@ -10,7 +10,7 @@
#define __A2BUS_VULCAN__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "machine/ataintf.h"
//**************************************************************************
diff --git a/src/mess/machine/a2zipdrive.c b/src/emu/bus/a2bus/a2zipdrive.c
index 61ccb2d9495..61ccb2d9495 100644
--- a/src/mess/machine/a2zipdrive.c
+++ b/src/emu/bus/a2bus/a2zipdrive.c
diff --git a/src/mess/machine/a2zipdrive.h b/src/emu/bus/a2bus/a2zipdrive.h
index 77f35506638..d0fdb2b9a8e 100644
--- a/src/mess/machine/a2zipdrive.h
+++ b/src/emu/bus/a2bus/a2zipdrive.h
@@ -12,7 +12,7 @@
#define __A2BUS_ZIPDRIVE__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
#include "machine/ataintf.h"
//**************************************************************************
diff --git a/src/mess/machine/laser128.c b/src/emu/bus/a2bus/laser128.c
index 301a3f01d61..301a3f01d61 100644
--- a/src/mess/machine/laser128.c
+++ b/src/emu/bus/a2bus/laser128.c
diff --git a/src/mess/machine/laser128.h b/src/emu/bus/a2bus/laser128.h
index db9edc3c679..189d550500c 100644
--- a/src/mess/machine/laser128.h
+++ b/src/emu/bus/a2bus/laser128.h
@@ -10,7 +10,7 @@
#define __A2BUS_LASER128__
#include "emu.h"
-#include "machine/a2bus.h"
+#include "a2bus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak
index eb28955810a..2cd32a6c8a1 100644
--- a/src/emu/bus/bus.mak
+++ b/src/emu/bus/bus.mak
@@ -428,3 +428,39 @@ BUSOBJS += $(BUSOBJ)/wangpc/rtc.o
BUSOBJS += $(BUSOBJ)/wangpc/tig.o
BUSOBJS += $(BUSOBJ)/wangpc/wdc.o
endif
+
+#-------------------------------------------------
+#
+#@src/emu/bus/a2bus/a2bus.h,BUSES += A2BUS
+#-------------------------------------------------
+
+ifneq ($(filter A2BUS,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/a2bus/a2bus.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2lang.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2diskii.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2mockingboard.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2cffa.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2memexp.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2scsi.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2thunderclock.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2softcard.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2videoterm.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2ssc.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2swyft.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2eauxslot.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2themill.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2sam.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2alfam2.o
+BUSOBJS += $(BUSOBJ)/a2bus/laser128.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2echoii.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2arcadebd.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2midi.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2vulcan.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2zipdrive.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2applicard.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2hsscsi.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2estd80col.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2eext80col.o
+BUSOBJS += $(BUSOBJ)/a2bus/a2eramworks3.o
+endif
+
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 095ef08a981..35f1314b7e1 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -51,6 +51,7 @@ OBJDIRS += \
$(EMUOBJ)/bus/vidbrain \
$(EMUOBJ)/bus/vip \
$(EMUOBJ)/bus/wangpc \
+ $(EMUOBJ)/bus/a2bus \
$(EMUOBJ)/drivers \
$(EMUOBJ)/machine \
$(EMUOBJ)/layout \
diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak
index 00ddeace905..ad402869303 100644
--- a/src/emu/machine/machine.mak
+++ b/src/emu/machine/machine.mak
@@ -1576,3 +1576,12 @@ $(MACHINEOBJ)/s3c2400.o: $(MACHINESRC)/s3c24xx.c
$(MACHINEOBJ)/s3c2410.o: $(MACHINESRC)/s3c24xx.c
$(MACHINEOBJ)/s3c2440.o: $(MACHINESRC)/s3c24xx.c
+#-------------------------------------------------
+#
+#@src/emu/machine/ncr5380n.h,MACHINES += NCR5380N
+#-------------------------------------------------
+
+ifneq ($(filter NCR5380N,$(MACHINES)),)
+MACHINEOBJS += $(MACHINEOBJ)/ncr5380n.o
+endif
+
diff --git a/src/mess/machine/ncr5380n.c b/src/emu/machine/ncr5380n.c
index f05e26faf6c..f05e26faf6c 100644
--- a/src/mess/machine/ncr5380n.c
+++ b/src/emu/machine/ncr5380n.c
diff --git a/src/mess/machine/ncr5380n.h b/src/emu/machine/ncr5380n.h
index 2b0a0dd1105..27e2b65e629 100644
--- a/src/mess/machine/ncr5380n.h
+++ b/src/emu/machine/ncr5380n.h
@@ -6,8 +6,8 @@
*********************************************************************/
-#ifndef NCR5380_H
-#define NCR5380_H
+#ifndef NCR5380N_H
+#define NCR5380N_H
#include "machine/nscsi_bus.h"
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c
index 834372a4cfd..ff1bf1e2e1d 100644
--- a/src/mess/drivers/apple2.c
+++ b/src/mess/drivers/apple2.c
@@ -193,30 +193,30 @@ Apple 3.5 and Apple 5.25 drives - up to three devices
#include "sound/speaker.h"
#include "machine/ram.h"
-#include "machine/a2bus.h"
-#include "machine/a2lang.h"
-#include "machine/a2diskii.h"
-#include "machine/a2mockingboard.h"
-#include "machine/a2cffa.h"
-#include "machine/a2memexp.h"
-#include "machine/a2scsi.h"
-#include "machine/a2thunderclock.h"
-#include "machine/a2softcard.h"
-#include "machine/a2videoterm.h"
-#include "machine/a2ssc.h"
-#include "machine/a2swyft.h"
-#include "machine/a2themill.h"
-#include "machine/a2sam.h"
-#include "machine/a2alfam2.h"
-#include "machine/laser128.h"
-#include "machine/a2echoii.h"
-#include "machine/a2arcadebd.h"
-#include "machine/a2midi.h"
-#include "machine/a2zipdrive.h"
-#include "machine/a2applicard.h"
-#include "machine/a2estd80col.h"
-#include "machine/a2eext80col.h"
-#include "machine/a2eramworks3.h"
+#include "bus/a2bus/a2bus.h"
+#include "bus/a2bus/a2lang.h"
+#include "bus/a2bus/a2diskii.h"
+#include "bus/a2bus/a2mockingboard.h"
+#include "bus/a2bus/a2cffa.h"
+#include "bus/a2bus/a2memexp.h"
+#include "bus/a2bus/a2scsi.h"
+#include "bus/a2bus/a2thunderclock.h"
+#include "bus/a2bus/a2softcard.h"
+#include "bus/a2bus/a2videoterm.h"
+#include "bus/a2bus/a2ssc.h"
+#include "bus/a2bus/a2swyft.h"
+#include "bus/a2bus/a2themill.h"
+#include "bus/a2bus/a2sam.h"
+#include "bus/a2bus/a2alfam2.h"
+#include "bus/a2bus/laser128.h"
+#include "bus/a2bus/a2echoii.h"
+#include "bus/a2bus/a2arcadebd.h"
+#include "bus/a2bus/a2midi.h"
+#include "bus/a2bus/a2zipdrive.h"
+#include "bus/a2bus/a2applicard.h"
+#include "bus/a2bus/a2estd80col.h"
+#include "bus/a2bus/a2eext80col.h"
+#include "bus/a2bus/a2eramworks3.h"
/***************************************************************************
PARAMETERS
@@ -835,8 +835,8 @@ static MACHINE_CONFIG_DERIVED( laba2p, apple2p )
MCFG_A2BUS_SLOT_REMOVE("sl3")
MCFG_A2BUS_SLOT_REMOVE("sl6")
- MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl3", A2BUS_LAB_80COL, NULL)
- MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl6", A2BUS_LAB_FDC, NULL)
+// MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl3", A2BUS_LAB_80COL, NULL)
+ MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl6", A2BUS_IWM_FDC, NULL)
MACHINE_CONFIG_END
#endif
diff --git a/src/mess/drivers/apple2gs.c b/src/mess/drivers/apple2gs.c
index 8f736f38bdc..11d58d9fe90 100644
--- a/src/mess/drivers/apple2gs.c
+++ b/src/mess/drivers/apple2gs.c
@@ -57,24 +57,25 @@
#include "sound/speaker.h"
#include "machine/ram.h"
-#include "machine/a2bus.h"
-#include "machine/a2lang.h"
-#include "machine/a2diskii.h"
-#include "machine/a2mockingboard.h"
-#include "machine/a2cffa.h"
-#include "machine/a2memexp.h"
-#include "machine/a2scsi.h"
-#include "machine/a2thunderclock.h"
-#include "machine/a2ssc.h"
-#include "machine/a2softcard.h"
-#include "machine/a2sam.h"
-#include "machine/a2alfam2.h"
-#include "machine/a2echoii.h"
-#include "machine/a2arcadebd.h"
-#include "machine/a2midi.h"
-#include "machine/a2vulcan.h"
-#include "machine/a2zipdrive.h"
-//#include "machine/a2udrive.h"
+#include "bus/a2bus/a2bus.h"
+#include "bus/a2bus/a2lang.h"
+#include "bus/a2bus/a2diskii.h"
+#include "bus/a2bus/a2mockingboard.h"
+#include "bus/a2bus/a2cffa.h"
+#include "bus/a2bus/a2memexp.h"
+#include "bus/a2bus/a2scsi.h"
+#include "bus/a2bus/a2thunderclock.h"
+#include "bus/a2bus/a2ssc.h"
+#include "bus/a2bus/a2softcard.h"
+#include "bus/a2bus/a2sam.h"
+#include "bus/a2bus/a2alfam2.h"
+#include "bus/a2bus/a2echoii.h"
+#include "bus/a2bus/a2arcadebd.h"
+#include "bus/a2bus/a2midi.h"
+#include "bus/a2bus/a2vulcan.h"
+#include "bus/a2bus/a2zipdrive.h"
+//#include "bus/a2bus/a2udrive.h"
+#include "bus/a2bus/a2hsscsi.h"
static const gfx_layout apple2gs_text_layout =
{
@@ -315,6 +316,7 @@ static SLOT_INTERFACE_START(apple2_cards)
// SLOT_INTERFACE("softcard", A2BUS_SOFTCARD) /* Microsoft SoftCard */ // appears not to be IIgs compatible?
SLOT_INTERFACE("scsi", A2BUS_SCSI) /* Apple II SCSI Card */
+ SLOT_INTERFACE("hsscsi", A2BUS_HSSCSI) /* Apple II High-Speed SCSI Card */
SLOT_INTERFACE_END
static MACHINE_CONFIG_START( apple2gs, apple2gs_state )
diff --git a/src/mess/includes/apple2.h b/src/mess/includes/apple2.h
index 3f82586695b..f27d0769035 100644
--- a/src/mess/includes/apple2.h
+++ b/src/mess/includes/apple2.h
@@ -9,8 +9,8 @@
#ifndef APPLE2_H_
#define APPLE2_H_
-#include "machine/a2bus.h"
-#include "machine/a2eauxslot.h"
+#include "bus/a2bus/a2bus.h"
+#include "bus/a2bus/a2eauxslot.h"
#include "machine/applefdc.h"
#include "machine/ram.h"
#include "imagedev/cassette.h"
@@ -80,7 +80,8 @@ enum machine_type_t
APPLE_IIEPLUS, // Apple IIc/IIgs/IIc+ with permanent aux memory
TK2000, // Microdigital TK2000
LASER128, // Laser 128/128EX/128EX2
- SPACE84 // "Space 84" with flipped text mode
+ SPACE84, // "Space 84" with flipped text mode
+ LABA2P // lab equipment (?) II Plus with flipped text mode
};
enum bank_disposition_t
@@ -327,6 +328,7 @@ public:
DECLARE_MACHINE_START(tk2000);
DECLARE_MACHINE_START(laser128);
DECLARE_MACHINE_START(space84);
+ DECLARE_MACHINE_START(laba2p);
UINT32 screen_update_apple2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(apple2_interrupt);
DECLARE_WRITE8_MEMBER(a2bus_irq_w);
diff --git a/src/mess/machine/apple2.c b/src/mess/machine/apple2.c
index 5a8dca11a64..7bbd2968258 100644
--- a/src/mess/machine/apple2.c
+++ b/src/mess/machine/apple2.c
@@ -2226,6 +2226,26 @@ MACHINE_START_MEMBER(apple2_state,space84)
apple2_setup_memory(&mem_cfg);
}
+MACHINE_START_MEMBER(apple2_state,laba2p)
+{
+ apple2_memmap_config mem_cfg;
+ void *apple2cp_ce00_ram = NULL;
+
+ // II and II+ have no internal ROM or internal slot 3 h/w, so don't allow these states
+ m_flags_mask = VAR_INTCXROM|VAR_SLOTC3ROM;
+
+ m_machinetype = LABA2P;
+
+ apple2_init_common();
+
+ /* setup memory */
+ memset(&mem_cfg, 0, sizeof(mem_cfg));
+ mem_cfg.first_bank = 1;
+ mem_cfg.memmap = apple2_memmap_entries;
+ mem_cfg.auxmem = (UINT8*)apple2cp_ce00_ram;
+ apple2_setup_memory(&mem_cfg);
+}
+
MACHINE_START_MEMBER(apple2_state,tk2000)
{
apple2_memmap_config mem_cfg;
diff --git a/src/mess/mess.mak b/src/mess/mess.mak
index cab959451ad..e75d1c4fa79 100644
--- a/src/mess/mess.mak
+++ b/src/mess/mess.mak
@@ -409,6 +409,7 @@ MACHINES += MOS8726
MACHINES += MSM5832
MACHINES += MSM58321
MACHINES += MSM6242
+MACHINES += NCR5380N
MACHINES += NCR539x
MACHINES += NCR53C7XX
MACHINES += NMC9306
@@ -504,6 +505,7 @@ BUSES += VIDBRAIN
BUSES += VCS
BUSES += VIP
BUSES += WANGPC
+BUSES += A2BUS
#-------------------------------------------------
# this is the list of driver libraries that
@@ -791,7 +793,6 @@ $(MESSOBJ)/shared.a: \
$(MESS_MACHINE)/mpu401.o \
$(MESS_MACHINE)/msm6222b.o \
$(MESS_MACHINE)/ncr5380.o \
- $(MESS_MACHINE)/ncr5380n.o \
$(MESS_MACHINE)/ncr5390.o \
$(MESS_MACHINE)/ne1000.o \
$(MESS_MACHINE)/ne2000.o \
@@ -934,33 +935,6 @@ $(MESSOBJ)/apple.a: \
$(MESS_MACHINE)/apple2gs.o \
$(MESS_DRIVERS)/apple2gs.o \
$(MESS_MACHINE)/ay3600.o \
- $(MESS_MACHINE)/a2bus.o \
- $(MESS_MACHINE)/a2lang.o \
- $(MESS_MACHINE)/a2diskii.o \
- $(MESS_MACHINE)/a2mockingboard.o \
- $(MESS_MACHINE)/a2cffa.o \
- $(MESS_MACHINE)/a2memexp.o \
- $(MESS_MACHINE)/a2scsi.o \
- $(MESS_MACHINE)/a2thunderclock.o \
- $(MESS_MACHINE)/a2softcard.o \
- $(MESS_MACHINE)/a2videoterm.o \
- $(MESS_MACHINE)/a2ssc.o \
- $(MESS_MACHINE)/a2swyft.o \
- $(MESS_MACHINE)/a2eauxslot.o\
- $(MESS_MACHINE)/a2themill.o \
- $(MESS_MACHINE)/a2sam.o \
- $(MESS_MACHINE)/a2alfam2.o \
- $(MESS_MACHINE)/laser128.o \
- $(MESS_MACHINE)/a2echoii.o \
- $(MESS_MACHINE)/a2arcadebd.o\
- $(MESS_MACHINE)/a2midi.o \
- $(MESS_MACHINE)/a2vulcan.o \
- $(MESS_MACHINE)/a2zipdrive.o\
- $(MESS_MACHINE)/a2applicard.o \
- $(MESS_MACHINE)/a2hsscsi.o \
- $(MESS_MACHINE)/a2estd80col.o \
- $(MESS_MACHINE)/a2eext80col.o \
- $(MESS_MACHINE)/a2eramworks3.o \
$(MESS_MACHINE)/lisa.o \
$(MESS_DRIVERS)/lisa.o \
$(MESS_MACHINE)/nubus.o \
diff --git a/src/mess/video/apple2.c b/src/mess/video/apple2.c
index 864825fe0f7..cfe56a8144a 100644
--- a/src/mess/video/apple2.c
+++ b/src/mess/video/apple2.c
@@ -114,7 +114,7 @@ inline void apple2_state::apple2_plot_text_character(bitmap_ind16 &bitmap, int x
chardata = &textgfx_data[(code * 8) % textgfx_datalen];
/* and finally, plot the character itself */
- if (m_machinetype == SPACE84)
+ if ((m_machinetype == SPACE84) || (m_machinetype == LABA2P))
{
for (y = 0; y < 8; y++)
{