summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/mcr3.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/mcr3.cpp')
-rw-r--r--src/mame/drivers/mcr3.cpp35
1 files changed, 9 insertions, 26 deletions
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index b1d42fcde32..f77425c9bf5 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -268,7 +268,7 @@ WRITE8_MEMBER(mcr3_state::maxrpm_op6_w)
/* when both the write and the enable are low, it's a write to the ADC0844 */
if (!(data & 0x40) && !(data & 0x20))
- m_maxrpm_adc->write(space, 0, bitswap<8>(m_maxrpm_adc_control, 7, 6, 5, 4, 2, 3, 1, 0));
+ m_maxrpm_adc->write(space, 0, BITSWAP8(m_maxrpm_adc_control, 7, 6, 5, 4, 2, 3, 1, 0));
/* low 5 bits control the turbo CS */
m_turbo_cheap_squeak->write(space, offset, data);
@@ -415,21 +415,25 @@ WRITE8_MEMBER(mcr3_state::spyhunt_op4_w)
/*
Lamp Driver:
- A 3-to-8 latching demuxer (MC14099) is connected to the input bits.
+ A 3-to-8 latching demuxer is connected to the input bits.
Three of the inputs (J1-11,10,12) specify which output to write
to, and the fourth input (J1-14) is the data value. A fifth input
(J1-13) controls the strobe to latch the data value for the
- demuxer. The eight outputs control 8 lamps through a pair of
- Darlington drivers (ULN2068B).
+ demuxer. The eight outputs directly control 8 lamps.
*/
/* bit 5 = STR1 (J1-13) */
if (((m_last_op4 ^ data) & 0x20) && !(data & 0x20))
{
+ static const char *const lampname[8] =
+ {
+ "lamp0", "lamp1", "lamp2", "lamp3",
+ "lamp4", "lamp5", "lamp6", "lamp7"
+ };
/* bit 3 -> J1-14 (DATA) */
/* bit 2 -> J1-11 (A2) */
/* bit 1 -> J1-10 (A1) */
/* bit 0 -> J1-12 (A0) */
- m_lamplatch->write_bit(data & 7, BIT(data, 3));
+ output().set_value(lampname[data & 7], (data >> 3) & 1);
}
m_last_op4 = data;
@@ -439,13 +443,6 @@ WRITE8_MEMBER(mcr3_state::spyhunt_op4_w)
}
-template<int n>
-WRITE_LINE_MEMBER(mcr3_state::spyhunt_lamp_w)
-{
- m_spyhunt_lamp[n] = state;
-}
-
-
/*************************************
*
@@ -1192,16 +1189,6 @@ static MACHINE_CONFIG_DERIVED( mcrsc_csd, mcrscroll )
MCFG_SOUND_ADD("csd", MIDWAY_CHEAP_SQUEAK_DELUXE, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
-
- MCFG_DEVICE_ADD("lamplatch", CD4099, 0) // U1 on Lamp Driver Board
- MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(mcr3_state, spyhunt_lamp_w<0>))
- MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(mcr3_state, spyhunt_lamp_w<1>))
- MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(mcr3_state, spyhunt_lamp_w<2>))
- MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(mcr3_state, spyhunt_lamp_w<3>))
- MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(mcr3_state, spyhunt_lamp_w<4>))
- MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(mcr3_state, spyhunt_lamp_w<5>))
- MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(mcr3_state, spyhunt_lamp_w<6>))
- MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(mcr3_state, spyhunt_lamp_w<7>))
MACHINE_CONFIG_END
@@ -1639,8 +1626,6 @@ DRIVER_INIT_MEMBER(mcr3_state,spyhunt)
machine().device<midway_ssio_device>("ssio")->set_custom_input(2, 0xff, read8_delegate(FUNC(mcr3_state::spyhunt_ip2_r),this));
machine().device<midway_ssio_device>("ssio")->set_custom_output(4, 0xff, write8_delegate(FUNC(mcr3_state::spyhunt_op4_w),this));
- m_spyhunt_lamp.resolve();
-
m_spyhunt_sprite_color_mask = 0x00;
m_spyhunt_scroll_offset = 16;
}
@@ -1663,8 +1648,6 @@ DRIVER_INIT_MEMBER(mcr3_state,turbotag)
machine().device<midway_ssio_device>("ssio")->set_custom_input(2, 0xff, read8_delegate(FUNC(mcr3_state::turbotag_ip2_r),this));
machine().device<midway_ssio_device>("ssio")->set_custom_output(4, 0xff, write8_delegate(FUNC(mcr3_state::spyhunt_op4_w),this));
- m_spyhunt_lamp.resolve();
-
m_spyhunt_sprite_color_mask = 0x00;
m_spyhunt_scroll_offset = 88;