From b5e2246ce3dcd030bd8157b553d6194cfb4445e3 Mon Sep 17 00:00:00 2001
From: angelosa <salese_corp_ltd@email.it>
Date: Fri, 9 Mar 2018 00:45:50 +0100
Subject: [PATCH] model2.cpp: some save state registration (nw)

---
 src/mame/drivers/model2.cpp | 27 ++++++++++++++++++++++++++-
 src/mame/includes/model2.h  | 29 ++++++++++++++---------------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index addceb6b0e7..d4cf0ce0d26 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -368,6 +368,32 @@ MACHINE_START_MEMBER(model2_state,model2)
 	
 	// initialize custom debugger pool, @see machine/model2.cpp
 	debug_init();
+	
+	save_item(NAME(m_intreq));
+	save_item(NAME(m_intena));
+	save_item(NAME(m_coproctl));
+	save_item(NAME(m_coprocnt));
+	save_item(NAME(m_geoctl));
+	save_item(NAME(m_geocnt));
+	save_item(NAME(m_ctrlmode));
+	save_item(NAME(m_analog_channel));
+	save_item(NAME(m_timervals[0]));
+	save_item(NAME(m_timervals[1]));
+	save_item(NAME(m_timervals[2]));
+	save_item(NAME(m_timervals[3]));
+	save_item(NAME(m_timerrun[0]));
+	save_item(NAME(m_timerrun[1]));
+	save_item(NAME(m_timerrun[2]));
+	save_item(NAME(m_timerrun[3]));
+
+	save_item(NAME(m_copro_fifoin_rpos));
+	save_item(NAME(m_copro_fifoin_wpos));
+	save_item(NAME(m_copro_fifoin_num));
+	save_item(NAME(m_copro_fifoout_rpos));
+	save_item(NAME(m_copro_fifoout_wpos));
+	save_item(NAME(m_copro_fifoout_num));
+	save_item(NAME(m_geo_write_start_address));
+	save_item(NAME(m_geo_read_start_address));
 }
 
 MACHINE_START_MEMBER(model2_state,srallyc)
@@ -393,7 +419,6 @@ MACHINE_RESET_MEMBER(model2_state,model2_common)
 	m_geocnt = 0;
 	m_ctrlmode = 0;
 	m_analog_channel = 0;
-	m_soundack = 0;
 
 	m_timervals[0] = 0xfffff;
 	m_timervals[1] = 0xfffff;
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index f09265c837d..b16f9b84416 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -98,18 +98,6 @@ public:
 	optional_ioport_array<4> m_analog_ports;
 	optional_ioport_array<4> m_lightgun_ports;
 
-	int m_port_1c00004;
-	int m_port_1c00006;
-	int m_port_1c00010;
-	int m_port_1c00012;
-	int m_port_1c00014;
-
-	uint32_t m_intreq;
-	uint32_t m_intena;
-	uint32_t m_coproctl;
-	uint32_t m_coprocnt;
-	uint32_t m_geoctl;
-	uint32_t m_geocnt;
 	uint32_t m_timervals[4];
 	uint32_t m_timerorig[4];
 	int m_timerrun[4];
@@ -131,7 +119,6 @@ public:
 	uint32_t m_iop_data;
 	int m_geo_iop_write_num;
 	uint32_t m_geo_iop_data;
-	int m_to_68k;
 
 	uint32_t m_geo_read_start_address;
 	uint32_t m_geo_write_start_address;
@@ -139,8 +126,7 @@ public:
 	raster_state *m_raster;
 	geo_state *m_geo;
 	bitmap_rgb32 m_sys24_bitmap;
-	uint32_t m_videocontrol;
-	uint32_t m_soundack;
+//	uint32_t m_soundack;
 	void model2_check_irq_state();
 	void model2_check_irqack_state(uint32_t data);
 	uint8_t m_gearsel;
@@ -278,6 +264,19 @@ protected:
 private:
 	void tri_list_dump(FILE *dst);
 
+	uint32_t m_intreq;
+	uint32_t m_intena;
+	uint32_t m_coproctl;
+	uint32_t m_coprocnt;
+	uint32_t m_geoctl;
+	uint32_t m_geocnt;
+	uint32_t m_videocontrol;
+	int m_port_1c00004;
+	int m_port_1c00006;
+	int m_port_1c00010;
+	int m_port_1c00012;
+	int m_port_1c00014;
+
 	bool m_render_unk;
 	bool m_render_mode;
 	int16 m_crtc_xoffset, m_crtc_yoffset;