summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2018-04-11 00:21:03 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2018-04-11 00:21:03 +1000
commitbc543572ec8876652c3e28dde11b871f98eee920 (patch)
treee4673cfa97238afc0775dbf7dd7a574c66cb23c4
parent34250f5564b685baaa588eb3d57c15ddec7fcffa (diff)
(nw) output finder for mw18w, ecoinfr, chexx, kungfur
-rw-r--r--src/mame/drivers/chexx.cpp60
-rw-r--r--src/mame/drivers/ecoinfr.cpp9
-rw-r--r--src/mame/drivers/kungfur.cpp51
-rw-r--r--src/mame/drivers/mw18w.cpp10
4 files changed, 73 insertions, 57 deletions
diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp
index 51ff4e044cb..27d363e70de 100644
--- a/src/mame/drivers/chexx.cpp
+++ b/src/mame/drivers/chexx.cpp
@@ -32,27 +32,15 @@ class chexx_state : public driver_device
{
public:
chexx_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_via(*this, "via6522"),
- m_digitalker(*this, "digitalker"),
- m_aysnd(*this, "aysnd")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_via(*this, "via6522")
+ , m_digitalker(*this, "digitalker")
+ , m_aysnd(*this, "aysnd")
+ , m_digits(*this, "digit%u", 0U)
{
}
- // devices
- required_device<cpu_device> m_maincpu;
- required_device<via6522_device> m_via;
- required_device<digitalker_device> m_digitalker;
- optional_device<ay8910_device> m_aysnd; // only faceoffh
-
- // vars
- uint8_t m_port_a, m_port_b;
- uint8_t m_bank;
- uint32_t m_shift;
- uint8_t m_lamp;
- uint8_t m_ay_cmd, m_ay_data;
-
// callbacks
TIMER_DEVICE_CALLBACK_MEMBER(update);
@@ -73,16 +61,32 @@ public:
DECLARE_WRITE8_MEMBER(ay_w);
DECLARE_WRITE8_MEMBER(lamp_w);
+ void faceoffh(machine_config &config);
+ void chexx83(machine_config &config);
+ void chexx83_map(address_map &map);
+ void faceoffh_map(address_map &map);
+
+private:
+ // vars
+ uint8_t m_port_a, m_port_b;
+ uint8_t m_bank;
+ uint32_t m_shift;
+ uint8_t m_lamp;
+ uint8_t m_ay_cmd, m_ay_data;
+
// digitalker
void digitalker_set_bank(uint8_t bank);
// driver_device overrides
virtual void machine_start() override;
virtual void machine_reset() override;
- void faceoffh(machine_config &config);
- void chexx83(machine_config &config);
- void chexx83_map(address_map &map);
- void faceoffh_map(address_map &map);
+
+ // devices
+ required_device<cpu_device> m_maincpu;
+ required_device<via6522_device> m_via;
+ required_device<digitalker_device> m_digitalker;
+ optional_device<ay8910_device> m_aysnd; // only faceoffh
+ output_finder<4> m_digits;
};
@@ -139,13 +143,12 @@ WRITE_LINE_MEMBER(chexx_state::via_cb2_out)
m_shift = ((m_shift << 1) & 0xffffff) | state;
// 7segs (score)
- static const uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // 4511
-
- output().set_digit_value(0, patterns[(m_shift >> (16+4)) & 0xf]);
- output().set_digit_value(1, patterns[(m_shift >> (16+0)) & 0xf]);
+ constexpr uint8_t patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // 4511
- output().set_digit_value(2, patterns[(m_shift >> (8+4)) & 0xf]);
- output().set_digit_value(3, patterns[(m_shift >> (8+0)) & 0xf]);
+ m_digits[0] = patterns[(m_shift >> (16+4)) & 0xf];
+ m_digits[1] = patterns[(m_shift >> (16+0)) & 0xf];
+ m_digits[2] = patterns[(m_shift >> (8+4)) & 0xf];
+ m_digits[3] = patterns[(m_shift >> (8+0)) & 0xf];
// Leds (period being played)
output().set_led_value(0, BIT(m_shift,2));
@@ -258,6 +261,7 @@ INPUT_PORTS_END
void chexx_state::machine_start()
{
+ m_digits.resolve();
}
void chexx_state::digitalker_set_bank(uint8_t bank)
diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp
index 5d7221f2af1..1b0ac2815a8 100644
--- a/src/mame/drivers/ecoinfr.cpp
+++ b/src/mame/drivers/ecoinfr.cpp
@@ -60,7 +60,8 @@ public:
m_reel0(*this, "reel0"),
m_reel1(*this, "reel1"),
m_reel2(*this, "reel2"),
- m_reel3(*this, "reel3")
+ m_reel3(*this, "reel3"),
+ m_digits(*this, "digit%u", 0U)
{ }
int irq_toggle;
@@ -113,6 +114,7 @@ public:
DECLARE_DRIVER_INIT(ecoinfr);
DECLARE_DRIVER_INIT(ecoinfrmab);
virtual void machine_reset() override;
+ virtual void machine_start() override { m_digits.resolve(); }
TIMER_DEVICE_CALLBACK_MEMBER(ecoinfr_irq_timer);
uint8_t m_banksel;
@@ -123,6 +125,7 @@ public:
required_device<stepper_device> m_reel1;
required_device<stepper_device> m_reel2;
required_device<stepper_device> m_reel3;
+ output_finder<16> m_digits;
void ecoinfr(machine_config &config);
void memmap(address_map &map);
void portmap(address_map &map);
@@ -327,7 +330,7 @@ WRITE8_MEMBER(ecoinfr_state::ec_port0d_out_cred_data_w)
if (m_credsel!=0xff)
{
uint8_t bf7segdata = bitswap<8>(data,7,0,1,2,3,4,5,6);
- output().set_digit_value(m_credsel+8, bf7segdata);
+ m_digits[m_credsel+8] = bf7segdata;
}
}
@@ -340,7 +343,7 @@ WRITE8_MEMBER(ecoinfr_state::ec_port0f_out_bank_segdata_w)
if (m_banksel!=0xff)
{
uint8_t bf7segdata = bitswap<8>(data,7,0,1,2,3,4,5,6);
- output().set_digit_value(m_banksel, bf7segdata);
+ m_digits[m_banksel] = bf7segdata;
}
}
diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp
index a3e515dd69a..c393bea2e85 100644
--- a/src/mame/drivers/kungfur.cpp
+++ b/src/mame/drivers/kungfur.cpp
@@ -69,18 +69,13 @@ class kungfur_state : public driver_device
{
public:
kungfur_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_adpcm1(*this, "adpcm1"),
- m_adpcm2(*this, "adpcm2")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_adpcm1(*this, "adpcm1")
+ , m_adpcm2(*this, "adpcm2")
+ , m_digits(*this, "digit%u", 0U)
{ }
- uint8_t m_latch[3];
- uint8_t m_control;
-
- uint32_t m_adpcm_pos[2];
- uint8_t m_adpcm_data[2];
- uint8_t m_adpcm_sel[2];
DECLARE_WRITE8_MEMBER(kungfur_output_w);
DECLARE_WRITE8_MEMBER(kungfur_latch1_w);
DECLARE_WRITE8_MEMBER(kungfur_latch2_w);
@@ -88,16 +83,24 @@ public:
DECLARE_WRITE8_MEMBER(kungfur_control_w);
DECLARE_WRITE8_MEMBER(kungfur_adpcm1_w);
DECLARE_WRITE8_MEMBER(kungfur_adpcm2_w);
- virtual void machine_start() override;
- virtual void machine_reset() override;
INTERRUPT_GEN_MEMBER(kungfur_irq);
DECLARE_WRITE_LINE_MEMBER(kfr_adpcm1_int);
DECLARE_WRITE_LINE_MEMBER(kfr_adpcm2_int);
+ void kungfur(machine_config &config);
+ void kungfur_map(address_map &map);
+
+private:
+ uint8_t m_latch[3];
+ uint8_t m_control;
+ uint32_t m_adpcm_pos[2];
+ uint8_t m_adpcm_data[2];
+ uint8_t m_adpcm_sel[2];
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
required_device<msm5205_device> m_adpcm1;
required_device<msm5205_device> m_adpcm2;
- void kungfur(machine_config &config);
- void kungfur_map(address_map &map);
+ output_finder<14> m_digits;
};
@@ -117,30 +120,30 @@ INTERRUPT_GEN_MEMBER(kungfur_state::kungfur_irq)
WRITE8_MEMBER(kungfur_state::kungfur_output_w)
{
// d0-d2: output led7seg
- static const int lut_digits[24] =
+ static const u8 lut_digits[24] =
{
0, 2, 4, 6, 9, 12,14,0,
0, 1, 3, 5, 8, 11,13,0,
0, 0, 0, 0, 7, 10,0, 0
};
- for (int i = 0; i < 3; i++)
+ for (u8 i = 0; i < 3; i++)
{
- int offs = i << 3 | (data & 7);
+ u8 offs = i << 3 | (data & 7);
if (lut_digits[offs])
- output().set_digit_value(lut_digits[offs] - 1, m_latch[i]);
+ m_digits[lut_digits[offs] - 1] = m_latch[i];
}
// 2.6 goes to level lamps
if ((data & 7) == 6)
{
- for (int i = 0; i < 5; i++)
- output().set_lamp_value(i, m_latch[2] >> i & 1);
+ for (u8 i = 0; i < 5; i++)
+ output().set_lamp_value(i, BIT(m_latch[2], i));
}
// d7: game-over lamp, d3-d4: marquee lamps
- output().set_lamp_value(5, data >> 7 & 1);
- output().set_lamp_value(6, data >> 3 & 1);
- output().set_lamp_value(7, data >> 4 & 1);
+ output().set_lamp_value(5, BIT(data, 7));
+ output().set_lamp_value(6, BIT(data, 3));
+ output().set_lamp_value(7, BIT(data, 4));
// d5: N/C?
// d6: coincounter
@@ -274,6 +277,8 @@ INPUT_PORTS_END
void kungfur_state::machine_start()
{
+ m_digits.resolve();
+
save_item(NAME(m_control));
save_item(NAME(m_latch));
diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp
index 46b6adf1c75..b04cf411f75 100644
--- a/src/mame/drivers/mw18w.cpp
+++ b/src/mame/drivers/mw18w.cpp
@@ -28,10 +28,10 @@ class mw18w_state : public driver_device
public:
mw18w_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu")
+ m_maincpu(*this, "maincpu"),
+ m_digits(*this, "digit%u", 0U)
{ }
- required_device<cpu_device> m_maincpu;
DECLARE_WRITE8_MEMBER(mw18w_sound0_w);
DECLARE_WRITE8_MEMBER(mw18w_sound1_w);
DECLARE_WRITE8_MEMBER(mw18w_lamps_w);
@@ -41,6 +41,10 @@ public:
void mw18w(machine_config &config);
void mw18w_map(address_map &map);
void mw18w_portmap(address_map &map);
+private:
+ virtual void machine_start() override { m_digits.resolve(); }
+ required_device<cpu_device> m_maincpu;
+ output_finder<10> m_digits;
};
@@ -146,7 +150,7 @@ WRITE8_MEMBER(mw18w_state::mw18w_led_display_w)
// d4-7: 7442 (BCD to decimal) -> pick digit panel
if ((data & 0xf0) > 0x90) return;
- output().set_digit_value(data >> 4, _7448_map[data & 0xf]);
+ m_digits[data >> 4] = _7448_map[data & 0xf];
}
WRITE8_MEMBER(mw18w_state::mw18w_irq0_clear_w)