(nw) checkpoint since Midway SSIO sound is fixed - periodic interrupt…

… doesn't support derived clock, kill off some more low-value macros, add a validity check, fix changes to Okim M6295 pin 7 in vgmplay

src/devices/sound/lc7535.h

@@ -31,9 +31,6 @@
 //  INTERFACE CONFIGURATION MACROS
 //**************************************************************************
 
-#define MCFG_LC7535_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, LC7535, 0)
-
 #define MCFG_LC7535_SELECT_CB(_read) \
 	devcb = &downcast<lc7535_device &>(*device).set_select_callback(DEVCB_##_read);
 
@@ -51,7 +48,7 @@ class lc7535_device : public device_t
 {
 public:
 	// construction/destruction
-	lc7535_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	lc7535_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
 
 	typedef device_delegate<void (int attenuation_right, int attenuation_left, bool loudness)> volume_delegate;
 

src/devices/sound/okim6258.h

@@ -10,12 +10,6 @@
 //  INTERFACE CONFIGURATION MACROS
 //**************************************************************************
 
-#define MCFG_OKIM6258_ADD(tag, clock) \
-	MCFG_DEVICE_ADD((tag), OKIM6258, (clock))
-
-#define MCFG_OKIM6258_REPLACE(tag, clock) \
-	MCFG_DEVICE_REPLACE((tag), OKIM6258, (clock))
-
 #define MCFG_OKIM6258_DIVIDER(div) \
 	downcast<okim6258_device &>(*device).set_start_div((okim6258_device::div));
 

src/devices/sound/okim6295.cpp

@@ -92,17 +92,30 @@ okim6295_device::okim6295_device(const machine_config &mconfig, const char *tag,
 		m_region(*this, DEVICE_SELF),
 		m_command(-1),
 		m_stream(nullptr),
-		m_pin7_state(0)
+		m_pin7_state(~uint8_t(0))
 {
 }
 
 
+//-------------------------------------------------
+//  device_validity_check - device-specific checks
+//-------------------------------------------------
+
+void okim6295_device::device_validity_check(validity_checker &valid) const
+{
+	if ((PIN7_LOW != m_pin7_state) && (PIN7_HIGH != m_pin7_state))
+		osd_printf_error("Initial pin 7 state not configured\n");
+}
+
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
 
 void okim6295_device::device_start()
 {
+	if ((PIN7_LOW != m_pin7_state) && (PIN7_HIGH != m_pin7_state))
+		m_pin7_state = 0;
+
 	// create the stream
 	int divisor = m_pin7_state ? 132 : 165;
 	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() / divisor);
@@ -190,7 +203,7 @@ void okim6295_device::rom_bank_updated()
 
 void okim6295_device::set_pin7(int pin7)
 {
-	m_pin7_state = pin7;
+	m_pin7_state = pin7 ? 1 : 0;
 	device_clock_changed();
 }
 

src/devices/sound/okim6295.h

@@ -21,10 +21,6 @@
 //  INTERFACE CONFIGURATION MACROS
 //**************************************************************************
 
-#define MCFG_OKIM6295_ADD(tag, clock, pin7) \
-	MCFG_DEVICE_ADD((tag), OKIM6295, (clock)) \
-	MCFG_OKIM6295_PIN7(pin7)
-
 #define MCFG_OKIM6295_REPLACE(tag, clock, pin7) \
 	MCFG_DEVICE_REPLACE((tag), OKIM6295, (clock)) \
 	MCFG_OKIM6295_PIN7(pin7)
@@ -45,17 +41,22 @@ class okim6295_device : public device_t,
 						public device_rom_interface
 {
 public:
-	enum
+	enum pin7_state
 	{
 		PIN7_LOW = 0,
 		PIN7_HIGH = 1
 	};
 
 	// construction/destruction
+	okim6295_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, pin7_state pin7)
+		: okim6295_device(mconfig, tag, owner, clock)
+	{
+		config_pin7(pin7);
+	}
 	okim6295_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	// inline configuration helpers
-	void config_pin7(int pin7) { m_pin7_state = pin7; }
+	void config_pin7(pin7_state pin7) { m_pin7_state = pin7; }
 
 	// runtime configuration
 	void set_pin7(int pin7);
@@ -68,6 +69,7 @@ class okim6295_device : public device_t,
 
 protected:
 	// device-level overrides
+	virtual void device_validity_check(validity_checker &valid) const override;
 	virtual void device_start() override;
 	virtual void device_reset() override;
 	virtual void device_post_load() override;

src/devices/sound/okim9810.h

@@ -20,22 +20,6 @@
 #include "okiadpcm.h"
 
 
-//**************************************************************************
-//  CONSTANTS
-//**************************************************************************
-
-//**************************************************************************
-//  INTERFACE CONFIGURATION MACROS
-//**************************************************************************
-
-#define MCFG_OKIM9810_ADD(_tag, _clock) \
-	MCFG_DEVICE_ADD(_tag, OKIM9810, _clock)
-
-#define MCFG_OKIM9810_REPLACE(_tag, _clock) \
-	MCFG_DEVICE_REPLACE(_tag, OKIM9810, _clock)
-
-
-
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************

src/devices/sound/rf5c400.h

@@ -7,16 +7,6 @@
 
 #pragma once
 
-//**************************************************************************
-//  INTERFACE CONFIGURATION MACROS
-//**************************************************************************
-
-#define MCFG_RF5C400_ADD(_tag, _clock) \
-	MCFG_DEVICE_ADD(_tag, RF5C400, _clock)
-#define MCFG_RF5C400_REPLACE(_tag, _clock) \
-	MCFG_DEVICE_REPLACE(_tag, RF5C400, _clock)
-
-
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************

src/devices/sound/rf5c68.h

@@ -14,11 +14,6 @@
 //  INTERFACE CONFIGURATION MACROS
 //**************************************************************************
 
-#define MCFG_RF5C68_ADD(_tag, _clock) \
-	MCFG_DEVICE_ADD(_tag, RF5C68, _clock)
-#define MCFG_RF5C68_REPLACE(_tag, _clock) \
-	MCFG_DEVICE_REPLACE(_tag, RF5C68, _clock)
-
 #define MCFG_RF5C68_SAMPLE_END_CB(_class, _method) \
 	downcast<rf5c68_device &>(*device).set_end_callback(rf5c68_device::sample_end_cb_delegate(&_class::_method, #_class "::" #_method, this));
 

src/mame/audio/atarijsa.cpp

@@ -841,7 +841,7 @@ MACHINE_CONFIG_START(atari_jsa_ii_device::device_add_mconfig)
 	MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, atari_jsa_base_device, ym2151_port_w))
 	MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.60, 0)
 
-	MCFG_OKIM6295_ADD("oki1", JSA_MASTER_CLOCK/3, PIN7_HIGH)
+	MCFG_DEVICE_ADD("oki1", OKIM6295, JSA_MASTER_CLOCK/3, okim6295_device::PIN7_HIGH)
 	MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.75, 0)
 MACHINE_CONFIG_END
 
@@ -923,7 +923,7 @@ MACHINE_CONFIG_START(atari_jsa_iii_device::device_add_mconfig)
 	MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(*this, atari_jsa_base_device, ym2151_port_w))
 	MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.60, 0)
 
