diff --git a/src/devices/sound/sp0250.cpp b/src/devices/sound/sp0250.cpp index c0b0f1c4f13..73e0e6cacff 100644 --- a/src/devices/sound/sp0250.cpp +++ b/src/devices/sound/sp0250.cpp @@ -181,7 +181,7 @@ void sp0250_device::write(uint8_t data) } -uint8_t sp0250_device::drq_r() +int sp0250_device::drq_r() { m_stream->update(); return (m_fifo_pos == 15) ? CLEAR_LINE : ASSERT_LINE; diff --git a/src/devices/sound/sp0250.h b/src/devices/sound/sp0250.h index 31c32ef4d5d..fb463e25d5b 100644 --- a/src/devices/sound/sp0250.h +++ b/src/devices/sound/sp0250.h @@ -14,7 +14,7 @@ public: void set_pwm_mode() { m_pwm_mode = true; } void write(uint8_t data); - uint8_t drq_r(); + int drq_r(); protected: // device-level overrides diff --git a/src/mame/gottlieb/gottlieb.cpp b/src/mame/gottlieb/gottlieb.cpp index fd59c0367d8..403e36206d3 100644 --- a/src/mame/gottlieb/gottlieb.cpp +++ b/src/mame/gottlieb/gottlieb.cpp @@ -2718,7 +2718,7 @@ ROM_START( mach3a ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "m3rom4.bin", 0x6000, 0x2000, CRC(8bfd5a44) SHA1(61f5c6c39047c1d0296e2cacce2be9525cb47176) ) ROM_LOAD( "m3rom3.bin", 0x8000, 0x2000, CRC(b1b045af) SHA1(4e71ca4661bf5daaf9e2ffbb930ac3b13e2e57bd) ) - ROM_LOAD( "m3rom2-1.bin", 0xa000, 0x2000, CRC(2b1689a7) SHA1(18714810de6501bc1656261aacf98be228af624e) ) + ROM_LOAD( "m3rom2-1.bin", 0xa000, 0x2000, CRC(2b1689a7) SHA1(18714810de6501bc1656261aacf98be228af624e) ) ROM_LOAD( "m3rom1.bin", 0xc000, 0x2000, CRC(3b0ba80b) SHA1(bc7e961311b40f05f2998f10f0a68f2e515c8e66) ) ROM_LOAD( "m3rom0.bin", 0xe000, 0x2000, CRC(70c12bf4) SHA1(c26127b6e2a16791b3be8abac93be6af4f30fb3b) ) diff --git a/src/mame/shared/gottlieb_a.cpp b/src/mame/shared/gottlieb_a.cpp index a97ec995c0e..2d046aa4466 100644 --- a/src/mame/shared/gottlieb_a.cpp +++ b/src/mame/shared/gottlieb_a.cpp @@ -504,17 +504,6 @@ gottlieb_sound_r2_device::gottlieb_sound_r2_device(const machine_config &mconfig } -//------------------------------------------------- -// speech_drq_custom_r - return the SP0250 -// request line as an input port bit -//------------------------------------------------- - -CUSTOM_INPUT_MEMBER(gottlieb_sound_r2_device::speech_drq_custom_r) -{ - return m_sp0250->drq_r(); -} - - //------------------------------------------------- // speech_control_w - primary audio control // register on the speech board @@ -623,7 +612,7 @@ INPUT_PORTS_START( gottlieb_sound_r2 ) PORT_DIPNAME( 0x40, 0x40, "Sound Test" ) PORT_DIPLOCATION("SB2:3") PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(gottlieb_sound_r2_device, speech_drq_custom_r) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("spsnd", sp0250_device, drq_r) INPUT_PORTS_END ioport_constructor gottlieb_sound_r2_device::device_input_ports() const diff --git a/src/mame/shared/gottlieb_a.h b/src/mame/shared/gottlieb_a.h index 2786273fa0b..ffbd920b19b 100644 --- a/src/mame/shared/gottlieb_a.h +++ b/src/mame/shared/gottlieb_a.h @@ -233,8 +233,6 @@ public: // configuration helpers void enable_cobram3_mods() { m_cobram3_mod = true; } - CUSTOM_INPUT_MEMBER(speech_drq_custom_r); - protected: // device-level overrides virtual void device_add_mconfig(machine_config &config) override;