From 1cb336fc17982d26e30f5b355c65ad94fdfc7ba2 Mon Sep 17 00:00:00 2001
From: MetalliC <0vetal0@gmail.com>
Date: Tue, 28 Apr 2015 01:46:32 +0300
Subject: [PATCH] SystemSP: do not inherit unneeded stuff (MIE MCU, JVS, etc)

---
 src/mame/drivers/naomi.c  | 8 ++++----
 src/mame/drivers/segasp.c | 5 +++--
 src/mame/includes/naomi.h | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index b9254db06c1..ee3f5400b9a 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -1913,7 +1913,7 @@ ADDRESS_MAP_END
 * Input ports
 */
 
-static INPUT_PORTS_START( naomi_debug )
+INPUT_PORTS_START( naomi_debug )
 	PORT_START("MAMEDEBUG")
 	PORT_DIPNAME( 0x01, 0x00, "Bilinear Filtering" )
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
@@ -1949,7 +1949,7 @@ static INPUT_PORTS_START( naomi_mie )
 INPUT_PORTS_END
 
 /* 2 players with 1 joystick and 6 buttons each */
-INPUT_PORTS_START( naomi )
+static INPUT_PORTS_START( naomi )
 	PORT_INCLUDE( naomi_mie )
 	PORT_INCLUDE( naomi_debug )
 
@@ -2569,7 +2569,7 @@ MACHINE_RESET_MEMBER(naomi_state,naomi)
  * Common for Naomi 1, Naomi GD-Rom, Naomi 2, Atomiswave ...
  */
 
-static MACHINE_CONFIG_START( naomi_aw_base, naomi_state )
+MACHINE_CONFIG_START( naomi_aw_base, naomi_state )
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK) // SH4!!!
 	MCFG_SH4_MD0(1)
@@ -2615,7 +2615,7 @@ static MACHINE_CONFIG_START( naomi_aw_base, naomi_state )
 	MCFG_AICARTC_ADD("aicartc", XTAL_32_768kHz )
 MACHINE_CONFIG_END
 
-MACHINE_CONFIG_DERIVED( naomi_base, naomi_aw_base )
+static MACHINE_CONFIG_DERIVED( naomi_base, naomi_aw_base )
 	MCFG_MIE_ADD("mie", XTAL_32MHz/2, "maple_dc", 0, 0, 0, 0, ":MIE.3", 0, ":MIE.5", 0, 0) // Actual frequency unknown, most likely 1/2 of 32MHz XTAL or even 2/3 (yes, 21MHz Z80 core)
 	MCFG_SEGA_837_13551_DEVICE_ADD("837_13551", "mie", ":TILT", ":P1", ":P2", ":A0", ":A1", ":A2", ":A3", ":A4", ":A5", ":A6", ":A7", ":OUTPUT")
 	MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("mie_eeprom")
diff --git a/src/mame/drivers/segasp.c b/src/mame/drivers/segasp.c
index eae1996eca9..d3bbe906ac3 100644
--- a/src/mame/drivers/segasp.c
+++ b/src/mame/drivers/segasp.c
@@ -208,7 +208,7 @@ ADDRESS_MAP_END
 
 
 INPUT_PORTS_START( segasp )
-	PORT_INCLUDE( naomi )
+	PORT_INCLUDE( naomi_debug )
 
 	PORT_START("DSW")
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW:1")
@@ -258,7 +258,7 @@ INPUT_PORTS_START( segasp )
 
 INPUT_PORTS_END
 
-static MACHINE_CONFIG_DERIVED_CLASS( segasp, naomi_base, segasp_state )
+static MACHINE_CONFIG_DERIVED_CLASS( segasp, naomi_aw_base, segasp_state )
 	MCFG_CPU_MODIFY("maincpu")
 	MCFG_CPU_PROGRAM_MAP(segasp_map)
 	MCFG_CPU_IO_MAP(onchip_port)
@@ -266,6 +266,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( segasp, naomi_base, segasp_state )
 	MCFG_EEPROM_SERIAL_93C46_ADD("sp_eeprom")
 
 // todo, not exactly NaomiM4 (see notes at top of driver) use custom board type here instead
+	MCFG_X76F100_ADD("naomibd_eeprom")	// actually not present
 	MCFG_NAOMI_M4_BOARD_ADD("rom_board", ":pic_readout", "naomibd_eeprom", ":boardid", WRITE8(dc_state, g1_irq))
 MACHINE_CONFIG_END
 
diff --git a/src/mame/includes/naomi.h b/src/mame/includes/naomi.h
index 33b7b2b0b5e..66d4cf49964 100644
--- a/src/mame/includes/naomi.h
+++ b/src/mame/includes/naomi.h
@@ -104,5 +104,5 @@ class naomi_state : public dc_state
 	DECLARE_READ64_MEMBER( hotd2_idle_skip_r );
 };
 
-MACHINE_CONFIG_EXTERN(naomi_base);
-INPUT_PORTS_EXTERN( naomi );
\ No newline at end of file
+MACHINE_CONFIG_EXTERN(naomi_aw_base);
+INPUT_PORTS_EXTERN( naomi_debug );
\ No newline at end of file