-	MCFG_OKIM6295_ADD("oki1", JSA_MASTER_CLOCK/3, PIN7_HIGH)
+	MCFG_DEVICE_ADD("oki1", OKIM6295, JSA_MASTER_CLOCK/3, okim6295_device::PIN7_HIGH)
 	MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki1_map)
 	MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.75, 0)
 MACHINE_CONFIG_END
@@ -969,7 +969,7 @@ MACHINE_CONFIG_START(atari_jsa_iiis_device::device_add_mconfig)
 	MCFG_MIXER_ROUTE(0, *this, 0.60, 0)
 	MCFG_MIXER_ROUTE(1, *this, 0.60, 1)
 
-	MCFG_OKIM6295_ADD("oki2", JSA_MASTER_CLOCK/3, PIN7_HIGH)
+	MCFG_DEVICE_ADD("oki2", OKIM6295, JSA_MASTER_CLOCK/3, okim6295_device::PIN7_HIGH)
 	MCFG_MIXER_ROUTE(ALL_OUTPUTS, *this, 0.75, 1)
 	MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki2_map)
 MACHINE_CONFIG_END

src/mame/audio/midway.cpp

@@ -82,16 +82,17 @@ WRITE8_MEMBER(midway_ssio_device::write)
 
 WRITE_LINE_MEMBER(midway_ssio_device::reset_write)
 {
-	// going high halts the CPU
 	if (state)
 	{
+		// going high halts the CPU
 		device_reset();
 		m_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
 	}
-
-	// going low resets and reactivates the CPU
 	else
+	{
+		// going low resets and reactivates the CPU
 		m_cpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
+	}
 }
 
 
