More miscellaneous cleanup:

spectrum.cpp: Removed a member from the base state class that's only
used by certain Soviet clones.  There seems to be some copy/pasted code
in the clone drivers - pehaps they can share some of the implementation.

spec128.cpp: Moved the Spectrum 128 state class declaration to the
corresponding header.

Reduced redundancy in a few fruit machine layouts.

src/mame/drivers/atm.cpp

@@ -9,7 +9,6 @@ Not working because of banking issues.
 *******************************************************************************************/
 
 #include "emu.h"
-#include "includes/spectrum.h"
 #include "includes/spec128.h"
 #include "includes/specpls3.h"
 
@@ -35,6 +34,7 @@ public:
 	void atmtb2(machine_config &config);
 
 protected:
+	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
 private:
@@ -47,6 +47,8 @@ private:
 	void atm_mem(address_map &map);
 	void atm_switch(address_map &map);
 
+	void atm_update_memory();
+
 	required_memory_bank m_bank1;
 	required_memory_bank m_bank2;
 	required_memory_bank m_bank3;
@@ -55,7 +57,7 @@ private:
 
 	address_space *m_program;
 	uint8_t *m_p_ram;
-	void atm_update_memory();
+	uint16_t m_rom_selection;
 };
 
 void atm_state::atm_update_memory()
@@ -67,13 +69,13 @@ void atm_state::atm_update_memory()
 	m_bank4->set_base(messram + ((m_port_7ffd_data & 0x07) * 0x4000));
 
 	if (m_beta->started() && m_beta->is_active() && !( m_port_7ffd_data & 0x10 ) )
-		m_ROMSelection = 3;
+		m_rom_selection = 3;
 	else
 		/* ROM switching */
-		m_ROMSelection = BIT(m_port_7ffd_data, 4) ;
+		m_rom_selection = BIT(m_port_7ffd_data, 4) ;
 
 	/* rom 0 is 128K rom, rom 1 is 48 BASIC */
-	m_bank1->set_base(&m_p_ram[0x10000 + (m_ROMSelection<<14)]);
+	m_bank1->set_base(&m_p_ram[0x10000 + (m_rom_selection<<14)]);
 }
 
 void atm_state::atm_port_7ffd_w(uint8_t data)
