summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2013-10-22 21:17:44 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2013-10-22 21:17:44 +0000
commitea0c228af64579bb6617d3ff72cf7b106643c8b6 (patch)
tree9fffa0e0d9035c88a0b4a2b89fb04f416ccf19fe
parent92fe6738fcee026cb576d519ed584befd780367c (diff)
(MESS) Move NuBus and friends into the new bus structure (nw)
-rw-r--r--.gitattributes68
-rw-r--r--src/emu/bus/bus.mak25
-rw-r--r--src/emu/bus/nubus/nubus.c (renamed from src/mess/machine/nubus.c)2
-rw-r--r--src/emu/bus/nubus/nubus.h (renamed from src/mess/machine/nubus.h)0
-rw-r--r--src/emu/bus/nubus/nubus_48gc.c (renamed from src/mess/video/nubus_48gc.c)2
-rw-r--r--src/emu/bus/nubus/nubus_48gc.h (renamed from src/mess/video/nubus_48gc.h)2
-rw-r--r--src/emu/bus/nubus/nubus_asntmc3b.c (renamed from src/mess/machine/nubus_asntmc3b.c)2
-rw-r--r--src/emu/bus/nubus/nubus_asntmc3b.h (renamed from src/mess/machine/nubus_asntmc3b.h)2
-rw-r--r--src/emu/bus/nubus/nubus_cb264.c (renamed from src/mess/video/nubus_cb264.c)2
-rw-r--r--src/emu/bus/nubus/nubus_cb264.h (renamed from src/mess/video/nubus_cb264.h)2
-rw-r--r--src/emu/bus/nubus/nubus_image.c (renamed from src/mess/machine/nubus_image.c)2
-rw-r--r--src/emu/bus/nubus/nubus_image.h (renamed from src/mess/machine/nubus_image.h)2
-rw-r--r--src/emu/bus/nubus/nubus_m2hires.c (renamed from src/mess/video/nubus_m2hires.c)2
-rw-r--r--src/emu/bus/nubus/nubus_m2hires.h (renamed from src/mess/video/nubus_m2hires.h)2
-rw-r--r--src/emu/bus/nubus/nubus_m2video.c (renamed from src/mess/video/nubus_m2video.c)2
-rw-r--r--src/emu/bus/nubus/nubus_m2video.h (renamed from src/mess/video/nubus_m2video.h)2
-rw-r--r--src/emu/bus/nubus/nubus_radiustpd.c (renamed from src/mess/video/nubus_radiustpd.c)2
-rw-r--r--src/emu/bus/nubus/nubus_radiustpd.h (renamed from src/mess/video/nubus_radiustpd.h)2
-rw-r--r--src/emu/bus/nubus/nubus_spec8.c (renamed from src/mess/video/nubus_spec8.c)2
-rw-r--r--src/emu/bus/nubus/nubus_spec8.h (renamed from src/mess/video/nubus_spec8.h)2
-rw-r--r--src/emu/bus/nubus/nubus_specpdq.c (renamed from src/mess/video/nubus_specpdq.c)2
-rw-r--r--src/emu/bus/nubus/nubus_specpdq.h (renamed from src/mess/video/nubus_specpdq.h)2
-rw-r--r--src/emu/bus/nubus/nubus_vikbw.c (renamed from src/mess/video/nubus_vikbw.c)2
-rw-r--r--src/emu/bus/nubus/nubus_vikbw.h (renamed from src/mess/video/nubus_vikbw.h)2
-rw-r--r--src/emu/bus/nubus/nubus_wsportrait.c (renamed from src/mess/video/nubus_wsportrait.c)2
-rw-r--r--src/emu/bus/nubus/nubus_wsportrait.h (renamed from src/mess/video/nubus_wsportrait.h)2
-rw-r--r--src/emu/bus/nubus/pds30_30hr.c (renamed from src/mess/video/pds30_30hr.c)2
-rw-r--r--src/emu/bus/nubus/pds30_30hr.h (renamed from src/mess/video/pds30_30hr.h)2
-rw-r--r--src/emu/bus/nubus/pds30_cb264.c (renamed from src/mess/video/pds30_cb264.c)2
-rw-r--r--src/emu/bus/nubus/pds30_cb264.h (renamed from src/mess/video/pds30_cb264.h)2
-rw-r--r--src/emu/bus/nubus/pds30_mc30.c (renamed from src/mess/video/pds30_mc30.c)2
-rw-r--r--src/emu/bus/nubus/pds30_mc30.h (renamed from src/mess/video/pds30_mc30.h)2
-rw-r--r--src/emu/bus/nubus/pds30_procolor816.c (renamed from src/mess/video/pds30_procolor816.c)2
-rw-r--r--src/emu/bus/nubus/pds30_procolor816.h (renamed from src/mess/video/pds30_procolor816.h)2
-rw-r--r--src/emu/bus/nubus/pds30_sigmalview.c (renamed from src/mess/video/pds30_sigmalview.c)2
-rw-r--r--src/emu/bus/nubus/pds30_sigmalview.h (renamed from src/mess/video/pds30_sigmalview.h)2
-rw-r--r--src/emu/emu.mak1
-rw-r--r--src/mess/drivers/mac.c46
-rw-r--r--src/mess/includes/mac.h2
-rw-r--r--src/mess/mess.mak18
40 files changed, 124 insertions, 102 deletions
diff --git a/.gitattributes b/.gitattributes
index 69ca999d99b..898ad5b2f9e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -691,6 +691,40 @@ src/emu/bus/isbx/compis_fdc.c svneol=native#text/plain
src/emu/bus/isbx/compis_fdc.h svneol=native#text/plain
src/emu/bus/isbx/isbx.c svneol=native#text/plain
src/emu/bus/isbx/isbx.h svneol=native#text/plain
+src/emu/bus/nubus/nubus.c svneol=native#text/plain
+src/emu/bus/nubus/nubus.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_48gc.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_48gc.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_asntmc3b.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_asntmc3b.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_cb264.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_cb264.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_image.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_image.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_m2hires.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_m2hires.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_m2video.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_m2video.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_radiustpd.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_radiustpd.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_spec8.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_spec8.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_specpdq.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_specpdq.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_vikbw.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_vikbw.h svneol=native#text/plain
+src/emu/bus/nubus/nubus_wsportrait.c svneol=native#text/plain
+src/emu/bus/nubus/nubus_wsportrait.h svneol=native#text/plain
+src/emu/bus/nubus/pds30_30hr.c svneol=native#text/plain
+src/emu/bus/nubus/pds30_30hr.h svneol=native#text/plain
+src/emu/bus/nubus/pds30_cb264.c svneol=native#text/plain
+src/emu/bus/nubus/pds30_cb264.h svneol=native#text/plain
+src/emu/bus/nubus/pds30_mc30.c svneol=native#text/plain
+src/emu/bus/nubus/pds30_mc30.h svneol=native#text/plain
+src/emu/bus/nubus/pds30_procolor816.c svneol=native#text/plain
+src/emu/bus/nubus/pds30_procolor816.h svneol=native#text/plain
+src/emu/bus/nubus/pds30_sigmalview.c svneol=native#text/plain
+src/emu/bus/nubus/pds30_sigmalview.h svneol=native#text/plain
src/emu/bus/pet/64k.c svneol=native#text/plain
src/emu/bus/pet/64k.h svneol=native#text/plain
src/emu/bus/pet/c2n.c svneol=native#text/plain
@@ -7961,12 +7995,6 @@ src/mess/machine/nextmo.c svneol=native#text/plain
src/mess/machine/nextmo.h svneol=native#text/plain
src/mess/machine/northbridge.c svneol=native#text/plain
src/mess/machine/northbridge.h svneol=native#text/plain
-src/mess/machine/nubus.c svneol=native#text/plain
-src/mess/machine/nubus.h svneol=native#text/plain
-src/mess/machine/nubus_asntmc3b.c svneol=native#text/plain
-src/mess/machine/nubus_asntmc3b.h svneol=native#text/plain
-src/mess/machine/nubus_image.c svneol=native#text/plain
-src/mess/machine/nubus_image.h svneol=native#text/plain
src/mess/machine/null_modem.c svneol=native#text/plain
src/mess/machine/null_modem.h svneol=native#text/plain
src/mess/machine/omti8621.c svneol=native#text/plain
@@ -8420,24 +8448,6 @@ src/mess/video/newport.c svneol=native#text/plain
src/mess/video/newport.h svneol=native#text/plain
src/mess/video/nick.c svneol=native#text/plain
src/mess/video/nick.h svneol=native#text/plain
-src/mess/video/nubus_48gc.c svneol=native#text/plain
-src/mess/video/nubus_48gc.h svneol=native#text/plain
-src/mess/video/nubus_cb264.c svneol=native#text/plain
-src/mess/video/nubus_cb264.h svneol=native#text/plain
-src/mess/video/nubus_m2hires.c svneol=native#text/plain
-src/mess/video/nubus_m2hires.h svneol=native#text/plain
-src/mess/video/nubus_m2video.c svneol=native#text/plain
-src/mess/video/nubus_m2video.h svneol=native#text/plain
-src/mess/video/nubus_radiustpd.c svneol=native#text/plain
-src/mess/video/nubus_radiustpd.h svneol=native#text/plain
-src/mess/video/nubus_spec8.c svneol=native#text/plain
-src/mess/video/nubus_spec8.h svneol=native#text/plain
-src/mess/video/nubus_specpdq.c svneol=native#text/plain
-src/mess/video/nubus_specpdq.h svneol=native#text/plain
-src/mess/video/nubus_vikbw.c svneol=native#text/plain
-src/mess/video/nubus_vikbw.h svneol=native#text/plain
-src/mess/video/nubus_wsportrait.c svneol=native#text/plain
-src/mess/video/nubus_wsportrait.h svneol=native#text/plain
src/mess/video/ondra.c svneol=native#text/plain
src/mess/video/orao.c svneol=native#text/plain
src/mess/video/oric.c svneol=native#text/plain
@@ -8458,16 +8468,6 @@ src/mess/video/pc_t1t.h svneol=native#text/plain
src/mess/video/pcw.c svneol=native#text/plain
src/mess/video/pcw16.c svneol=native#text/plain
src/mess/video/pdp1.c svneol=native#text/plain
-src/mess/video/pds30_30hr.c svneol=native#text/plain
-src/mess/video/pds30_30hr.h svneol=native#text/plain
-src/mess/video/pds30_cb264.c svneol=native#text/plain
-src/mess/video/pds30_cb264.h svneol=native#text/plain
-src/mess/video/pds30_mc30.c svneol=native#text/plain
-src/mess/video/pds30_mc30.h svneol=native#text/plain
-src/mess/video/pds30_procolor816.c svneol=native#text/plain
-src/mess/video/pds30_procolor816.h svneol=native#text/plain
-src/mess/video/pds30_sigmalview.c svneol=native#text/plain
-src/mess/video/pds30_sigmalview.h svneol=native#text/plain
src/mess/video/pds_tpdfpd.c svneol=native#text/plain
src/mess/video/pds_tpdfpd.h svneol=native#text/plain
src/mess/video/pecom.c svneol=native#text/plain
diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak
index 2cd32a6c8a1..3dd7090ef2f 100644
--- a/src/emu/bus/bus.mak
+++ b/src/emu/bus/bus.mak
@@ -464,3 +464,28 @@ BUSOBJS += $(BUSOBJ)/a2bus/a2eext80col.o
BUSOBJS += $(BUSOBJ)/a2bus/a2eramworks3.o
endif
+#-------------------------------------------------
+#
+#@src/emu/bus/a2bus/nubus.h,BUSES += NUBUS
+#-------------------------------------------------
+
+ifneq ($(filter A2BUS,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/nubus/nubus.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_48gc.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_cb264.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_vikbw.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_specpdq.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_m2hires.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_spec8.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_radiustpd.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_m2video.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_asntmc3b.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_image.o
+BUSOBJS += $(BUSOBJ)/nubus/nubus_wsportrait.o
+BUSOBJS += $(BUSOBJ)/nubus/pds30_cb264.o
+BUSOBJS += $(BUSOBJ)/nubus/pds30_procolor816.o
+BUSOBJS += $(BUSOBJ)/nubus/pds30_sigmalview.o
+BUSOBJS += $(BUSOBJ)/nubus/pds30_30hr.o
+BUSOBJS += $(BUSOBJ)/nubus/pds30_mc30.o
+endif
+
diff --git a/src/mess/machine/nubus.c b/src/emu/bus/nubus/nubus.c
index 37b2d1830a9..580304b726e 100644
--- a/src/mess/machine/nubus.c
+++ b/src/emu/bus/nubus/nubus.c
@@ -8,7 +8,7 @@
#include "emu.h"
#include "emuopts.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
diff --git a/src/mess/machine/nubus.h b/src/emu/bus/nubus/nubus.h
index d89eed80b79..d89eed80b79 100644
--- a/src/mess/machine/nubus.h
+++ b/src/emu/bus/nubus/nubus.h
diff --git a/src/mess/video/nubus_48gc.c b/src/emu/bus/nubus/nubus_48gc.c
index 441663cb4a6..a905fb5b8b7 100644
--- a/src/mess/video/nubus_48gc.c
+++ b/src/emu/bus/nubus/nubus_48gc.c
@@ -7,7 +7,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/nubus_48gc.h"
+#include "nubus_48gc.h"
#define GC48_SCREEN_NAME "48gc_screen"
#define GC48_ROM_REGION "48gc_rom"
diff --git a/src/mess/video/nubus_48gc.h b/src/emu/bus/nubus/nubus_48gc.h
index f95d374e78d..dc2f6a19594 100644
--- a/src/mess/video/nubus_48gc.h
+++ b/src/emu/bus/nubus/nubus_48gc.h
@@ -4,7 +4,7 @@
#define __NUBUS_48GC_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/nubus_asntmc3b.c b/src/emu/bus/nubus/nubus_asntmc3b.c
index 5cc9ca071a9..f0f60be7671 100644
--- a/src/mess/machine/nubus_asntmc3b.c
+++ b/src/emu/bus/nubus/nubus_asntmc3b.c
@@ -11,7 +11,7 @@
***************************************************************************/
#include "emu.h"
-#include "machine/nubus_asntmc3b.h"
+#include "nubus_asntmc3b.h"
#define MAC8390_ROM_REGION "asntm3b_rom"
#define MAC8390_839X "dp83902"
diff --git a/src/mess/machine/nubus_asntmc3b.h b/src/emu/bus/nubus/nubus_asntmc3b.h
index 67721c8fb9c..645bde9e0de 100644
--- a/src/mess/machine/nubus_asntmc3b.h
+++ b/src/emu/bus/nubus/nubus_asntmc3b.h
@@ -4,7 +4,7 @@
#define __NUBUS_ASNTMC3B_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
#include "machine/dp8390.h"
//**************************************************************************
diff --git a/src/mess/video/nubus_cb264.c b/src/emu/bus/nubus/nubus_cb264.c
index 1c7f460af47..b67e93e708f 100644
--- a/src/mess/video/nubus_cb264.c
+++ b/src/emu/bus/nubus/nubus_cb264.c
@@ -12,7 +12,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/nubus_cb264.h"
+#include "nubus_cb264.h"
#define CB264_SCREEN_NAME "cb264_screen"
#define CB264_ROM_REGION "cb264_rom"
diff --git a/src/mess/video/nubus_cb264.h b/src/emu/bus/nubus/nubus_cb264.h
index 579884999ec..a2c306346ed 100644
--- a/src/mess/video/nubus_cb264.h
+++ b/src/emu/bus/nubus/nubus_cb264.h
@@ -4,7 +4,7 @@
#define __NUBUS_CB264_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/machine/nubus_image.c b/src/emu/bus/nubus/nubus_image.c
index 0d7fe98dfd6..656ffaa35e2 100644
--- a/src/mess/machine/nubus_image.c
+++ b/src/emu/bus/nubus/nubus_image.c
@@ -7,7 +7,7 @@
***************************************************************************/
#include "emu.h"
-#include "machine/nubus_image.h"
+#include "nubus_image.h"
#define IMAGE_ROM_REGION "image_rom"
#define IMAGE_DISK0_TAG "nb_disk"
diff --git a/src/mess/machine/nubus_image.h b/src/emu/bus/nubus/nubus_image.h
index 1917559ea6a..50916caf7d7 100644
--- a/src/mess/machine/nubus_image.h
+++ b/src/emu/bus/nubus/nubus_image.h
@@ -4,7 +4,7 @@
#define __NUBUS_IMAGE_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/nubus_m2hires.c b/src/emu/bus/nubus/nubus_m2hires.c
index 1fdb57c9f5e..592907269c0 100644
--- a/src/mess/video/nubus_m2hires.c
+++ b/src/emu/bus/nubus/nubus_m2hires.c
@@ -9,7 +9,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/nubus_m2hires.h"
+#include "nubus_m2hires.h"
#define M2HIRES_SCREEN_NAME "m2hires_screen"
#define M2HIRES_ROM_REGION "m2hires_rom"
diff --git a/src/mess/video/nubus_m2hires.h b/src/emu/bus/nubus/nubus_m2hires.h
index bdb84bd5a45..03bac4569f6 100644
--- a/src/mess/video/nubus_m2hires.h
+++ b/src/emu/bus/nubus/nubus_m2hires.h
@@ -4,7 +4,7 @@
#define __NUBUS_M2HIRES_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/nubus_m2video.c b/src/emu/bus/nubus/nubus_m2video.c
index 8d2c94750fb..c5f3a6c0d3c 100644
--- a/src/mess/video/nubus_m2video.c
+++ b/src/emu/bus/nubus/nubus_m2video.c
@@ -10,7 +10,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/nubus_m2video.h"
+#include "nubus_m2video.h"
#define M2VIDEO_SCREEN_NAME "m2video_screen"
#define M2VIDEO_ROM_REGION "m2video_rom"
diff --git a/src/mess/video/nubus_m2video.h b/src/emu/bus/nubus/nubus_m2video.h
index 1258acf5d0d..eacb9440bd0 100644
--- a/src/mess/video/nubus_m2video.h
+++ b/src/emu/bus/nubus/nubus_m2video.h
@@ -4,7 +4,7 @@
#define __NUBUS_M2VIDEO_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/nubus_radiustpd.c b/src/emu/bus/nubus/nubus_radiustpd.c
index 71a0e7008f4..d44333e5f06 100644
--- a/src/mess/video/nubus_radiustpd.c
+++ b/src/emu/bus/nubus/nubus_radiustpd.c
@@ -9,7 +9,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/nubus_radiustpd.h"
+#include "nubus_radiustpd.h"
#define RADIUSTPD_SCREEN_NAME "tpd_screen"
#define RADIUSTPD_ROM_REGION "tpd_rom"
diff --git a/src/mess/video/nubus_radiustpd.h b/src/emu/bus/nubus/nubus_radiustpd.h
index ff02f197093..4abf60b3809 100644
--- a/src/mess/video/nubus_radiustpd.h
+++ b/src/emu/bus/nubus/nubus_radiustpd.h
@@ -4,7 +4,7 @@
#define __NUBUS_RADIUSTPD_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/nubus_spec8.c b/src/emu/bus/nubus/nubus_spec8.c
index 6bb11cd2197..3f6496c524f 100644
--- a/src/mess/video/nubus_spec8.c
+++ b/src/emu/bus/nubus/nubus_spec8.c
@@ -11,7 +11,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/nubus_spec8.h"
+#include "nubus_spec8.h"
#define SPEC8S3_SCREEN_NAME "spec8s3_screen"
#define SPEC8S3_ROM_REGION "spec8s3_rom"
diff --git a/src/mess/video/nubus_spec8.h b/src/emu/bus/nubus/nubus_spec8.h
index 4f56ab84f93..689532b6b1b 100644
--- a/src/mess/video/nubus_spec8.h
+++ b/src/emu/bus/nubus/nubus_spec8.h
@@ -4,7 +4,7 @@
#define __NUBUS_SPEC8S3_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/nubus_specpdq.c b/src/emu/bus/nubus/nubus_specpdq.c
index 62d1ad20758..2ac5ddd90d8 100644
--- a/src/mess/video/nubus_specpdq.c
+++ b/src/emu/bus/nubus/nubus_specpdq.c
@@ -24,7 +24,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/nubus_specpdq.h"
+#include "nubus_specpdq.h"
#define SPECPDQ_SCREEN_NAME "specpdq_screen"
#define SPECPDQ_ROM_REGION "specpdq_rom"
diff --git a/src/mess/video/nubus_specpdq.h b/src/emu/bus/nubus/nubus_specpdq.h
index 44088a523c5..b9c080890ae 100644
--- a/src/mess/video/nubus_specpdq.h
+++ b/src/emu/bus/nubus/nubus_specpdq.h
@@ -4,7 +4,7 @@
#define __NUBUS_SPECPDQ_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/nubus_vikbw.c b/src/emu/bus/nubus/nubus_vikbw.c
index 85709b1bf50..a4635004f44 100644
--- a/src/mess/video/nubus_vikbw.c
+++ b/src/emu/bus/nubus/nubus_vikbw.c
@@ -9,7 +9,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/nubus_vikbw.h"
+#include "nubus_vikbw.h"
#define VIKBW_SCREEN_NAME "vikbw_screen"
#define VIKBW_ROM_REGION "vikbw_rom"
diff --git a/src/mess/video/nubus_vikbw.h b/src/emu/bus/nubus/nubus_vikbw.h
index 0db90d792b8..222210a2bc2 100644
--- a/src/mess/video/nubus_vikbw.h
+++ b/src/emu/bus/nubus/nubus_vikbw.h
@@ -4,7 +4,7 @@
#define __NUBUS_VIKBW_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/nubus_wsportrait.c b/src/emu/bus/nubus/nubus_wsportrait.c
index 7213760898e..4b184e4c1ae 100644
--- a/src/mess/video/nubus_wsportrait.c
+++ b/src/emu/bus/nubus/nubus_wsportrait.c
@@ -12,7 +12,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/nubus_wsportrait.h"
+#include "nubus_wsportrait.h"
#define WSPORTRAIT_SCREEN_NAME "wsport_screen"
#define WSPORTRAIT_ROM_REGION "wsport_rom"
diff --git a/src/mess/video/nubus_wsportrait.h b/src/emu/bus/nubus/nubus_wsportrait.h
index 32e9afc30f8..5a101a72763 100644
--- a/src/mess/video/nubus_wsportrait.h
+++ b/src/emu/bus/nubus/nubus_wsportrait.h
@@ -4,7 +4,7 @@
#define __NUBUS_WSPORTRAIT_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/pds30_30hr.c b/src/emu/bus/nubus/pds30_30hr.c
index e41b35ede0d..e31cb2d7719 100644
--- a/src/mess/video/pds30_30hr.c
+++ b/src/emu/bus/nubus/pds30_30hr.c
@@ -12,7 +12,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/pds30_30hr.h"
+#include "pds30_30hr.h"
#define XCEED30HR_SCREEN_NAME "x30hr_screen"
#define XCEED30HR_ROM_REGION "x30hr_rom"
diff --git a/src/mess/video/pds30_30hr.h b/src/emu/bus/nubus/pds30_30hr.h
index 593efdfbf95..7234026d9ca 100644
--- a/src/mess/video/pds30_30hr.h
+++ b/src/emu/bus/nubus/pds30_30hr.h
@@ -4,7 +4,7 @@
#define __NUBUS_XCEED30HR_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/pds30_cb264.c b/src/emu/bus/nubus/pds30_cb264.c
index 3fe0931fd20..1d8c3bbc356 100644
--- a/src/mess/video/pds30_cb264.c
+++ b/src/emu/bus/nubus/pds30_cb264.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/pds30_cb264.h"
+#include "pds30_cb264.h"
#define CB264SE30_SCREEN_NAME "cb264_screen"
#define CB264SE30_ROM_REGION "cb264_rom"
diff --git a/src/mess/video/pds30_cb264.h b/src/emu/bus/nubus/pds30_cb264.h
index 7fde5967647..35372ac39a7 100644
--- a/src/mess/video/pds30_cb264.h
+++ b/src/emu/bus/nubus/pds30_cb264.h
@@ -4,7 +4,7 @@
#define __NUBUS_CB264SE30_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/pds30_mc30.c b/src/emu/bus/nubus/pds30_mc30.c
index f6699783e6e..3ea20a0771b 100644
--- a/src/mess/video/pds30_mc30.c
+++ b/src/emu/bus/nubus/pds30_mc30.c
@@ -8,7 +8,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/pds30_mc30.h"
+#include "pds30_mc30.h"
#define XCEEDMC30_SCREEN_NAME "x30hr_screen"
#define XCEEDMC30_ROM_REGION "x30hr_rom"
diff --git a/src/mess/video/pds30_mc30.h b/src/emu/bus/nubus/pds30_mc30.h
index 96ff5a5fb75..ad96bf88ee7 100644
--- a/src/mess/video/pds30_mc30.h
+++ b/src/emu/bus/nubus/pds30_mc30.h
@@ -4,7 +4,7 @@
#define __NUBUS_XCEEDMC30_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/pds30_procolor816.c b/src/emu/bus/nubus/pds30_procolor816.c
index 96fc4bbfa5b..f204b90ab93 100644
--- a/src/mess/video/pds30_procolor816.c
+++ b/src/emu/bus/nubus/pds30_procolor816.c
@@ -11,7 +11,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/pds30_procolor816.h"
+#include "pds30_procolor816.h"
#define PROCOLOR816_SCREEN_NAME "cb264_screen"
#define PROCOLOR816_ROM_REGION "cb264_rom"
diff --git a/src/mess/video/pds30_procolor816.h b/src/emu/bus/nubus/pds30_procolor816.h
index 99b0c91704f..a87fb637a5c 100644
--- a/src/mess/video/pds30_procolor816.h
+++ b/src/emu/bus/nubus/pds30_procolor816.h
@@ -4,7 +4,7 @@
#define __NUBUS_PROCOLOR816_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mess/video/pds30_sigmalview.c b/src/emu/bus/nubus/pds30_sigmalview.c
index ce8b27a3887..b2efdecc03c 100644
--- a/src/mess/video/pds30_sigmalview.c
+++ b/src/emu/bus/nubus/pds30_sigmalview.c
@@ -5,7 +5,7 @@
***************************************************************************/
#include "emu.h"
-#include "video/pds30_sigmalview.h"
+#include "pds30_sigmalview.h"
#define LVIEW_SCREEN_NAME "lview_screen"
#define LVIEW_ROM_REGION "lview_rom"
diff --git a/src/mess/video/pds30_sigmalview.h b/src/emu/bus/nubus/pds30_sigmalview.h
index 1ee5eac67c5..bdee695ad8c 100644
--- a/src/mess/video/pds30_sigmalview.h
+++ b/src/emu/bus/nubus/pds30_sigmalview.h
@@ -4,7 +4,7 @@
#define __NUBUS_LVIEW_H__
#include "emu.h"
-#include "machine/nubus.h"
+#include "nubus.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 35f1314b7e1..bda24983acc 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -52,6 +52,7 @@ OBJDIRS += \
$(EMUOBJ)/bus/vip \
$(EMUOBJ)/bus/wangpc \
$(EMUOBJ)/bus/a2bus \
+ $(EMUOBJ)/bus/nubus \
$(EMUOBJ)/drivers \
$(EMUOBJ)/machine \
$(EMUOBJ)/layout \
diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c
index 30aa24b1157..ce143deba83 100644
--- a/src/mess/drivers/mac.c
+++ b/src/mess/drivers/mac.c
@@ -56,27 +56,32 @@
#include "machine/ram.h"
#include "machine/scsibus.h"
#include "machine/scsihd.h"
+#include "machine/scsicd.h"
#include "sound/asc.h"
#include "sound/awacs.h"
#include "sound/cdda.h"
-#include "video/nubus_48gc.h"
-#include "video/nubus_cb264.h"
-#include "video/nubus_vikbw.h"
-#include "video/nubus_specpdq.h"
-#include "video/nubus_m2hires.h"
-#include "video/nubus_spec8.h"
-//#include "video/nubus_thundergx.h"
-#include "video/nubus_radiustpd.h"
-#include "video/nubus_wsportrait.h"
-#include "machine/nubus_asntmc3b.h"
-#include "machine/nubus_image.h"
-#include "video/nubus_m2video.h"
-#include "video/pds30_cb264.h"
-#include "video/pds30_procolor816.h"
-#include "video/pds30_sigmalview.h"
-#include "video/pds30_30hr.h"
-#include "video/pds30_mc30.h"
+
+// NuBus and 030/040 PDS cards
+#include "bus/nubus/nubus_48gc.h"
+#include "bus/nubus/nubus_cb264.h"
+#include "bus/nubus/nubus_vikbw.h"
+#include "bus/nubus/nubus_specpdq.h"
+#include "bus/nubus/nubus_m2hires.h"
+#include "bus/nubus/nubus_spec8.h"
+#include "bus/nubus/nubus_radiustpd.h"
+#include "bus/nubus/nubus_wsportrait.h"
+#include "bus/nubus/nubus_asntmc3b.h"
+#include "bus/nubus/nubus_image.h"
+#include "bus/nubus/nubus_m2video.h"
+#include "bus/nubus/pds30_cb264.h"
+#include "bus/nubus/pds30_procolor816.h"
+#include "bus/nubus/pds30_sigmalview.h"
+#include "bus/nubus/pds30_30hr.h"
+#include "bus/nubus/pds30_mc30.h"
+
+// 68000 PDS cards
#include "video/pds_tpdfpd.h"
+
#include "includes/mac.h"
#include "mac.lh"
@@ -1105,6 +1110,7 @@ static MACHINE_CONFIG_START( macii, mac_state )
MCFG_SCSIBUS_ADD("scsi")
MCFG_SCSIDEV_ADD("scsi:harddisk1", SCSIHD, SCSI_ID_6)
MCFG_SCSIDEV_ADD("scsi:harddisk2", SCSIHD, SCSI_ID_5)
+ MCFG_SCSIDEV_ADD("scsi:cdrom1", SCSICD, SCSI_ID_4)
MCFG_NCR5380_ADD("scsi:ncr5380", C7M, macplus_5380intf)
MCFG_IWM_ADD("fdc", mac_iwm_interface)
@@ -1980,6 +1986,11 @@ INPUT_PORTS_END
***************************************************************************/
+ROM_START( mactw )
+ ROM_REGION16_BE(0x20000, "bootrom", 0)
+ ROM_LOAD( "rom4.3t_07-04-83.bin", 0x0000, 0x10000, CRC(d2c42f18) SHA1(f868c09ca70383a69751c37a5a3110a9597462a4) )
+ROM_END
+
ROM_START( mac128k )
ROM_REGION16_BE(0x20000, "bootrom", 0)
ROM_LOAD16_WORD( "mac128k.rom", 0x00000, 0x10000, CRC(6d0c8a28) SHA1(9d86c883aa09f7ef5f086d9e32330ef85f1bc93b) )
@@ -2186,6 +2197,7 @@ ROM_START( maclc520 )
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+COMP( 1983, mactw, 0, 0, mac128k, macplus, mac_state, mac128k512k, "Apple Computer", "Macintosh (4.3T Prototype)", GAME_NOT_WORKING )
COMP( 1984, mac128k, 0, 0, mac128k, macplus, mac_state, mac128k512k, "Apple Computer", "Macintosh 128k", GAME_NOT_WORKING )
COMP( 1984, mac512k, mac128k, 0, mac512ke, macplus, mac_state, mac128k512k, "Apple Computer", "Macintosh 512k", GAME_NOT_WORKING )
COMP( 1986, mac512ke, macplus, 0, mac512ke, macplus, mac_state, mac512ke, "Apple Computer", "Macintosh 512ke", 0 )
diff --git a/src/mess/includes/mac.h b/src/mess/includes/mac.h
index cd0ddbc20b9..b223a661ebc 100644
--- a/src/mess/includes/mac.h
+++ b/src/mess/includes/mac.h
@@ -14,7 +14,7 @@
#include "machine/ram.h"
#include "machine/egret.h"
#include "machine/cuda.h"
-#include "machine/nubus.h"
+#include "bus/nubus/nubus.h"
#include "machine/macpds.h"
#include "machine/ncr539x.h"
#include "machine/ncr5380.h"
diff --git a/src/mess/mess.mak b/src/mess/mess.mak
index e75d1c4fa79..d663f8cb032 100644
--- a/src/mess/mess.mak
+++ b/src/mess/mess.mak
@@ -506,6 +506,7 @@ BUSES += VCS
BUSES += VIP
BUSES += WANGPC
BUSES += A2BUS
+BUSES += NUBUS
#-------------------------------------------------
# this is the list of driver libraries that
@@ -937,7 +938,6 @@ $(MESSOBJ)/apple.a: \
$(MESS_MACHINE)/ay3600.o \
$(MESS_MACHINE)/lisa.o \
$(MESS_DRIVERS)/lisa.o \
- $(MESS_MACHINE)/nubus.o \
$(MESS_AUDIO)/mac.o \
$(MESS_VIDEO)/mac.o \
$(MESS_MACHINE)/mac.o \
@@ -956,22 +956,6 @@ $(MESSOBJ)/apple.a: \
$(MESS_MACHINE)/cuda.o \
$(MESS_MACHINE)/mackbd.o \
$(MESS_MACHINE)/swim.o \
- $(MESS_VIDEO)/nubus_48gc.o \
- $(MESS_VIDEO)/nubus_cb264.o \
- $(MESS_VIDEO)/nubus_vikbw.o \
- $(MESS_VIDEO)/nubus_specpdq.o \
- $(MESS_VIDEO)/nubus_m2hires.o \
- $(MESS_VIDEO)/nubus_spec8.o \
- $(MESS_VIDEO)/nubus_radiustpd.o \
- $(MESS_VIDEO)/nubus_m2video.o \
- $(MESS_MACHINE)/nubus_asntmc3b.o \
- $(MESS_MACHINE)/nubus_image.o \
- $(MESS_VIDEO)/nubus_wsportrait.o \
- $(MESS_VIDEO)/pds30_cb264.o \
- $(MESS_VIDEO)/pds30_procolor816.o \
- $(MESS_VIDEO)/pds30_sigmalview.o \
- $(MESS_VIDEO)/pds30_30hr.o \
- $(MESS_VIDEO)/pds30_mc30.o \
$(MESS_MACHINE)/macpds.o \
$(MESS_VIDEO)/pds_tpdfpd.o \