@@ -403,7 +404,7 @@ const tiny_rom_entry *midway_ssio_device::device_rom_region() const
 MACHINE_CONFIG_START(midway_ssio_device::device_add_mconfig)
 	MCFG_DEVICE_ADD("cpu", Z80, DERIVED_CLOCK(1, 2*4))
 	MCFG_DEVICE_PROGRAM_MAP(ssio_map)
-	MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, midway_ssio_device, clock_14024, DERIVED_CLOCK(1, 2*16*10))
+	MCFG_DEVICE_PERIODIC_INT_DEVICE(DEVICE_SELF, midway_ssio_device, clock_14024, clock() / (2*16*10))
 
 	MCFG_DEVICE_ADD("ay0", AY8910, DERIVED_CLOCK(1, 2*4))
 	MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, midway_ssio_device, porta0_w))

src/mame/audio/williams.cpp

@@ -762,7 +762,7 @@ MACHINE_CONFIG_START(williams_adpcm_sound_device::device_add_mconfig)
 	MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
 	MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
 
-	MCFG_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, PIN7_HIGH) // clock frequency & pin 7 not verified
+	MCFG_DEVICE_ADD("oki", OKIM6295, ADPCM_MASTER_CLOCK/8, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified
 	MCFG_DEVICE_ADDRESS_MAP(0, williams_adpcm_oki_map)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, *this, 0.15)
 MACHINE_CONFIG_END

src/mame/drivers/1945kiii.cpp

@@ -403,7 +403,7 @@ MACHINE_CONFIG_START(k3_state::flagrall)
 
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_OKIM6295_ADD("oki1", MASTER_CLOCK/16, PIN7_HIGH)  /* dividers? */
+	MCFG_DEVICE_ADD("oki1", OKIM6295, MASTER_CLOCK/16, okim6295_device::PIN7_HIGH)  /* dividers? */
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END
 
@@ -414,7 +414,7 @@ MACHINE_CONFIG_START(k3_state::k3)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_DEVICE_PROGRAM_MAP(k3_map)
 
-	MCFG_OKIM6295_ADD("oki2", MASTER_CLOCK/16, PIN7_HIGH) /* dividers? */
+	MCFG_DEVICE_ADD("oki2", OKIM6295, MASTER_CLOCK/16, okim6295_device::PIN7_HIGH)  /* dividers? */
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MCFG_SCREEN_MODIFY("screen")

src/mame/drivers/30test.cpp

@@ -267,7 +267,7 @@ MACHINE_CONFIG_START(namco_30test_state::_30test)
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH)
+	MCFG_DEVICE_ADD("oki", OKIM6295, 1056000, okim6295_device::PIN7_HIGH)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END
 

src/mame/drivers/3x3puzzl.cpp

@@ -407,7 +407,7 @@ MACHINE_CONFIG_START(_3x3puzzle_state::_3x3puzzle)
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_OKIM6295_ADD("oki", XTAL(4'000'000)/4, PIN7_HIGH)
+	MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(4'000'000)/4, okim6295_device::PIN7_HIGH)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END
 

src/mame/drivers/5clown.cpp

@@ -1065,7 +1065,7 @@ MACHINE_CONFIG_START(_5clown_state::fclown)
 	MCFG_DEVICE_ADD("ay8910", AY8910, MASTER_CLOCK/8)        /* guess, seems ok */
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
-	MCFG_OKIM6295_ADD("oki6295", MASTER_CLOCK/12, PIN7_LOW)    /* guess, seems ok; pin7 guessed, seems ok */
+	MCFG_DEVICE_ADD("oki6295", OKIM6295, MASTER_CLOCK/12, okim6295_device::PIN7_LOW)    /* guess, seems ok; pin7 guessed, seems ok */
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.20)
 
 MACHINE_CONFIG_END

src/mame/drivers/acommand.cpp