@@ -96,8 +98,8 @@ uint8_t atm_state::beta_neutral_r(offs_t offset)
 
 uint8_t atm_state::beta_enable_r(offs_t offset)
 {
-	if(m_ROMSelection == 1) {
-		m_ROMSelection = 3;
+	if (m_rom_selection == 1) {
+		m_rom_selection = 3;
 		if (m_beta->started()) {
 			m_beta->enable();
 			m_bank1->set_base(&m_p_ram[0x18000]);
@@ -109,9 +111,9 @@ uint8_t atm_state::beta_enable_r(offs_t offset)
 uint8_t atm_state::beta_disable_r(offs_t offset)
 {
 	if (m_beta->started() && m_beta->is_active()) {
-		m_ROMSelection = BIT(m_port_7ffd_data, 4);
+		m_rom_selection = BIT(m_port_7ffd_data, 4);
 		m_beta->disable();
-		m_bank1->set_base(&m_p_ram[0x10000 + (m_ROMSelection<<14)]);
+		m_bank1->set_base(&m_p_ram[0x10000 + (m_rom_selection<<14)]);
 	}
 	return m_program->read_byte(offset + 0x4000);
 }
@@ -145,6 +147,16 @@ void atm_state::atm_switch(address_map &map)
 	map(0x4000, 0xffff).r(FUNC(atm_state::beta_disable_r));
 }
 
+
+void atm_state::machine_start()
+{
+	spectrum_128_state::machine_start();
+
+	m_rom_selection = 0;
+
+	save_item(NAME(m_rom_selection));
+}
+
 void atm_state::machine_reset()
 {
 	uint8_t *messram = m_ram->pointer();

src/mame/drivers/pentagon.cpp

@@ -1,7 +1,6 @@
 // license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, MetalliC
 #include "emu.h"
-#include "includes/spectrum.h"
 #include "includes/spec128.h"
 
 #include "machine/beta.h"
@@ -32,10 +31,13 @@ public:
 	void pentagon(machine_config &config);
 
 protected:
+	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
 
 private:
+	rectangle get_screen_area() override;
+
 	void pentagon_port_7ffd_w(uint8_t data);
 	void pentagon_scr_w(offs_t offset, uint8_t data);
 	void pentagon_scr2_w(offs_t offset, uint8_t data);
@@ -47,6 +49,8 @@ private:
 	void pentagon_mem(address_map &map);
 	void pentagon_switch(address_map &map);
 
+	void pentagon_update_memory();
+
 	required_memory_bank m_bank1;
 	required_memory_bank m_bank2;
 	required_memory_bank m_bank3;
@@ -55,8 +59,7 @@ private:
 
 	address_space *m_program;
 	uint8_t *m_p_ram;
-	void pentagon_update_memory();
-	rectangle get_screen_area() override;
+	uint16_t m_rom_selection;
 };
 
 void pentagon_state::pentagon_update_memory()
@@ -74,16 +77,16 @@ void pentagon_state::pentagon_update_memory()
 	{
 		/* GLUK */
 		if (strcmp(machine().system().name, "pent1024")==0)
-			m_ROMSelection = 2;
+			m_rom_selection = 2;
 		else
-			m_ROMSelection = BIT(m_port_7ffd_data, 4);
+			m_rom_selection = BIT(m_port_7ffd_data, 4);
 	}
 	else
 		/* ROM switching */
-		m_ROMSelection = BIT(m_port_7ffd_data, 4);
+		m_rom_selection = BIT(m_port_7ffd_data, 4);
 
 	/* rom 0 is 128K rom, rom 1 is 48 BASIC */
-	m_bank1->set_base(&m_p_ram[0x10000 + (m_ROMSelection<<14)]);
+	m_bank1->set_base(&m_p_ram[0x10000 + (m_rom_selection<<14)]);
 }
 
 void pentagon_state::pentagon_port_7ffd_w(uint8_t data)
@@ -134,8 +137,8 @@ uint8_t pentagon_state::beta_neutral_r(offs_t offset)
 uint8_t pentagon_state::beta_enable_r(offs_t offset)
 {
 	if (!(machine().side_effects_disabled())) {
-		if (m_ROMSelection == 1) {
-			m_ROMSelection = 3;
+		if (m_rom_selection == 1) {
+			m_rom_selection = 3;
 			if (m_beta->started()) {
 				m_beta->enable();
 				m_bank1->set_base(memregion("beta:beta")->base());
@@ -150,9 +153,9 @@ uint8_t pentagon_state::beta_disable_r(offs_t offset)
 {
 	if (!(machine().side_effects_disabled())) {
 		if (m_beta->started() && m_beta->is_active()) {
-			m_ROMSelection = BIT(m_port_7ffd_data, 4);
+			m_rom_selection = BIT(m_port_7ffd_data, 4);
 			m_beta->disable();
-			m_bank1->set_base(&m_p_ram[0x10000 + (m_ROMSelection << 14)]);
+			m_bank1->set_base(&m_p_ram[0x10000 + (m_rom_selection << 14)]);
 		}
 	}
 
@@ -188,6 +191,15 @@ void pentagon_state::pentagon_switch(address_map &map)
 	map(0x4000, 0xffff).r(FUNC(pentagon_state::beta_disable_r));
 }
 
+void pentagon_state::machine_start()
+{
+	spectrum_128_state::machine_start();
+
+	m_rom_selection = 0;
+
+	save_item(NAME(m_rom_selection));
+}
+
 void pentagon_state::machine_reset()
 {
 	uint8_t *messram = m_ram->pointer();

src/mame/drivers/scorpion.cpp

@@ -2,7 +2,6 @@
 // copyright-holders:Miodrag Milanovic
 
 #include "emu.h"
-#include "includes/spectrum.h"
 #include "includes/spec128.h"
 
 #include "machine/beta.h"
@@ -31,6 +30,7 @@ public:
 	void quorum(machine_config &config);
 
 protected:
+	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
 private:
@@ -46,6 +46,8 @@ private:
 	void scorpion_mem(address_map &map);
 	void scorpion_switch(address_map &map);
 
+	void scorpion_update_memory();
+
 	required_memory_bank m_bank1;
 	required_memory_bank m_bank2;
 	required_memory_bank m_bank3;
@@ -55,8 +57,7 @@ private:
 	uint8_t *m_ram_0000;
 	address_space *m_program;
 	uint8_t *m_p_ram;
-	void scorpion_update_memory();
-
+	uint16_t m_rom_selection;
 };
 
 /****************************************************************************************************/
@@ -104,11 +105,11 @@ void scorpion_state::scorpion_update_memory()
 	else
 	{
 		if ((m_port_1ffd_data & 0x02)==0x02)
-			m_ROMSelection = 2;
+			m_rom_selection = 2;
 		else
-			m_ROMSelection = BIT(m_port_7ffd_data, 4);
+			m_rom_selection = BIT(m_port_7ffd_data, 4);
 
-		m_bank1->set_base(&m_p_ram[0x10000 + (m_ROMSelection<<14)]);
+		m_bank1->set_base(&m_p_ram[0x10000 + (m_rom_selection<<14)]);
 	}
 }
 
@@ -160,11 +161,11 @@ uint8_t scorpion_state::beta_neutral_r(offs_t offset)
 
 uint8_t scorpion_state::beta_enable_r(offs_t offset)
 {
-	if(m_ROMSelection == 1) {
-		m_ROMSelection = 3;
+	if (m_rom_selection == 1) {
+		m_rom_selection = 3;
 		if (m_beta->started()) {
 			m_beta->enable();
-			m_bank1->set_base(&m_p_ram[0x10000 + (m_ROMSelection<<14)]);
+			m_bank1->set_base(&m_p_ram[0x10000 + (m_rom_selection<<14)]);
 			m_ram_disabled_by_beta = 1;
 		}
 	}
@@ -174,9 +175,9 @@ uint8_t scorpion_state::beta_enable_r(offs_t offset)
 uint8_t scorpion_state::beta_disable_r(offs_t offset)
 {
 	if (m_beta->started() && m_beta->is_active()) {
-		m_ROMSelection = BIT(m_port_7ffd_data, 4);
+		m_rom_selection = BIT(m_port_7ffd_data, 4);
 		m_beta->disable();
-		m_bank1->set_base(&m_p_ram[0x10000 + (m_ROMSelection<<14)]);
+		m_bank1->set_base(&m_p_ram[0x10000 + (m_rom_selection<<14)]);
 		m_ram_disabled_by_beta = 1;
 	} else
 		m_ram_disabled_by_beta = 0;
@@ -213,6 +214,16 @@ void scorpion_state::scorpion_switch(address_map &map)
 	map(0x4000, 0xffff).r(FUNC(scorpion_state::beta_disable_r));
 }
 
+
+void scorpion_state::machine_start()
+{
+	spectrum_128_state::machine_start();
+
+	m_rom_selection = 0;
+
+	save_item(NAME(m_rom_selection));
+}
+
 void scorpion_state::machine_reset()
 {
 	uint8_t *messram = m_ram->pointer();

src/mame/drivers/spec128.cpp

@@ -151,7 +151,6 @@ resulting mess can be seen in the F4 viewer display.
 *******************************************************************************/
 
 #include "emu.h"
-#include "includes/spectrum.h"
 #include "includes/spec128.h"
 
 #include "cpu/z80/z80.h"

src/mame/drivers/timex.cpp

@@ -147,8 +147,6 @@ http://www.z88forever.org.uk/zxplus3e/
 *******************************************************************************/
 
 #include "emu.h"
-#include "includes/spectrum.h"
-#include "includes/spec128.h"
 #include "includes/timex.h"
 
 #include "cpu/z80/z80.h"

src/mame/drivers/tsconf.cpp

@@ -292,7 +292,7 @@ void tsconf_state::tsconf(machine_config &config)
 		.add_route(2, "rspeaker", 0.50);
 
 	PALETTE(config, "palette", FUNC(tsconf_state::tsconf_palette), 256);
-	m_screen->set_raw(14_MHz_XTAL / 2, 448, with_hblank(), 448, 320, with_vblank(), 320);
+	m_screen->set_raw(14_MHz_XTAL / 2, 448, with_hblank(0), 448, 320, with_vblank(0), 320);
 	subdevice<gfxdecode_device>("gfxdecode")->set_info(gfx_tsconf);
 	RAM(config, m_cram).set_default_size("512").set_default_value(0);
 	RAM(config, m_sfile).set_default_size("512").set_default_value(0); // 85*6

src/mame/includes/spec128.h

@@ -9,6 +9,54 @@
 #ifndef MAME_INCLUDES_SPEC128_H
 #define MAME_INCLUDES_SPEC128_H
 
+#pragma once
+
+#include "spectrum.h"
+
+
+class spectrum_128_state : public spectrum_state
+{
+public:
+	spectrum_128_state(const machine_config &mconfig, device_type type, const char *tag) :
+		spectrum_state(mconfig, type, tag),
+		m_bank_rom(*this, "bank_rom%u", 0U),
+		m_bank_ram(*this, "bank_ram%u", 0U)
+	{ }
+
+	void spectrum_128(machine_config &config);
+
+protected:
+	memory_bank_array_creator<1> m_bank_rom;
+	memory_bank_array_creator<4> m_bank_ram;
+
+	virtual void video_start() override;
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+	virtual void spectrum_128_update_memory() override;
+	virtual rectangle get_screen_area() override;
+
+	virtual bool is_contended(offs_t offset) override;
+	virtual bool is_vram_write(offs_t offset) override;
+
+	template <u8 Bank>
+	void spectrum_128_ram_w(offs_t offset, u8 data);
+	template <u8 Bank>
+	u8 spectrum_128_ram_r(offs_t offset);
+
+private:
+	u8 spectrum_128_pre_opcode_fetch_r(offs_t offset);
+	void spectrum_128_rom_w(offs_t offset, u8 data);
+	u8 spectrum_128_rom_r(offs_t offset);
+	void spectrum_128_port_7ffd_w(offs_t offset, u8 data);
+	virtual uint8_t spectrum_port_r(offs_t offset) override;
+	//uint8_t spectrum_128_ula_r();
+
+	void spectrum_128_io(address_map &map);
+	void spectrum_128_mem(address_map &map);
+	void spectrum_128_fetch(address_map &map);
+};
+
 #define X1_128_AMSTRAD  35'469'000       // Main clock (Amstrad 128K model, +2A?)
 #define X1_128_SINCLAIR 35.469_MHz_XTAL  // Main clock (Sinclair 128K model)
 

src/mame/includes/spectrum.h

@@ -112,7 +112,6 @@ protected:
 	optional_shared_ptr<uint8_t> m_video_ram;
 	uint8_t *m_screen_location;
 
-	int m_ROMSelection = 0; // FIXME: this is used for various things in derived classes, but not by this base class, and should be removed
 	std::vector<u8> m_contention_pattern;
 	/* Pixel offset in 8px chunk (4T) when current chunk is rendered. */
 	u8 m_border4t_render_at = 0;
@@ -215,49 +214,6 @@ protected:
 	void setup_raw(uint8_t *quickdata, uint32_t quicksize);
 };
 
-class spectrum_128_state : public spectrum_state
-{
-public:
-	spectrum_128_state(const machine_config &mconfig, device_type type, const char *tag) :
-		spectrum_state(mconfig, type, tag),
-		m_bank_rom(*this, "bank_rom%u", 0U),
-		m_bank_ram(*this, "bank_ram%u", 0U)
-	{ }
-
-	void spectrum_128(machine_config &config);
-
-protected:
-	memory_bank_array_creator<1> m_bank_rom;
-	memory_bank_array_creator<4> m_bank_ram;
-
-	virtual void video_start() override;
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
-	virtual void spectrum_128_update_memory() override;
-	virtual rectangle get_screen_area() override;
-
-	virtual bool is_contended(offs_t offset) override;
-	virtual bool is_vram_write(offs_t offset) override;
-
-	template <u8 Bank>
-	void spectrum_128_ram_w(offs_t offset, u8 data);
-	template <u8 Bank>
-	u8 spectrum_128_ram_r(offs_t offset);
-
-private:
-	u8 spectrum_128_pre_opcode_fetch_r(offs_t offset);
-	void spectrum_128_rom_w(offs_t offset, u8 data);
-	u8 spectrum_128_rom_r(offs_t offset);
-	void spectrum_128_port_7ffd_w(offs_t offset, u8 data);
-	virtual uint8_t spectrum_port_r(offs_t offset) override;
-	//uint8_t spectrum_128_ula_r();
-
-	void spectrum_128_io(address_map &map);
-	void spectrum_128_mem(address_map &map);
-	void spectrum_128_fetch(address_map &map);
-};
-
 /*----------- defined in drivers/spectrum.cpp -----------*/
 
 INPUT_PORTS_EXTERN( spectrum );

src/mame/includes/timex.h

@@ -11,6 +11,8 @@
 
 #pragma once
 
+#include "spec128.h"
+
 #include "bus/generic/carts.h"
 #include "bus/generic/slot.h"
 

src/mame/includes/tsconf.h

@@ -10,16 +10,16 @@
 
 #pragma once
 
-#include "spectrum.h"
+#include "spec128.h"
+
 #include "machine/beta.h"
 #include "machine/glukrs.h"
 #include "machine/pckeybrd.h"
 #include "machine/spi_sdcard.h"
 #include "machine/tsconfdma.h"
+
 #include "tilemap.h"
 
-constexpr u16 with_hblank(u16 pixclocks = 0) { return 88 + pixclocks; }
-constexpr u16 with_vblank(u16 pixclocks = 0) { return 32 + pixclocks; }
 
 class tsconf_state : public spectrum_128_state
 {
@@ -42,6 +42,9 @@ public:
 
 	void tsconf(machine_config &config);
 
+	static constexpr u16 with_hblank(u16 pixclocks) { return 88 + pixclocks; }
+	static constexpr u16 with_vblank(u16 pixclocks) { return 32 + pixclocks; }
+
 protected:
 	virtual void video_start() override;
 	virtual void machine_start() override;

src/mame/machine/tsconf.cpp

@@ -15,10 +15,10 @@
 #define VM static_cast<v_mode>(BIT(m_regs[V_CONFIG], 0, 2))
 
 static constexpr rectangle screen_area[4] = {
-	rectangle(with_hblank(52), with_hblank(256 + 51), with_vblank(48), with_vblank(192 + 47)), // 52|256|52 x 48-192-48
-	rectangle(with_hblank(20), with_hblank(320 + 19), with_vblank(44), with_vblank(200 + 43)), // 20|320|20 x 44-200-44
-	rectangle(with_hblank(20), with_hblank(320 + 19), with_vblank(24), with_vblank(240 + 23)), // 20|320|20 x 24-240-24
-	rectangle(with_hblank(00), with_hblank(360 - 01), with_vblank(00), with_vblank(288 - 01))  // 00|360|00 x 00-288-00
+	rectangle(tsconf_state::with_hblank(52), tsconf_state::with_hblank(256 + 51), tsconf_state::with_vblank(48), tsconf_state::with_vblank(192 + 47)), // 52|256|52 x 48-192-48
+	rectangle(tsconf_state::with_hblank(20), tsconf_state::with_hblank(320 + 19), tsconf_state::with_vblank(44), tsconf_state::with_vblank(200 + 43)), // 20|320|20 x 44-200-44
+	rectangle(tsconf_state::with_hblank(20), tsconf_state::with_hblank(320 + 19), tsconf_state::with_vblank(24), tsconf_state::with_vblank(240 + 23)), // 20|320|20 x 24-240-24
+	rectangle(tsconf_state::with_hblank(00), tsconf_state::with_hblank(360 - 01), tsconf_state::with_vblank(00), tsconf_state::with_vblank(288 - 01))  // 00|360|00 x 00-288-00
 };
 
 enum v_mode : u8

src/mame/video/timex.cpp

@@ -16,10 +16,11 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "includes/spectrum.h"
 #include "includes/timex.h"
+
 #include "machine/ram.h"
 
+
 inline void tc2048_state::spectrum_plot_pixel(bitmap_ind16 &bitmap, int x, int y, uint32_t color)
 {
 	rectangle screen = m_screen->visible_area();