From cd7d56c770c78cf850c660bde93a159aaf02ffe9 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sun, 1 May 2016 13:15:10 +0200
Subject: [PATCH] midzeus fix (nw)

---
 scripts/target/mame/arcade.lua |  1 +
 src/mame/drivers/midzeus.cpp   |  1 +
 src/mame/includes/midzeus.h    | 21 ---------------------
 src/mame/includes/midzeus2.h   | 28 ++++++++++++++++++++++++++++
 src/mame/video/midzeus2.cpp    |  1 +
 5 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 src/mame/includes/midzeus2.h

diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 73853c46675..50adaa4421e 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -2491,6 +2491,7 @@ files {
 	MAME_DIR .. "src/mame/video/midyunit.cpp",
 	MAME_DIR .. "src/mame/drivers/midzeus.cpp",
 	MAME_DIR .. "src/mame/includes/midzeus.h",
+	MAME_DIR .. "src/mame/includes/midzeus2.h",
 	MAME_DIR .. "src/mame/video/midzeus.cpp",
 	MAME_DIR .. "src/mame/video/midzeus2.cpp",
 	MAME_DIR .. "src/mame/drivers/mw18w.cpp",
diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp
index 039e414411d..816dc219648 100644
--- a/src/mame/drivers/midzeus.cpp
+++ b/src/mame/drivers/midzeus.cpp
@@ -31,6 +31,7 @@ The Grid         v1.2   10/18/2000
 #include "cpu/adsp2100/adsp2100.h"
 #include "cpu/pic16c5x/pic16c5x.h"
 #include "includes/midzeus.h"
+#include "includes/midzeus2.h"
 #include "machine/midwayic.h"
 #include "audio/dcs.h"
 #include "machine/nvram.h"
diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h
index 54850ec49d3..9e8a717c3e0 100644
--- a/src/mame/includes/midzeus.h
+++ b/src/mame/includes/midzeus.h
@@ -85,24 +85,3 @@ private:
 	void update_gun_irq();
 };
 
-
-class midzeus2_state : public midzeus_state
-{
-public:
-	midzeus2_state(const machine_config &mconfig, device_type type, const char *tag)
-				: midzeus_state(mconfig, type, tag) { }
-
-	DECLARE_VIDEO_START(midzeus2);
-	UINT32 screen_update_midzeus2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	DECLARE_READ32_MEMBER( zeus2_r );
-	DECLARE_WRITE32_MEMBER( zeus2_w );
-private:
-	TIMER_CALLBACK_MEMBER(int_timer_callback);
-	void exit_handler2();
-	void zeus2_register32_w(offs_t offset, UINT32 data, int logit);
-	void zeus2_register_update(offs_t offset, UINT32 oldval, int logit);
-	int zeus2_fifo_process(const UINT32 *data, int numwords);
-	void zeus2_pointer_write(UINT8 which, UINT32 value);
-	void zeus2_draw_model(UINT32 baseaddr, UINT16 count, int logit);
-	void log_fifo_command(const UINT32 *data, int numwords, const char *suffix);
-};
diff --git a/src/mame/includes/midzeus2.h b/src/mame/includes/midzeus2.h
new file mode 100644
index 00000000000..ff876ae1b94
--- /dev/null
+++ b/src/mame/includes/midzeus2.h
@@ -0,0 +1,28 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+/*************************************************************************
+
+    Driver for Midway Zeus games
+
+**************************************************************************/
+
+class midzeus2_state : public midzeus_state
+{
+public:
+	midzeus2_state(const machine_config &mconfig, device_type type, const char *tag)
+				: midzeus_state(mconfig, type, tag) { }
+
+	DECLARE_VIDEO_START(midzeus2);
+	UINT32 screen_update_midzeus2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	DECLARE_READ32_MEMBER( zeus2_r );
+	DECLARE_WRITE32_MEMBER( zeus2_w );
+private:
+	TIMER_CALLBACK_MEMBER(int_timer_callback);
+	void exit_handler2();
+	void zeus2_register32_w(offs_t offset, UINT32 data, int logit);
+	void zeus2_register_update(offs_t offset, UINT32 oldval, int logit);
+	int zeus2_fifo_process(const UINT32 *data, int numwords);
+	void zeus2_pointer_write(UINT8 which, UINT32 value);
+	void zeus2_draw_model(UINT32 baseaddr, UINT16 count, int logit);
+	void log_fifo_command(const UINT32 *data, int numwords, const char *suffix);
+};
diff --git a/src/mame/video/midzeus2.cpp b/src/mame/video/midzeus2.cpp
index be97a461cfb..7f196f35780 100644
--- a/src/mame/video/midzeus2.cpp
+++ b/src/mame/video/midzeus2.cpp
@@ -9,6 +9,7 @@
 #include "emu.h"
 #include "cpu/tms32031/tms32031.h"
 #include "includes/midzeus.h"
+#include "includes/midzeus2.h"
 #include "video/poly.h"
 #include "video/rgbutil.h"