@@ -493,11 +493,11 @@ MACHINE_CONFIG_START(acommand_state::acommand)
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 
-	MCFG_OKIM6295_ADD("oki1", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
+	MCFG_DEVICE_ADD("oki1", OKIM6295, 2112000, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
 
-	MCFG_OKIM6295_ADD("oki2", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
+	MCFG_DEVICE_ADD("oki2", OKIM6295, 2112000, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
 MACHINE_CONFIG_END

src/mame/drivers/actfancr.cpp

@@ -337,7 +337,7 @@ MACHINE_CONFIG_START(actfancr_state::actfancr)
 	MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
 
-	MCFG_OKIM6295_ADD("oki", 1024188, PIN7_HIGH) // clock frequency & pin 7 not verified
+	MCFG_DEVICE_ADD("oki", OKIM6295, 1024188, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
 MACHINE_CONFIG_END
 
@@ -395,7 +395,7 @@ MACHINE_CONFIG_START(actfancr_state::triothep)
 	MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
 
-	MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) /* verified on pcb */
+	MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(1'056'000), okim6295_device::PIN7_HIGH) /* verified on pcb */
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
 MACHINE_CONFIG_END
 

src/mame/drivers/aerofgt.cpp

@@ -1566,7 +1566,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesb)
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_OKIM6295_ADD("oki", 1056000, PIN7_LOW) // clock frequency & pin 7 not verified, pin high causes sound pitch to be too high
+	MCFG_DEVICE_ADD("oki", OKIM6295, 1056000, okim6295_device::PIN7_LOW) // clock frequency & pin 7 not verified, pin high causes sound pitch to be too high
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END
 
@@ -1624,7 +1624,7 @@ MACHINE_CONFIG_START(aerofgt_state::kickball)
 	MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
-	MCFG_OKIM6295_ADD("oki", XTAL(4'000'000)/4, PIN7_LOW) // AD-65 (M6295) clock frequency & pin 7 not verified
+	MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(4'000'000)/4, okim6295_device::PIN7_LOW) // AD-65 (M6295) clock frequency & pin 7 not verified
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END
 
@@ -1663,7 +1663,7 @@ MACHINE_CONFIG_START(aerofgt_state::pspikesc)
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
+	MCFG_DEVICE_ADD("oki", OKIM6295, 1056000, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END
 
@@ -2054,7 +2054,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboot)
 	MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
 	MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(false)
 
-	MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
+	MCFG_DEVICE_ADD("oki", OKIM6295, 1056000, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified
 	MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END
@@ -2090,7 +2090,7 @@ MACHINE_CONFIG_START(aerofgt_state::aerfboo2)
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
+	MCFG_DEVICE_ADD("oki", OKIM6295, 1056000, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END
 
@@ -2139,7 +2139,7 @@ MACHINE_CONFIG_START(aerofgt_state::wbbc97)
 	MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
-	MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
+	MCFG_DEVICE_ADD("oki", OKIM6295, 1056000, okim6295_device::PIN7_HIGH) // clock frequency & pin 7 not verified
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_CONFIG_END
 

src/mame/drivers/airbustr.cpp

@@ -620,7 +620,7 @@ MACHINE_CONFIG_START(airbustr_state::airbustr)
 	MCFG_SOUND_ROUTE(2, "mono", 0.25)
 	MCFG_SOUND_ROUTE(3, "mono", 0.50)
 
-	MCFG_OKIM6295_ADD("oki", XTAL(12'000'000)/4, PIN7_LOW)   /* verified on pcb */
+	MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(12'000'000)/4, okim6295_device::PIN7_LOW)   /* verified on pcb */
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 MACHINE_CONFIG_END
 

src/mame/drivers/aquarium.cpp

@@ -328,7 +328,7 @@ MACHINE_CONFIG_START(aquarium_state::aquarium)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
 
-	MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // pin 7 not verified
+	MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(1'056'000), okim6295_device::PIN7_HIGH) // pin 7 not verified
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
 MACHINE_CONFIG_END

src/mame/drivers/arcadecl.cpp

@@ -348,7 +348,7 @@ MACHINE_CONFIG_START(sparkz_state::sparkz)
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, PIN7_LOW)
+	MCFG_DEVICE_ADD("oki", OKIM6295, MASTER_CLOCK/4/3, okim6295_device::PIN7_LOW)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END