summaryrefslogtreecommitdiffstats
path: root/src/mame
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/copsnrob.cpp2
-rw-r--r--src/mame/drivers/astrcorp.cpp34
-rw-r--r--src/mame/drivers/atarifb.cpp2
-rw-r--r--src/mame/drivers/atarisy2.cpp6
-rw-r--r--src/mame/drivers/baraduke.cpp6
-rw-r--r--src/mame/drivers/barata.cpp10
-rw-r--r--src/mame/drivers/beta.cpp18
-rw-r--r--src/mame/drivers/bfm_sc1.cpp14
-rw-r--r--src/mame/drivers/bfm_sc2.cpp8
-rw-r--r--src/mame/drivers/bfmsys85.cpp8
-rw-r--r--src/mame/drivers/bladestl.cpp6
-rw-r--r--src/mame/drivers/blitz68k.cpp72
-rw-r--r--src/mame/drivers/boxer.cpp10
-rw-r--r--src/mame/drivers/bwidow.cpp8
-rw-r--r--src/mame/drivers/calomega.cpp34
-rw-r--r--src/mame/drivers/cardline.cpp22
-rw-r--r--src/mame/drivers/cave.cpp60
-rw-r--r--src/mame/drivers/cc40.cpp8
-rw-r--r--src/mame/drivers/ccastles.cpp4
-rw-r--r--src/mame/drivers/chance32.cpp32
-rw-r--r--src/mame/drivers/chsuper.cpp26
-rw-r--r--src/mame/drivers/cidelsa.cpp8
-rw-r--r--src/mame/drivers/cischeat.cpp22
-rw-r--r--src/mame/drivers/copsnrob.cpp4
-rw-r--r--src/mame/drivers/dacholer.cpp10
-rw-r--r--src/mame/drivers/ddenlovr.cpp12
-rw-r--r--src/mame/drivers/djmain.cpp14
-rw-r--r--src/mame/drivers/dmv.cpp8
-rw-r--r--src/mame/drivers/eti660.cpp4
-rw-r--r--src/mame/drivers/fastfred.cpp1
-rw-r--r--src/mame/drivers/firetrk.cpp16
-rw-r--r--src/mame/drivers/foodf.cpp6
-rw-r--r--src/mame/drivers/funworld.cpp16
-rw-r--r--src/mame/drivers/galaga.cpp6
-rw-r--r--src/mame/drivers/galaxian.cpp2
-rw-r--r--src/mame/drivers/gaplus.cpp6
-rw-r--r--src/mame/drivers/gei.cpp36
-rw-r--r--src/mame/drivers/goldnpkr.cpp18
-rw-r--r--src/mame/drivers/goldstar.cpp44
-rw-r--r--src/mame/drivers/gottlieb.cpp8
-rw-r--r--src/mame/drivers/igs009.cpp20
-rw-r--r--src/mame/drivers/igspoker.cpp18
-rw-r--r--src/mame/drivers/isbc.cpp10
-rw-r--r--src/mame/drivers/itech32.cpp10
-rw-r--r--src/mame/drivers/jackie.cpp18
-rw-r--r--src/mame/drivers/jubilee.cpp24
-rw-r--r--src/mame/drivers/kas89.cpp92
-rw-r--r--src/mame/drivers/kenseim.cpp8
-rw-r--r--src/mame/drivers/ksys573.cpp24
-rw-r--r--src/mame/drivers/kungfur.cpp14
-rw-r--r--src/mame/drivers/lethalj.cpp14
-rw-r--r--src/mame/drivers/lockon.cpp2
-rw-r--r--src/mame/drivers/lucky74.cpp24
-rw-r--r--src/mame/drivers/magic10.cpp22
-rw-r--r--src/mame/drivers/mainevt.cpp10
-rw-r--r--src/mame/drivers/majorpkr.cpp32
-rw-r--r--src/mame/drivers/marywu.cpp14
-rw-r--r--src/mame/drivers/maxaflex.cpp26
-rw-r--r--src/mame/drivers/mazerbla.cpp24
-rw-r--r--src/mame/drivers/mcr.cpp20
-rw-r--r--src/mame/drivers/mcr3.cpp12
-rw-r--r--src/mame/drivers/merit.cpp26
-rw-r--r--src/mame/drivers/meyc8080.cpp28
-rw-r--r--src/mame/drivers/mgames.cpp24
-rw-r--r--src/mame/drivers/midzeus.cpp16
-rw-r--r--src/mame/drivers/miniboy7.cpp16
-rw-r--r--src/mame/drivers/missile.cpp14
-rw-r--r--src/mame/drivers/mk1.cpp8
-rw-r--r--src/mame/drivers/mk2.cpp14
-rw-r--r--src/mame/drivers/multfish.cpp28
-rw-r--r--src/mame/drivers/mw18w.cpp10
-rw-r--r--src/mame/drivers/namcos23.cpp8
-rw-r--r--src/mame/drivers/namcos86.cpp6
-rw-r--r--src/mame/drivers/norautp.cpp24
-rw-r--r--src/mame/drivers/notechan.cpp70
-rw-r--r--src/mame/drivers/omegrace.cpp14
-rw-r--r--src/mame/drivers/peyper.cpp16
-rw-r--r--src/mame/drivers/poolshrk.cpp4
-rw-r--r--src/mame/drivers/portrait.cpp4
-rw-r--r--src/mame/drivers/quantum.cpp10
-rw-r--r--src/mame/drivers/quizshow.cpp16
-rw-r--r--src/mame/drivers/re900.cpp34
-rw-r--r--src/mame/drivers/roul.cpp10
-rw-r--r--src/mame/drivers/runaway.cpp4
-rw-r--r--src/mame/drivers/sderby.cpp24
-rw-r--r--src/mame/drivers/segahang.cpp4
-rw-r--r--src/mame/drivers/segas16a.cpp4
-rw-r--r--src/mame/drivers/segas16b.cpp4
-rw-r--r--src/mame/drivers/segas32.cpp8
-rw-r--r--src/mame/drivers/segaufo.cpp20
-rw-r--r--src/mame/drivers/segaxbd.cpp12
-rw-r--r--src/mame/drivers/seta2.cpp60
-rw-r--r--src/mame/drivers/sfbonus.cpp30
-rw-r--r--src/mame/drivers/sigmab98.cpp46
-rw-r--r--src/mame/drivers/skykid.cpp6
-rw-r--r--src/mame/drivers/skylncr.cpp20
-rw-r--r--src/mame/drivers/smsmcorp.cpp28
-rw-r--r--src/mame/drivers/snookr10.cpp28
-rw-r--r--src/mame/drivers/softbox.cpp8
-rw-r--r--src/mame/drivers/spcforce.cpp6
-rw-r--r--src/mame/drivers/spoker.cpp20
-rw-r--r--src/mame/drivers/subsino2.cpp88
-rw-r--r--src/mame/drivers/suna16.cpp16
-rw-r--r--src/mame/drivers/suna8.cpp16
-rw-r--r--src/mame/drivers/system16.cpp4
-rw-r--r--src/mame/drivers/taito_z.cpp6
-rw-r--r--src/mame/drivers/tempest.cpp10
-rw-r--r--src/mame/drivers/tetrisp2.cpp62
-rw-r--r--src/mame/drivers/thedealr.cpp22
-rw-r--r--src/mame/drivers/ti74.cpp8
-rw-r--r--src/mame/drivers/tourtabl.cpp14
-rw-r--r--src/mame/drivers/unico.cpp10
-rw-r--r--src/mame/drivers/victory.cpp8
-rw-r--r--src/mame/drivers/videopkr.cpp34
-rw-r--r--src/mame/drivers/vip.cpp8
-rw-r--r--src/mame/drivers/wacky_gator.cpp8
-rw-r--r--src/mame/includes/ajax.h4
-rw-r--r--src/mame/includes/atarifb.h4
-rw-r--r--src/mame/includes/atarisy2.h4
-rw-r--r--src/mame/includes/baraduke.h4
-rw-r--r--src/mame/includes/bladestl.h4
-rw-r--r--src/mame/includes/bwidow.h6
-rw-r--r--src/mame/includes/calomega.h6
-rw-r--r--src/mame/includes/cave.h4
-rw-r--r--src/mame/includes/ccastles.h4
-rw-r--r--src/mame/includes/cidelsa.h4
-rw-r--r--src/mame/includes/cischeat.h6
-rw-r--r--src/mame/includes/copsnrob.h4
-rw-r--r--src/mame/includes/djmain.h4
-rw-r--r--src/mame/includes/epos.h6
-rw-r--r--src/mame/includes/eti660.h4
-rw-r--r--src/mame/includes/firetrk.h6
-rw-r--r--src/mame/includes/foodf.h4
-rw-r--r--src/mame/includes/funworld.h6
-rw-r--r--src/mame/includes/galaga.h4
-rw-r--r--src/mame/includes/galaxian.h6
-rw-r--r--src/mame/includes/galaxold.h6
-rw-r--r--src/mame/includes/gaplus.h4
-rw-r--r--src/mame/includes/goldstar.h6
-rw-r--r--src/mame/includes/gottlieb.h4
-rw-r--r--src/mame/includes/irobot.h6
-rw-r--r--src/mame/includes/itech32.h4
-rw-r--r--src/mame/includes/lethalj.h6
-rw-r--r--src/mame/includes/lockon.h4
-rw-r--r--src/mame/includes/lucky74.h6
-rw-r--r--src/mame/includes/mainevt.h4
-rw-r--r--src/mame/includes/mcr.h6
-rw-r--r--src/mame/includes/mcr3.h6
-rw-r--r--src/mame/includes/mhavoc.h4
-rw-r--r--src/mame/includes/multfish.h4
-rw-r--r--src/mame/includes/namcos86.h4
-rw-r--r--src/mame/includes/norautp.h6
-rw-r--r--src/mame/includes/pmd85.h6
-rw-r--r--src/mame/includes/poolshrk.h6
-rw-r--r--src/mame/includes/portrait.h6
-rw-r--r--src/mame/includes/runaway.h4
-rw-r--r--src/mame/includes/sderby.h6
-rw-r--r--src/mame/includes/segahang.h6
-rw-r--r--src/mame/includes/segas16a.h6
-rw-r--r--src/mame/includes/segas16b.h6
-rw-r--r--src/mame/includes/segas32.h2
-rw-r--r--src/mame/includes/segaxbd.h2
-rw-r--r--src/mame/includes/seta2.h10
-rw-r--r--src/mame/includes/skykid.h4
-rw-r--r--src/mame/includes/snookr10.h6
-rw-r--r--src/mame/includes/softbox.h4
-rw-r--r--src/mame/includes/spcforce.h4
-rw-r--r--src/mame/includes/suna16.h4
-rw-r--r--src/mame/includes/suna8.h6
-rw-r--r--src/mame/includes/system16.h6
-rw-r--r--src/mame/includes/taito_z.h4
-rw-r--r--src/mame/includes/tetrisp2.h6
-rw-r--r--src/mame/includes/unico.h4
-rw-r--r--src/mame/includes/victory.h6
-rw-r--r--src/mame/includes/vip.h4
-rw-r--r--src/mame/machine/ajax.cpp18
-rw-r--r--src/mame/machine/atarifb.cpp4
-rw-r--r--src/mame/machine/galaxold.cpp2
-rw-r--r--src/mame/machine/irobot.cpp4
-rw-r--r--src/mame/machine/mhavoc.cpp8
-rw-r--r--src/mame/machine/pc1512kb.cpp8
-rw-r--r--src/mame/machine/pc1512kb.h2
-rw-r--r--src/mame/machine/pmd85.cpp8
-rw-r--r--src/mame/machine/tandy2kb.cpp8
-rw-r--r--src/mame/machine/tandy2kb.h2
-rw-r--r--src/mame/machine/trs80m2kb.cpp8
-rw-r--r--src/mame/machine/trs80m2kb.h2
-rw-r--r--src/mame/machine/victor9k_fdc.cpp8
-rw-r--r--src/mame/machine/victor9k_fdc.h2
-rw-r--r--src/mame/machine/wangpckb.cpp6
-rw-r--r--src/mame/machine/wangpckb.h2
-rw-r--r--src/mame/machine/xevious.cpp4
-rw-r--r--src/mame/video/cischeat.cpp12
-rw-r--r--src/mame/video/epos.cpp4
194 files changed, 1260 insertions, 1259 deletions
diff --git a/src/mame/audio/copsnrob.cpp b/src/mame/audio/copsnrob.cpp
index 15603b3d9e7..cda3823e988 100644
--- a/src/mame/audio/copsnrob.cpp
+++ b/src/mame/audio/copsnrob.cpp
@@ -691,7 +691,7 @@ DISCRETE_SOUND_END
WRITE_LINE_MEMBER(copsnrob_state::one_start_w)
{
/* One Start */
- m_led[0] = state ? 0 :1;
+ m_leds[0] = state ? 0 :1;
}
diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp
index 3724894ed27..35954a5afa1 100644
--- a/src/mame/drivers/astrcorp.cpp
+++ b/src/mame/drivers/astrcorp.cpp
@@ -60,7 +60,7 @@ public:
m_hopper(*this, "hopper"),
m_ticket(*this, "ticket"),
m_spriteram(*this, "spriteram"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
// devices
@@ -106,7 +106,7 @@ public:
protected:
virtual void machine_start() override;
- output_finder<7> m_lamp;
+ output_finder<7> m_lamps;
};
/***************************************************************************
@@ -246,17 +246,17 @@ WRITE16_MEMBER(astrocorp_state::showhand_outputs_w)
if (ACCESSING_BITS_0_7)
{
machine().bookkeeping().coin_counter_w(0, (data & 0x0004)); // coin counter
- m_lamp[0] = BIT(data, 3); // you win
+ m_lamps[0] = BIT(data, 3); // you win
if ((data & 0x0010)) machine().bookkeeping().increment_dispensed_tickets(1); // coin out
- m_lamp[1] = BIT(data, 5); // coin/hopper jam
+ m_lamps[1] = BIT(data, 5); // coin/hopper jam
}
if (ACCESSING_BITS_8_15)
{
- m_lamp[2] = BIT(data, 8); // bet
- m_lamp[3] = BIT(data, 11); // start
- m_lamp[4] = BIT(data, 12); // ? select/choose
- m_lamp[5] = BIT(data, 13); // ? select/choose
- m_lamp[6] = BIT(data, 15); // look
+ m_lamps[2] = BIT(data, 8); // bet
+ m_lamps[3] = BIT(data, 11); // start
+ m_lamps[4] = BIT(data, 12); // ? select/choose
+ m_lamps[5] = BIT(data, 13); // ? select/choose
+ m_lamps[6] = BIT(data, 15); // look
}
// popmessage("%04X",data);
}
@@ -286,18 +286,18 @@ WRITE16_MEMBER(astrocorp_state::skilldrp_outputs_w)
machine().bookkeeping().coin_counter_w(1, BIT(data, 2)); // key out |
m_hopper->motor_w(BIT(data, 3)); // hopper motor?
// BIT(data, 4) // hopper?
- m_lamp[0] = BIT(data, 5); // error lamp (coin/hopper jam: "call attendant")
+ m_lamps[0] = BIT(data, 5); // error lamp (coin/hopper jam: "call attendant")
m_ticket->motor_w(BIT(data, 7)); // ticket motor?
}
if (ACCESSING_BITS_8_15)
{
// lamps:
- m_lamp[1] = BIT(data, 8); // select
- m_lamp[2] = BIT(data, 10); // take
- m_lamp[3] = BIT(data, 11); // bet
- m_lamp[4] = BIT(data, 12); // start
- m_lamp[5] = BIT(data, 14); // win / test
- m_lamp[6] = BIT(data, 15); // ticket?
+ m_lamps[1] = BIT(data, 8); // select
+ m_lamps[2] = BIT(data, 10); // take
+ m_lamps[3] = BIT(data, 11); // bet
+ m_lamps[4] = BIT(data, 12); // start
+ m_lamps[5] = BIT(data, 14); // win / test
+ m_lamps[6] = BIT(data, 15); // ticket?
}
// popmessage("%04X",data);
@@ -503,7 +503,7 @@ static const uint16_t showhand_default_eeprom[15] = {0x0001,0x0007,0x000a,0x00
void astrocorp_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
}
diff --git a/src/mame/drivers/atarifb.cpp b/src/mame/drivers/atarifb.cpp
index 7786b2055fc..367cdfedc3d 100644
--- a/src/mame/drivers/atarifb.cpp
+++ b/src/mame/drivers/atarifb.cpp
@@ -514,7 +514,7 @@ GFXDECODE_END
void atarifb_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_CTRLD));
save_item(NAME(m_sign_x_1));
diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp
index 4f966ea8ee4..02aae9e76b4 100644
--- a/src/mame/drivers/atarisy2.cpp
+++ b/src/mame/drivers/atarisy2.cpp
@@ -199,7 +199,7 @@ MACHINE_START_MEMBER(atarisy2_state,atarisy2)
{
atarigen_state::machine_start();
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_interrupt_enable));
save_item(NAME(m_p2portwr_state));
@@ -335,8 +335,8 @@ READ8_MEMBER(atarisy2_state::switch_6502_r)
WRITE8_MEMBER(atarisy2_state::switch_6502_w)
{
- m_led[0] = BIT(data, 2);
- m_led[1] = BIT(data, 3);
+ m_leds[0] = BIT(data, 2);
+ m_leds[1] = BIT(data, 3);
if (m_tms5220.found())
{
data = 12 | ((data >> 5) & 1);
diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp
index c80d9c4635e..ceff0282f98 100644
--- a/src/mame/drivers/baraduke.cpp
+++ b/src/mame/drivers/baraduke.cpp
@@ -154,8 +154,8 @@ READ8_MEMBER(baraduke_state::inputport_r)
WRITE8_MEMBER(baraduke_state::baraduke_lamps_w)
{
- m_lamp[0] = BIT(data, 3);
- m_lamp[1] = BIT(data, 4);
+ m_lamps[0] = BIT(data, 3);
+ m_lamps[1] = BIT(data, 4);
}
WRITE8_MEMBER(baraduke_state::baraduke_irq_ack_w)
@@ -374,7 +374,7 @@ GFXDECODE_END
void baraduke_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
}
diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp
index d385371a1ba..8372a6b53be 100644
--- a/src/mame/drivers/barata.cpp
+++ b/src/mame/drivers/barata.cpp
@@ -50,7 +50,7 @@ public:
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_digits(*this, "digit%u", 0U)
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(fpga_w);
@@ -61,10 +61,10 @@ public:
private:
unsigned char row_selection;
void fpga_send(unsigned char cmd);
- virtual void machine_start() override { m_digits.resolve(); m_lamp.resolve(); }
+ virtual void machine_start() override { m_digits.resolve(); m_lamps.resolve(); }
required_device<cpu_device> m_maincpu;
output_finder<4> m_digits;
- output_finder<16> m_lamp;
+ output_finder<16> m_lamps;
};
/************************
@@ -206,12 +206,12 @@ void barata_state::fpga_send(unsigned char cmd)
{
// logerror("LED: ERASE ALL\n");
for (int i=0; i<16; i++){
- m_lamp[i] = 1;
+ m_lamps[i] = 1;
}
}
else
{
- m_lamp[lamp_index] = state ? 0 : 1;
+ m_lamps[lamp_index] = state ? 0 : 1;
}
default:
mode = FPGA_WAITING_FOR_NEW_CMD;
diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp
index c13cb63c4b7..40213d33007 100644
--- a/src/mame/drivers/beta.cpp
+++ b/src/mame/drivers/beta.cpp
@@ -58,8 +58,8 @@ public:
m_speaker(*this, "speaker"),
m_eprom(*this, EPROM_TAG),
m_q(*this, "Q%u", 6U),
- m_digit(*this, "digit%u", 0U),
- m_led(*this, "led%u", 0U)
+ m_digits(*this, "digit%u", 0U),
+ m_leds(*this, "led%u", 0U)
{ }
DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
@@ -85,8 +85,8 @@ private:
required_device<speaker_sound_device> m_speaker;
required_device<generic_slot_device> m_eprom;
required_ioport_array<4> m_q;
- output_finder<6> m_digit;
- output_finder<2> m_led;
+ output_finder<6> m_digits;
+ output_finder<2> m_leds;
/* EPROM state */
int m_eprom_oe;
@@ -162,7 +162,7 @@ INPUT_PORTS_END
TIMER_CALLBACK_MEMBER(beta_state::led_refresh)
{
if (m_ls145_p < 6)
- m_digit[m_ls145_p] = m_segment;
+ m_digits[m_ls145_p] = m_segment;
}
READ8_MEMBER( beta_state::riot_pa_r )
@@ -261,10 +261,10 @@ WRITE8_MEMBER( beta_state::riot_pb_w )
m_speaker->level_w(!BIT(data, 4));
/* address led */
- m_led[0] = BIT(data, 5);
+ m_leds[0] = BIT(data, 5);
/* data led */
- m_led[1] = !BIT(data, 5);
+ m_leds[1] = !BIT(data, 5);
/* EPROM address shift */
if (!BIT(m_old_data, 5) && BIT(data, 5))
@@ -316,8 +316,8 @@ DEVICE_IMAGE_UNLOAD_MEMBER( beta_state, beta_eprom )
void beta_state::machine_start()
{
- m_digit.resolve();
- m_led.resolve();
+ m_digits.resolve();
+ m_leds.resolve();
m_led_refresh_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(beta_state::led_refresh),this));
diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp
index ae205d93435..b87e778df10 100644
--- a/src/mame/drivers/bfm_sc1.cpp
+++ b/src/mame/drivers/bfm_sc1.cpp
@@ -128,7 +128,7 @@ public:
m_upd7759(*this, "upd"),
m_vfd0(*this, "vfd0"),
m_meters(*this, "meters"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
void init_toppoker();
@@ -176,7 +176,7 @@ protected:
void save_state();
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void machine_reset() override;
INTERRUPT_GEN_MEMBER(timer_irq);
void sc1_common_init(int reels, int decrypt, int defaultbank);
@@ -215,7 +215,7 @@ private:
optional_device<upd7759_device> m_upd7759;
optional_device<bfm_bd1_device> m_vfd0;
required_device<meters_device> m_meters;
- output_finder<256> m_lamp;
+ output_finder<256> m_lamps;
};
#define VFD_RESET 0x20
@@ -472,8 +472,8 @@ WRITE8_MEMBER(bfm_sc1_state::mux1latch_w)
for ( int i = 0; i < 8; i++ )
{
- m_lamp[BFM_strcnv[offset ]] = BIT(m_mux1_datalo, i);
- m_lamp[BFM_strcnv[offset+8]] = BIT(m_mux1_datahi, i);
+ m_lamps[BFM_strcnv[offset ]] = BIT(m_mux1_datalo, i);
+ m_lamps[BFM_strcnv[offset+8]] = BIT(m_mux1_datahi, i);
offset++;
}
@@ -541,8 +541,8 @@ WRITE8_MEMBER(bfm_sc1_state::mux2latch_w)
for ( int i = 0; i < 8; i++ )
{
- m_lamp[BFM_strcnv[offset ]] = BIT(m_mux2_datalo, i);
- m_lamp[BFM_strcnv[offset+8]] = BIT(m_mux2_datahi, i);
+ m_lamps[BFM_strcnv[offset ]] = BIT(m_mux2_datalo, i);
+ m_lamps[BFM_strcnv[offset+8]] = BIT(m_mux2_datahi, i);
offset++;
}
}
diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp
index a771abdbae6..fcd078f4eef 100644
--- a/src/mame/drivers/bfm_sc2.cpp
+++ b/src/mame/drivers/bfm_sc2.cpp
@@ -205,7 +205,7 @@ public:
, m_rombank1(*this, "bank1")
, m_ym2413(*this, "ymsnd")
, m_meters(*this, "meters")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{
for (auto &elem : m_lamps_old)
elem = 0;
@@ -322,7 +322,7 @@ private:
int m_e2data_to_read;
uint8_t m_codec_data[256];
uint8_t m_lamps_old[0x20];
- output_finder<256> m_lamp;
+ output_finder<256> m_lamps;
};
@@ -710,7 +710,7 @@ WRITE8_MEMBER(bfm_sc2_state::mux_output_w)
int newbit = BIT(data, i);
if (oldbit != newbit)
- m_lamp[off + i] = newbit;
+ m_lamps[off + i] = newbit;
}
m_lamps_old[offset] = data;
@@ -2270,7 +2270,7 @@ MACHINE_CONFIG_END
void bfm_sc2_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
nvram_device *e2ram = subdevice<nvram_device>("e2ram");
if (e2ram != nullptr)
e2ram->set_base(m_e2ram, sizeof(m_e2ram));
diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp
index 72c4170f021..a484b780887 100644
--- a/src/mame/drivers/bfmsys85.cpp
+++ b/src/mame/drivers/bfmsys85.cpp
@@ -84,7 +84,7 @@ public:
m_reel3(*this, "reel3"),
m_acia6850_0(*this, "acia6850_0"),
m_meters(*this, "meters"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE_LINE_MEMBER(reel0_optic_cb) { if (state) m_optic_pattern |= 0x01; else m_optic_pattern &= ~0x01; }
@@ -140,7 +140,7 @@ protected:
required_device<stepper_device> m_reel3;
required_device<acia6850_device> m_acia6850_0;
required_device<meters_device> m_meters;
- output_finder<256> m_lamp;
+ output_finder<256> m_lamps;
};
#define MASTER_CLOCK (XTAL(4'000'000))
@@ -319,7 +319,7 @@ WRITE8_MEMBER(bfmsys85_state::mux_data_w)
for (int i = 0; i < 8; i++ )
{
- m_lamp[off] = BIT(data, i);
+ m_lamps[off] = BIT(data, i);
off++;
}
}
@@ -355,7 +355,7 @@ READ8_MEMBER(bfmsys85_state::triac_r)
void bfmsys85_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
}
// memory map for bellfruit system85 board ////////////////////////////////
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index 7f1dbbae00e..a4e60975f19 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -73,8 +73,8 @@ WRITE8_MEMBER(bladestl_state::bladestl_bankswitch_w)
machine().bookkeeping().coin_counter_w(1,data & 0x02);
/* bits 2 & 3 = lamps */
- m_lamp[0] = BIT(data, 2);
- m_lamp[1] = BIT(data, 3);
+ m_lamps[0] = BIT(data, 2);
+ m_lamps[1] = BIT(data, 3);
/* bit 4 = relay (???) */
@@ -285,7 +285,7 @@ GFXDECODE_END
void bladestl_state::machine_start()
{
m_rombank->configure_entries(0, 4, memregion("maincpu")->base(), 0x2000);
- m_lamp.resolve();
+ m_lamps.resolve();
save_item(NAME(m_spritebank));
save_item(NAME(m_last_track));
diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp
index 3e362607057..6f6e3f7ded7 100644
--- a/src/mame/drivers/blitz68k.cpp
+++ b/src/mame/drivers/blitz68k.cpp
@@ -75,7 +75,7 @@ public:
, m_maincpu(*this, "maincpu")
, m_palette(*this, "palette")
, m_crtc(*this, "crtc")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE16_MEMBER(blit_copy_w);
@@ -193,7 +193,7 @@ public:
void steaser_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
optional_shared_ptr<uint16_t> m_nvram;
std::unique_ptr<uint8_t[]> m_blit_buffer;
@@ -211,7 +211,7 @@ protected:
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
optional_device<mc6845_device> m_crtc;
- output_finder<17> m_led;
+ output_finder<17> m_leds;
};
/*************************************************************************************************************
@@ -878,13 +878,13 @@ WRITE16_MEMBER(blitz68k_state::cjffruit_leds1_w)
if (ACCESSING_BITS_8_15)
{
machine().bookkeeping().coin_counter_w(0, data & 0x0100); // coin in
- m_led[0] = BIT(data, 9); // win???
+ m_leds[0] = BIT(data, 9); // win???
// 1 data & 0x0400 // win???
- m_led[2] = BIT(data, 11); // small
- m_led[3] = BIT(data, 12); // big
- m_led[4] = BIT(data, 13); // take
- m_led[5] = BIT(data, 14); // double up
- m_led[6] = BIT(data, 15); // cancel
+ m_leds[2] = BIT(data, 11); // small
+ m_leds[3] = BIT(data, 12); // big
+ m_leds[4] = BIT(data, 13); // take
+ m_leds[5] = BIT(data, 14); // double up
+ m_leds[6] = BIT(data, 15); // cancel
show_leds123();
}
}
@@ -894,14 +894,14 @@ WRITE16_MEMBER(blitz68k_state::cjffruit_leds2_w)
data = COMBINE_DATA(m_leds1);
if (ACCESSING_BITS_8_15)
{
- m_led[ 7] = BIT(data, 8); // start
- m_led[ 8] = BIT(data, 9); // bet
- m_led[ 9] = BIT(data, 10); // hold 5
- m_led[10] = BIT(data, 11); // hold 4
- m_led[11] = BIT(data, 12); // hold 3
- m_led[12] = BIT(data, 13); // hold 2
- m_led[13] = BIT(data, 14); // collect
- m_led[14] = BIT(data, 15); // call attendant
+ m_leds[ 7] = BIT(data, 8); // start
+ m_leds[ 8] = BIT(data, 9); // bet
+ m_leds[ 9] = BIT(data, 10); // hold 5
+ m_leds[10] = BIT(data, 11); // hold 4
+ m_leds[11] = BIT(data, 12); // hold 3
+ m_leds[12] = BIT(data, 13); // hold 2
+ m_leds[13] = BIT(data, 14); // collect
+ m_leds[14] = BIT(data, 15); // call attendant
show_leds123();
}
}
@@ -911,8 +911,8 @@ WRITE16_MEMBER(blitz68k_state::cjffruit_leds3_w)
data = COMBINE_DATA(m_leds2);
if (ACCESSING_BITS_8_15)
{
- m_led[15] = BIT(data, 8); // hopper coins?
- m_led[16] = BIT(data, 10); // coin out?
+ m_leds[15] = BIT(data, 8); // hopper coins?
+ m_leds[16] = BIT(data, 10); // coin out?
show_leds123();
}
}
@@ -1016,13 +1016,13 @@ WRITE16_MEMBER(blitz68k_state::deucesw2_leds1_w)
if (ACCESSING_BITS_8_15)
{
machine().bookkeeping().coin_counter_w(0, data & 0x0100); // coin in
- m_led[0] = BIT(data, 9); // win???
+ m_leds[0] = BIT(data, 9); // win???
// 1 data & 0x0400 // win???
- m_led[2] = BIT(data, 11); // small
- m_led[3] = BIT(data, 12); // big
- m_led[4] = BIT(data, 13); // take
- m_led[5] = BIT(data, 14); // double up
- m_led[6] = BIT(data, 15); // cancel
+ m_leds[2] = BIT(data, 11); // small
+ m_leds[3] = BIT(data, 12); // big
+ m_leds[4] = BIT(data, 13); // take
+ m_leds[5] = BIT(data, 14); // double up
+ m_leds[6] = BIT(data, 15); // cancel
show_leds123();
}
}
@@ -1032,14 +1032,14 @@ WRITE16_MEMBER(blitz68k_state::deucesw2_leds2_w)
data = COMBINE_DATA(m_leds1);
if (ACCESSING_BITS_8_15)
{
- m_led[ 7] = BIT(data, 8); // start
- m_led[ 8] = BIT(data, 9); // bet
- m_led[ 9] = BIT(data, 10); // hold 5
- m_led[10] = BIT(data, 11); // hold 4
- m_led[11] = BIT(data, 12); // hold 3
- m_led[12] = BIT(data, 13); // hold 2
- m_led[13] = BIT(data, 14); // hold 1
- m_led[14] = BIT(data, 15); // call attendant
+ m_leds[ 7] = BIT(data, 8); // start
+ m_leds[ 8] = BIT(data, 9); // bet
+ m_leds[ 9] = BIT(data, 10); // hold 5
+ m_leds[10] = BIT(data, 11); // hold 4
+ m_leds[11] = BIT(data, 12); // hold 3
+ m_leds[12] = BIT(data, 13); // hold 2
+ m_leds[13] = BIT(data, 14); // hold 1
+ m_leds[14] = BIT(data, 15); // call attendant
show_leds123();
}
}
@@ -1049,8 +1049,8 @@ WRITE16_MEMBER(blitz68k_state::deucesw2_leds3_w)
data = COMBINE_DATA(m_leds2);
if (ACCESSING_BITS_8_15)
{
- m_led[15] = BIT(data, 8); // hopper coins?
- m_led[16] = BIT(data, 10); // coin out?
+ m_leds[15] = BIT(data, 8); // hopper coins?
+ m_leds[16] = BIT(data, 10); // coin out?
show_leds123();
}
}
@@ -1217,7 +1217,7 @@ WRITE16_MEMBER(blitz68k_state::hermit_leds2_w)
data = COMBINE_DATA(m_leds1);
if (ACCESSING_BITS_8_15)
{
- m_led[7] = BIT(data, 8); // button
+ m_leds[7] = BIT(data, 8); // button
show_leds12();
}
}
diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp
index e51fb80db8e..f10b28d48e5 100644
--- a/src/mame/drivers/boxer.cpp
+++ b/src/mame/drivers/boxer.cpp
@@ -40,7 +40,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
void boxer(machine_config &config);
@@ -82,7 +82,7 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
/*************************************
@@ -333,8 +333,8 @@ WRITE8_MEMBER(boxer_state::crowd_w)
WRITE8_MEMBER(boxer_state::led_w)
{
- m_led[1] = BIT(~data, 0);
- m_led[0] = BIT(~data, 1);
+ m_leds[1] = BIT(~data, 0);
+ m_leds[0] = BIT(~data, 1);
}
@@ -473,7 +473,7 @@ GFXDECODE_END
void boxer_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
m_pot_interrupt = timer_alloc(TIMER_POT_INTERRUPT);
m_periodic_timer = timer_alloc(TIMER_PERIODIC);
diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp
index 79233cb4191..2208f84228f 100644
--- a/src/mame/drivers/bwidow.cpp
+++ b/src/mame/drivers/bwidow.cpp
@@ -336,8 +336,8 @@ WRITE8_MEMBER(bwidow_state::bwidow_misc_w)
*/
if (data == m_lastdata) return;
- m_led[0] = BIT(~data, 4);
- m_led[1] = BIT(~data, 5);
+ m_leds[0] = BIT(~data, 4);
+ m_leds[1] = BIT(~data, 5);
machine().bookkeeping().coin_counter_w(0, data & 0x01);
machine().bookkeeping().coin_counter_w(1, data & 0x02);
m_lastdata = data;
@@ -346,8 +346,8 @@ WRITE8_MEMBER(bwidow_state::bwidow_misc_w)
WRITE8_MEMBER(bwidow_state::spacduel_coin_counter_w)
{
if (data == m_lastdata) return;
- m_led[0] = BIT(~data, 5); // start lamp
- m_led[1] = BIT(~data, 4); // select lamp
+ m_leds[0] = BIT(~data, 5); // start lamp
+ m_leds[1] = BIT(~data, 4); // select lamp
machine().bookkeeping().coin_lockout_w(0, !BIT(data,3));
machine().bookkeeping().coin_lockout_w(1, !BIT(data,3));
machine().bookkeeping().coin_lockout_w(2, !BIT(data,3));
diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp
index f13d80049bd..25bd5aa7a7c 100644
--- a/src/mame/drivers/calomega.cpp
+++ b/src/mame/drivers/calomega.cpp
@@ -788,33 +788,33 @@ WRITE8_MEMBER(calomega_state::pia1_bout_w)
WRITE8_MEMBER(calomega_state::lamps_903a_w)
{
/* First 5 bits of PIA0 port B */
- m_lamp[1] = BIT(~data, 0); /* L1 (Hold 1) */
- m_lamp[2] = BIT(~data, 1); /* L2 (Hold 2) */
- m_lamp[3] = BIT(~data, 2); /* L3 (Hold 3) */
- m_lamp[4] = BIT(~data, 3); /* L4 (Hold 4) */
- m_lamp[5] = BIT(~data, 4); /* L5 (Hold 5) */
+ m_lamps[0] = BIT(~data, 0); /* L1 (Hold 1) */
+ m_lamps[1] = BIT(~data, 1); /* L2 (Hold 2) */
+ m_lamps[2] = BIT(~data, 2); /* L3 (Hold 3) */
+ m_lamps[3] = BIT(~data, 3); /* L4 (Hold 4) */
+ m_lamps[4] = BIT(~data, 4); /* L5 (Hold 5) */
}
WRITE8_MEMBER(calomega_state::lamps_903b_w)
{
/* First 4 bits of PIA1 port A */
- m_lamp[6] = BIT(~data, 0); /* L6 (Cancel) */
- m_lamp[7] = BIT(~data, 1); /* L7 (Bet) */
- m_lamp[8] = BIT(~data, 2); /* L8 (Take) */
- m_lamp[9] = BIT(~data, 3); /* L9 (Door?) */
+ m_lamps[5] = BIT(~data, 0); /* L6 (Cancel) */
+ m_lamps[6] = BIT(~data, 1); /* L7 (Bet) */
+ m_lamps[7] = BIT(~data, 2); /* L8 (Take) */
+ m_lamps[8] = BIT(~data, 3); /* L9 (Door?) */
}
WRITE8_MEMBER(calomega_state::lamps_905_w)
{
/* Whole 8 bits of PIA0 port B */
- m_lamp[1] = BIT(~data, 0); /* L1 (Hold 1) */
- m_lamp[2] = BIT(~data, 1); /* L2 (Hold 2) */
- m_lamp[3] = BIT(~data, 2); /* L3 (Hold 3) */
- m_lamp[4] = BIT(~data, 3); /* L4 (Hold 4) */
- m_lamp[5] = BIT(~data, 4); /* L5 (Hold 5) */
- m_lamp[6] = BIT(~data, 5); /* L6 (unknown) */
- m_lamp[7] = BIT(~data, 6); /* L7 (unknown) */
- m_lamp[8] = BIT(~data, 7); /* L8 (unknown) */
+ m_lamps[0] = BIT(~data, 0); /* L1 (Hold 1) */
+ m_lamps[1] = BIT(~data, 1); /* L2 (Hold 2) */
+ m_lamps[2] = BIT(~data, 2); /* L3 (Hold 3) */
+ m_lamps[3] = BIT(~data, 3); /* L4 (Hold 4) */
+ m_lamps[4] = BIT(~data, 4); /* L5 (Hold 5) */
+ m_lamps[5] = BIT(~data, 5); /* L6 (unknown) */
+ m_lamps[6] = BIT(~data, 6); /* L7 (unknown) */
+ m_lamps[7] = BIT(~data, 7); /* L8 (unknown) */
}
diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp
index cf2f77bec83..470d688fa88 100644
--- a/src/mame/drivers/cardline.cpp
+++ b/src/mame/drivers/cardline.cpp
@@ -44,7 +44,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_screen(*this, "screen"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(vram_w);
@@ -81,12 +81,12 @@ protected:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
- output_finder<8> m_lamp;
+ output_finder<8> m_lamps;
};
void cardline_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
m_video = 0;
m_hsync_q = 1;
for (int i=0; i < 0x2000; i++)
@@ -207,14 +207,14 @@ READ8_MEMBER(cardline_state::hsync_r)
WRITE8_MEMBER(cardline_state::lamps_w)
{
/* button lamps 1-8 (collect, card 1-5, bet, start) */
- m_lamp[5] = BIT(data, 0);
- m_lamp[0] = BIT(data, 1);
- m_lamp[1] = BIT(data, 2);
- m_lamp[2] = BIT(data, 3);
- m_lamp[3] = BIT(data, 4);
- m_lamp[4] = BIT(data, 5);
- m_lamp[6] = BIT(data, 6);
- m_lamp[7] = BIT(data, 7);
+ m_lamps[5] = BIT(data, 0);
+ m_lamps[0] = BIT(data, 1);
+ m_lamps[1] = BIT(data, 2);
+ m_lamps[2] = BIT(data, 3);
+ m_lamps[3] = BIT(data, 4);
+ m_lamps[4] = BIT(data, 5);
+ m_lamps[6] = BIT(data, 6);
+ m_lamps[7] = BIT(data, 7);
}
void cardline_state::mem_prg(address_map &map)
diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp
index ee65013e286..88b80af1736 100644
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@@ -700,10 +700,10 @@ WRITE16_MEMBER(cave_state::korokoro_leds_w)
{
COMBINE_DATA(&m_leds[0]);
- m_led[0] = BIT(data, 15);
- m_led[1] = BIT(data, 14);
- m_led[2] = BIT(data, 12); // square button
- m_led[3] = BIT(data, 11); // round button
+ m_led_outputs[0] = BIT(data, 15);
+ m_led_outputs[1] = BIT(data, 14);
+ m_led_outputs[2] = BIT(data, 12); // square button
+ m_led_outputs[3] = BIT(data, 11); // round button
// machine().bookkeeping().coin_lockout_w(1, ~data & 0x0200); // coin lockouts?
// machine().bookkeeping().coin_lockout_w(0, ~data & 0x0100);
@@ -711,10 +711,10 @@ WRITE16_MEMBER(cave_state::korokoro_leds_w)
// machine().bookkeeping().coin_counter_w(1, data & 0x0020);
machine().bookkeeping().coin_counter_w(0, data & 0x0010);
- m_led[5] = BIT(data, 3);
- m_led[6] = BIT(data, 2);
- m_led[7] = BIT(data, 1);
- m_led[8] = BIT(data, 0);
+ m_led_outputs[5] = BIT(data, 3);
+ m_led_outputs[6] = BIT(data, 2);
+ m_led_outputs[7] = BIT(data, 1);
+ m_led_outputs[8] = BIT(data, 0);
show_leds();
}
@@ -907,17 +907,17 @@ WRITE16_MEMBER(cave_state::ppsatan_out_w)
{
machine().bookkeeping().coin_counter_w(0, data & 0x0001);
- m_led[0] = BIT(data, 4);
- m_led[1] = BIT(data, 5);
- m_led[2] = BIT(data, 6);
- m_led[3] = BIT(data, 7);
+ m_led_outputs[0] = BIT(data, 4);
+ m_led_outputs[1] = BIT(data, 5);
+ m_led_outputs[2] = BIT(data, 6);
+ m_led_outputs[3] = BIT(data, 7);
}
if (ACCESSING_BITS_8_15)
{
- m_led[4] = BIT(data, 8);
- m_led[5] = BIT(data, 9);
- m_led[6] = BIT(data, 10); // not tested in service mode
- m_led[7] = BIT(data, 11); // not tested in service mode
+ m_led_outputs[4] = BIT(data, 8);
+ m_led_outputs[5] = BIT(data, 9);
+ m_led_outputs[6] = BIT(data, 10); // not tested in service mode
+ m_led_outputs[7] = BIT(data, 11); // not tested in service mode
m_oki[0]->set_rom_bank((data & 0x8000) >> 15);
}
@@ -1133,14 +1133,14 @@ WRITE16_MEMBER(cave_state::tjumpman_leds_w)
{
if (ACCESSING_BITS_0_7)
{
- m_led[0] = BIT(data, 0); // suru
- m_led[1] = BIT(data, 1); // shinai
- m_led[2] = BIT(data, 2); // payout
- m_led[3] = BIT(data, 3); // go
- m_led[4] = BIT(data, 4); // 1 bet
- m_led[5] = BIT(data, 5); // medal
+ m_led_outputs[0] = BIT(data, 0); // suru
+ m_led_outputs[1] = BIT(data, 1); // shinai
+ m_led_outputs[2] = BIT(data, 2); // payout
+ m_led_outputs[3] = BIT(data, 3); // go
+ m_led_outputs[4] = BIT(data, 4); // 1 bet
+ m_led_outputs[5] = BIT(data, 5); // medal
m_hopper = BIT(data, 6); // hopper
- m_led[6] = BIT(data, 7); // 3 bet
+ m_led_outputs[6] = BIT(data, 7); // 3 bet
}
// popmessage("led %04X", data);
@@ -1179,12 +1179,12 @@ WRITE16_MEMBER(cave_state::pacslot_leds_w)
{
if (ACCESSING_BITS_0_7)
{
- m_led[0] = data & 0x0001; // pac-man
- m_led[1] = data & 0x0002; // ms. pac-man
- m_led[2] = data & 0x0004; // payout
- m_led[3] = data & 0x0008; // start
- m_led[4] = data & 0x0010; // bet
- m_led[5] = data & 0x0020; // medal
+ m_led_outputs[0] = data & 0x0001; // pac-man
+ m_led_outputs[1] = data & 0x0002; // ms. pac-man
+ m_led_outputs[2] = data & 0x0004; // payout
+ m_led_outputs[3] = data & 0x0008; // start
+ m_led_outputs[4] = data & 0x0010; // bet
+ m_led_outputs[5] = data & 0x0020; // medal
m_hopper = data & 0x0040; // hopper
}
@@ -2064,7 +2064,7 @@ GFXDECODE_END
void cave_state::machine_start()
{
- m_led.resolve();
+ m_led_outputs.resolve();
m_vblank_end_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cave_state::cave_vblank_end), this));
save_item(NAME(m_soundbuf_wptr));
diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp
index 0600fe20fbf..30c550e25d1 100644
--- a/src/mame/drivers/cc40.cpp
+++ b/src/mame/drivers/cc40.cpp
@@ -97,7 +97,7 @@ public:
m_cart(*this, "cartslot"),
m_key_matrix(*this, "IN.%u", 0),
m_battery_inp(*this, "BATTERY"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{
m_sysram[0] = nullptr;
m_sysram[1] = nullptr;
@@ -153,7 +153,7 @@ private:
u16 m_sysram_size[2];
u16 m_sysram_end[2];
u16 m_sysram_mask[2];
- output_finder<80> m_lamp;
+ output_finder<80> m_lamps;
};
@@ -204,7 +204,7 @@ void cc40_state::update_lcd_indicator(u8 y, u8 x, int state)
// ---- raw lcd screen here ----
// under | ERROR v v v v v v _LOW
// output# | 60 61 62 63 50 51 52 53
- m_lamp[y * 10 + x] = state ? 1 : 0;
+ m_lamps[y * 10 + x] = state ? 1 : 0;
}
HD44780_PIXEL_UPDATE(cc40_state::cc40_pixel_update)
@@ -548,7 +548,7 @@ void cc40_state::postload()
void cc40_state::machine_start()
{
// init
- m_lamp.resolve();
+ m_lamps.resolve();
std::string region_tag;
m_cart_rom = memregion(region_tag.assign(m_cart->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp
index c140dd6b17a..227e974abe9 100644
--- a/src/mame/drivers/ccastles.cpp
+++ b/src/mame/drivers/ccastles.cpp
@@ -188,7 +188,7 @@ void ccastles_state::machine_start()
{
rectangle visarea;
- m_led.resolve();
+ m_leds.resolve();
/* initialize globals */
m_syncprom = memregion("proms")->base() + 0x000;
@@ -252,7 +252,7 @@ WRITE8_MEMBER(ccastles_state::irq_ack_w)
WRITE8_MEMBER(ccastles_state::led_w)
{
- m_led[offset] = BIT(~data, 0);
+ m_leds[offset] = BIT(~data, 0);
}
diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp
index 2e359b596c9..24c998e0b6a 100644
--- a/src/mame/drivers/chance32.cpp
+++ b/src/mame/drivers/chance32.cpp
@@ -37,7 +37,7 @@ public:
m_bgram(*this, "bgram"),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(chance32_fgram_w)
@@ -77,7 +77,7 @@ protected:
uint8_t mux_data;
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
- output_finder<13> m_lamp;
+ output_finder<13> m_lamps;
};
@@ -179,13 +179,13 @@ WRITE8_MEMBER(chance32_state::muxout_w)
if (data & 1) // bit 0 is the mux selector.
{
- m_lamp[0] = BIT(data, 1); /* Lamp 0 - Small / Big */
- m_lamp[1] = BIT(data, 2); /* Lamp 1 - Big / Small */
- m_lamp[2] = BIT(data, 3); /* Lamp 2 - Hold 5 */
- m_lamp[3] = BIT(data, 4); /* Lamp 3 - Hold 4 */
- m_lamp[4] = BIT(data, 5); /* Lamp 4 - Hold 3 */
- m_lamp[5] = BIT(data, 6); /* Lamp 5 - Hold 2 */
- m_lamp[6] = BIT(data, 7); /* Lamp 6 - Hold 1 */
+ m_lamps[0] = BIT(data, 1); /* Lamp 0 - Small / Big */
+ m_lamps[1] = BIT(data, 2); /* Lamp 1 - Big / Small */
+ m_lamps[2] = BIT(data, 3); /* Lamp 2 - Hold 5 */
+ m_lamps[3] = BIT(data, 4); /* Lamp 3 - Hold 4 */
+ m_lamps[4] = BIT(data, 5); /* Lamp 4 - Hold 3 */
+ m_lamps[5] = BIT(data, 6); /* Lamp 5 - Hold 2 */
+ m_lamps[6] = BIT(data, 7); /* Lamp 6 - Hold 1 */
logerror("Lamps A: %02x\n", data);
}
@@ -193,12 +193,12 @@ WRITE8_MEMBER(chance32_state::muxout_w)
else
{
// bit 1 is unknown...
- m_lamp[7] = BIT(data, 2); /* Lamp 7 - Fever! */
- m_lamp[8] = BIT(data, 3); /* Lamp 8 - Cancel */
- m_lamp[9] = BIT(data, 4); /* Lamp 9 - D-Up / Take */
- m_lamp[10] = BIT(data, 5); /* Lamp 10 - Take / D-Up */
- m_lamp[11] = BIT(data, 6); /* Lamp 11 - Deal */
- m_lamp[12] = BIT(data, 7); /* Lamp 12 - Bet */
+ m_lamps[7] = BIT(data, 2); /* Lamp 7 - Fever! */
+ m_lamps[8] = BIT(data, 3); /* Lamp 8 - Cancel */
+ m_lamps[9] = BIT(data, 4); /* Lamp 9 - D-Up / Take */
+ m_lamps[10] = BIT(data, 5); /* Lamp 10 - Take / D-Up */
+ m_lamps[11] = BIT(data, 6); /* Lamp 11 - Deal */
+ m_lamps[12] = BIT(data, 7); /* Lamp 12 - Bet */
logerror("Lamps B: %02x\n", data);
}
@@ -448,7 +448,7 @@ GFXDECODE_END
void chance32_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
}
void chance32_state::machine_reset()
diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp
index 477c3ef0d9e..14597635115 100644
--- a/src/mame/drivers/chsuper.cpp
+++ b/src/mame/drivers/chsuper.cpp
@@ -40,7 +40,7 @@ public:
, m_maincpu(*this, "maincpu")
, m_gfxdecode(*this, "gfxdecode")
, m_palette(*this, "palette")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(chsuper_vram_w);
@@ -59,7 +59,7 @@ public:
protected:
// driver_device overrides
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
//virtual void machine_reset();
virtual void video_start() override;
@@ -73,7 +73,7 @@ protected:
required_device<z180_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- output_finder<7> m_lamp;
+ output_finder<7> m_lamps;
};
@@ -157,11 +157,11 @@ WRITE8_MEMBER( chsuper_state::chsuper_vram_w )
WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh
{
machine().bookkeeping().coin_counter_w(0, data & 0x01); // Coin counter
- m_lamp[0] = BIT(data, 1); // Hold 1 / Black (Nero) lamp.
+ m_lamps[0] = BIT(data, 1); // Hold 1 / Black (Nero) lamp.
machine().bookkeeping().coin_counter_w(1, data & 0x04); // Payout / Ticket Out pulse
- m_lamp[1] = BIT(data, 3); // Hold 2 / Low (Bassa) lamp.
+ m_lamps[1] = BIT(data, 3); // Hold 2 / Low (Bassa) lamp.
// D4: unused...
- m_lamp[5] = BIT(data, 5); // BET lamp
+ m_lamps[5] = BIT(data, 5); // BET lamp
// D6: ticket motor...
// D7: unused...
@@ -172,11 +172,11 @@ WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh
if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON...
{
- m_lamp[2] = 1; // HOLD 3 ON
+ m_lamps[2] = 1; // HOLD 3 ON
}
else
{
- m_lamp[2] = 0; // otherwise HOLD 3 OFF
+ m_lamps[2] = 0; // otherwise HOLD 3 OFF
}
}
@@ -184,11 +184,11 @@ WRITE8_MEMBER( chsuper_state::chsuper_outportb_w ) // Port EFh
{
// D0: unknown...
// D1: unused...
- m_lamp[3] = BIT(data, 2); // Hold 4 / High (Alta) lamp.
+ m_lamps[3] = BIT(data, 2); // Hold 4 / High (Alta) lamp.
// D3: unused...
// D4: unused...
- m_lamp[4] = BIT(data, 5); // Hold 5 / Red (Rosso) / Gamble (Raddoppio) lamp.
- m_lamp[6] = BIT(data, 6); // Start / Gamble (Raddoppio) lamp.
+ m_lamps[4] = BIT(data, 5); // Hold 5 / Red (Rosso) / Gamble (Raddoppio) lamp.
+ m_lamps[6] = BIT(data, 6); // Start / Gamble (Raddoppio) lamp.
// D7: unused...
/* Workaround to get the HOLD 3 lamp line active,
@@ -198,11 +198,11 @@ WRITE8_MEMBER( chsuper_state::chsuper_outportb_w ) // Port EFh
if ((m_blacklamp == 1) & (m_redlamp == 1)) // if both are ON...
{
- m_lamp[2] = 1; // Hold 3 ON
+ m_lamps[2] = 1; // Hold 3 ON
}
else
{
- m_lamp[2] = 0; // Hold 3 OFF
+ m_lamps[2] = 0; // Hold 3 OFF
}
}
diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp
index 4e2aceda284..02b99a34c92 100644
--- a/src/mame/drivers/cidelsa.cpp
+++ b/src/mame/drivers/cidelsa.cpp
@@ -114,9 +114,9 @@ WRITE8_MEMBER( cidelsa_state::altair_out1_w )
7 CONT. M1
*/
- m_led[0] = BIT(data, 3); // 1P
- m_led[1] = BIT(data, 4); // 2P
- m_led[2] = BIT(data, 5); // FIRE
+ m_leds[0] = BIT(data, 3); // 1P
+ m_leds[1] = BIT(data, 4); // 2P
+ m_leds[2] = BIT(data, 5); // FIRE
}
WRITE8_MEMBER( draco_state::out1_w )
@@ -370,7 +370,7 @@ void cidelsa_state::device_timer(emu_timer &timer, device_timer_id id, int param
void cidelsa_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
/* register for state saving */
save_item(NAME(m_reset));
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index da78a439e7c..c85489ca884 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -544,15 +544,15 @@ WRITE16_MEMBER(cischeat_state::scudhamm_leds_w)
{
if (ACCESSING_BITS_8_15)
{
- m_led[0] = BIT(data, 8); // 3 buttons
- m_led[1] = BIT(data, 9);
- m_led[2] = BIT(data, 10);
+ m_leds[0] = BIT(data, 8); // 3 buttons
+ m_leds[1] = BIT(data, 9);
+ m_leds[2] = BIT(data, 10);
}
if (ACCESSING_BITS_0_7)
{
- m_led[3] = BIT(data, 4);
- m_led[4] = BIT(data, 5);
+ m_leds[3] = BIT(data, 4);
+ m_leds[4] = BIT(data, 5);
}
}
@@ -647,10 +647,10 @@ WRITE16_MEMBER(cischeat_state::armchmp2_leds_w)
{
if (ACCESSING_BITS_8_15)
{
- m_led[0] = BIT(data, 8);
- m_led[1] = BIT(data, 12);
- m_led[2] = BIT(data, 13);
- m_led[3] = BIT(data, 14);
+ m_leds[0] = BIT(data, 8);
+ m_leds[1] = BIT(data, 12);
+ m_leds[2] = BIT(data, 13);
+ m_leds[3] = BIT(data, 14);
}
if (ACCESSING_BITS_0_7)
@@ -694,9 +694,9 @@ WRITE16_MEMBER(cischeat_state::captflag_leds_w)
if (ACCESSING_BITS_8_15)
{
machine().bookkeeping().coin_counter_w(1, data & 0x0100); // coin 2
- m_led[0] = BIT(data, 8); // decide
+ m_leds[0] = BIT(data, 8); // decide
machine().bookkeeping().coin_counter_w(0, data & 0x0400); // coin 1
- m_led[1] = BIT(data, 13); // select
+ m_leds[1] = BIT(data, 13); // select
int power = (data & 0x1000);
m_captflag_hopper->motor_w(power ? 1 : 0); // prize motor
diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp
index 5cce920e7d4..9178b9458b9 100644
--- a/src/mame/drivers/copsnrob.cpp
+++ b/src/mame/drivers/copsnrob.cpp
@@ -79,7 +79,7 @@ WRITE8_MEMBER(copsnrob_state::copsnrob_misc2_w)
{
m_misc = data & 0x7f;
/* Multi Player Start */
- m_led[1] = BIT(~data, 6);
+ m_leds[1] = BIT(~data, 6);
}
@@ -238,7 +238,7 @@ void copsnrob_state::machine_start()
{
save_item(NAME(m_ic_h3_data));
save_item(NAME(m_misc));
- m_led.resolve();
+ m_leds.resolve();
}
void copsnrob_state::machine_reset()
diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp
index 6df11b1e089..36d09ee8c68 100644
--- a/src/mame/drivers/dacholer.cpp
+++ b/src/mame/drivers/dacholer.cpp
@@ -55,7 +55,7 @@ public:
, m_bgvideoram(*this, "bgvideoram")
, m_fgvideoram(*this, "fgvideoram")
, m_spriteram(*this, "spriteram")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(bg_scroll_x_w);
@@ -106,7 +106,7 @@ private:
required_shared_ptr<uint8_t> m_fgvideoram;
required_shared_ptr<uint8_t> m_spriteram;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
/* video-related */
tilemap_t *m_bg_tilemap;
@@ -231,8 +231,8 @@ WRITE8_MEMBER(dacholer_state::coins_w)
machine().bookkeeping().coin_counter_w(0, data & 1);
machine().bookkeeping().coin_counter_w(1, data & 2);
- m_led[0] = BIT(data, 2);
- m_led[1] = BIT(data, 3);
+ m_leds[0] = BIT(data, 2);
+ m_leds[1] = BIT(data, 3);
}
WRITE8_MEMBER(dacholer_state::main_irq_ack_w)
@@ -604,7 +604,7 @@ WRITE_LINE_MEMBER(dacholer_state::adpcm_int)
void dacholer_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_bg_bank));
save_item(NAME(m_msm_data));
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index a3022d7498d..4246ae6a661 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -172,7 +172,7 @@ public:
, m_protection1(*this, "protection1")
, m_protection2(*this, "protection2")
, m_soundlatch(*this, "soundlatch")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
void set_blitter_irq(write_line_delegate &&handler) { m_blitter_irq_handler = std::move(handler); }
@@ -481,7 +481,7 @@ protected:
optional_shared_ptr<uint16_t> m_protection1;
optional_shared_ptr<uint16_t> m_protection2;
optional_device<generic_latch_8_device> m_soundlatch;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
std::unique_ptr<uint8_t[]> m_ddenlovr_pixmap[8];
/* blitter (TODO: merge with the dynax.h, where possible) */
@@ -2389,7 +2389,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::mmpanic_blitter_irq)
void ddenlovr_state::mmpanic_update_leds()
{
- m_led[0] = m_mmpanic_leds;
+ m_leds[0] = m_mmpanic_leds;
}
/* leds 1-8 */
@@ -2412,7 +2412,7 @@ WRITE8_MEMBER(ddenlovr_state::mmpanic_lockout_w)
{
machine().bookkeeping().coin_counter_w(0, (~data) & 0x01);
machine().bookkeeping().coin_lockout_w(0, (~data) & 0x02);
- m_led[1] = BIT(~data, 2);
+ m_leds[1] = BIT(~data, 2);
}
}
@@ -3899,7 +3899,7 @@ WRITE8_MEMBER(ddenlovr_state::mjgnight_coincounter_w)
{
m_prot_val = data;
- m_led[0] = BIT(data, 0); // led? 1 in-game, 0 in service mode / while booting
+ m_leds[0] = BIT(data, 0); // led? 1 in-game, 0 in service mode / while booting
machine().bookkeeping().coin_counter_w(0, data & 0x04); // coin-out
machine().bookkeeping().coin_counter_w(1, data & 0x08); // coin-in
@@ -9576,7 +9576,7 @@ INPUT_PORTS_END
MACHINE_START_MEMBER(ddenlovr_state,ddenlovr)
{
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_input_sel));
save_item(NAME(m_dsw_sel));
diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp
index 7ffc70abe05..0a12b56f27e 100644
--- a/src/mame/drivers/djmain.cpp
+++ b/src/mame/drivers/djmain.cpp
@@ -301,9 +301,9 @@ WRITE32_MEMBER(djmain_state::light_ctrl_2_w)
{
output().set_value("left-ssr", !!(data & 0x08000000)); // SSR
output().set_value("right-ssr", !!(data & 0x08000000)); // SSR
- m_led[0] = BIT(data, 16); // 1P START
- m_led[1] = BIT(data, 17); // 2P START
- m_led[2] = BIT(data, 18); // EFFECT
+ m_leds[0] = BIT(data, 16); // 1P START
+ m_leds[1] = BIT(data, 17); // 2P START
+ m_leds[2] = BIT(data, 18); // EFFECT
}
}
@@ -1351,7 +1351,7 @@ void djmain_state::machine_start()
if (m_ata_user_password != nullptr)
hdd->set_user_password(m_ata_user_password);
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_sndram_bank));
save_item(NAME(m_pending_vb_int));
@@ -1366,9 +1366,9 @@ void djmain_state::machine_reset()
m_sndram_bank = 0;
/* reset LEDs */
- m_led[0] = 1;
- m_led[1] = 1;
- m_led[2] = 1;
+ m_leds[0] = 1;
+ m_leds[1] = 1;
+ m_leds[2] = 1;
}
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index 52d8de6a3a2..2a095f2a0f5 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -69,7 +69,7 @@ public:
, m_slot6(*this, "slot6")
, m_slot7(*this, "slot7")
, m_slot7a(*this, "slot7a")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 1U)
{ }
void update_halt_line();
@@ -176,7 +176,7 @@ private:
required_device<dmvcart_slot_device> m_slot6;
required_device<dmvcart_slot_device> m_slot7;
required_device<dmvcart_slot_device> m_slot7a;
- output_finder<9> m_led;
+ output_finder<8> m_leds;
bool m_ramoutdis;
int m_switch16;
@@ -220,7 +220,7 @@ WRITE8_MEMBER(dmv_state::leds_w)
*/
for(int i=0; i<8; i++)
- m_led[8-i] = BIT(data, i);
+ m_leds[7-i] = BIT(data, i);
}
READ8_MEMBER(dmv_state::ramsel_r)
@@ -624,7 +624,7 @@ INPUT_PORTS_END
void dmv_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
}
void dmv_state::machine_reset()
diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp
index af39813a814..73945aaf09f 100644
--- a/src/mame/drivers/eti660.cpp
+++ b/src/mame/drivers/eti660.cpp
@@ -178,7 +178,7 @@ WRITE_LINE_MEMBER( eti660_state::q_w )
m_cti->aoe_w(state);
/* PULSE led */
- m_led[LED_PULSE] = state ? 1 : 0;
+ m_leds[LED_PULSE] = state ? 1 : 0;
/* tape output */
m_cassette->output(state ? 1.0 : -1.0);
@@ -263,7 +263,7 @@ void eti660_state::machine_reset()
void eti660_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_color_ram));
}
diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp
index 8ee6b93d0bb..7fd738761c4 100644
--- a/src/mame/drivers/fastfred.cpp
+++ b/src/mame/drivers/fastfred.cpp
@@ -24,6 +24,7 @@
void fastfred_state::machine_start()
{
+ galaxold_state::machine_start();
save_item(NAME(m_charbank));
save_item(NAME(m_colorbank));
save_item(NAME(m_nmi_mask));
diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp
index 91607d1c7fb..ca36c99ed87 100644
--- a/src/mame/drivers/firetrk.cpp
+++ b/src/mame/drivers/firetrk.cpp
@@ -69,16 +69,16 @@ TIMER_DEVICE_CALLBACK_MEMBER(firetrk_state::firetrk_scanline)
WRITE8_MEMBER(firetrk_state::firetrk_output_w)
{
/* BIT0 => START1 LAMP */
- m_led[0] = BIT(~data, 0);
+ m_leds[0] = BIT(~data, 0);
/* BIT1 => START2 LAMP */
- m_led[1]= BIT(~data, 1);
+ m_leds[1]= BIT(~data, 1);
/* BIT2 => FLASH */
m_flash = data & 0x04;
/* BIT3 => TRACK LAMP */
- m_led[3] = BIT(~data, 3);
+ m_leds[3] = BIT(~data, 3);
/* BIT4 => ATTRACT */
m_discrete->write(space, FIRETRUCK_ATTRACT_EN, data & 0x10);
@@ -86,7 +86,7 @@ WRITE8_MEMBER(firetrk_state::firetrk_output_w)
machine().bookkeeping().coin_lockout_w(1, !(data & 0x10));
/* BIT5 => START3 LAMP */
- m_led[2] = BIT(~data, 5);
+ m_leds[2] = BIT(~data, 5);
/* BIT6 => UNUSED */
@@ -98,7 +98,7 @@ WRITE8_MEMBER(firetrk_state::firetrk_output_w)
WRITE8_MEMBER(firetrk_state::superbug_output_w)
{
/* BIT0 => START LAMP */
- m_led[0] = BIT(offset, 0);
+ m_leds[0] = BIT(offset, 0);
/* BIT1 => ATTRACT */
m_discrete->write(space, SUPERBUG_ATTRACT_EN, offset & 0x02);
@@ -109,17 +109,17 @@ WRITE8_MEMBER(firetrk_state::superbug_output_w)
m_flash = offset & 0x04;
/* BIT3 => TRACK LAMP */
- m_led[1] = BIT(offset, 3);
+ m_leds[1] = BIT(offset, 3);
}
WRITE8_MEMBER(firetrk_state::montecar_output_1_w)
{
/* BIT0 => START LAMP */
- m_led[0] = BIT(~data, 0);
+ m_leds[0] = BIT(~data, 0);
/* BIT1 => TRACK LAMP */
- m_led[1] = BIT(~data, 1);
+ m_leds[1] = BIT(~data, 1);
/* BIT2 => ATTRACT */
m_discrete->write(space, MONTECAR_ATTRACT_INV, data & 0x04);
diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp
index 635f3c90fa9..41435bd8ec4 100644
--- a/src/mame/drivers/foodf.cpp
+++ b/src/mame/drivers/foodf.cpp
@@ -142,7 +142,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(foodf_state::scanline_update_timer)
void foodf_state::machine_start()
{
atarigen_state::machine_start();
- m_led.resolve();
+ m_leds.resolve();
}
@@ -171,8 +171,8 @@ WRITE8_MEMBER(foodf_state::digital_w)
if (!(data & 0x08))
video_int_ack_w(space,0,0);
- m_led[0] = BIT(data, 4);
- m_led[1] = BIT(data, 5);
+ m_leds[0] = BIT(data, 4);
+ m_leds[1] = BIT(data, 5);
machine().bookkeeping().coin_counter_w(0, (data >> 6) & 1);
machine().bookkeeping().coin_counter_w(1, (data >> 7) & 1);
diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp
index 48427f7ca3b..5bec2d2580b 100644
--- a/src/mame/drivers/funworld.cpp
+++ b/src/mame/drivers/funworld.cpp
@@ -1023,17 +1023,17 @@ WRITE8_MEMBER(funworld_state::funworld_lamp_a_w)
-x-- ---- Hopper Motor (inverted).
x--- ---- HOLD4 lamp.
*/
- m_lamp[0] = BIT(~data, 1); /* Hold1 (inverted) */
- m_lamp[2] = BIT(~data, 1); /* Hold3 (inverted, see pinouts) */
+ m_lamps[0] = BIT(~data, 1); /* Hold1 (inverted) */
+ m_lamps[2] = BIT(~data, 1); /* Hold3 (inverted, see pinouts) */
- m_lamp[1] = BIT(~data, 3); /* Hold2 / Low (inverted) */
- m_lamp[3] = BIT(data, 7); /* Hold4 / High */
- m_lamp[5] = BIT(~data, 5); /* Cancel / Collect (inverted) */
+ m_lamps[1] = BIT(~data, 3); /* Hold2 / Low (inverted) */
+ m_lamps[3] = BIT(data, 7); /* Hold4 / High */
+ m_lamps[5] = BIT(~data, 5); /* Cancel / Collect (inverted) */
machine().bookkeeping().coin_counter_w(0, data & 0x01); /* Credit In counter */
machine().bookkeeping().coin_counter_w(7, data & 0x04); /* Credit Out counter, mapped as coin 8 */
- m_lamp[7] = BIT(~data, 6); /* Hopper Motor (inverted) */
+ m_lamps[7] = BIT(~data, 6); /* Hopper Motor (inverted) */
// popmessage("Lamps A: %02X", (data ^ 0xff));
}
@@ -1047,8 +1047,8 @@ WRITE8_MEMBER(funworld_state::funworld_lamp_b_w)
---- -x-- Unknown (inverted).
xxxx x--- Unknown.
*/
- m_lamp[4] = BIT(data, 0); /* Hold5 / Bet */
- m_lamp[6] = BIT(data, 1); /* Start / Deal / Draw */
+ m_lamps[4] = BIT(data, 0); /* Hold5 / Bet */
+ m_lamps[6] = BIT(data, 1); /* Start / Deal / Draw */
// popmessage("Lamps B: %02X", data);
}
diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp
index cb850d3d2e4..12b43c78e75 100644
--- a/src/mame/drivers/galaga.cpp
+++ b/src/mame/drivers/galaga.cpp
@@ -762,8 +762,8 @@ CUSTOM_INPUT_MEMBER(digdug_state::shifted_port_r){ return ioport((const char *)p
WRITE8_MEMBER(galaga_state::out_0)
{
- m_led[1] = BIT(data, 0);
- m_led[0] = BIT(data, 1);
+ m_leds[1] = BIT(data, 0);
+ m_leds[0] = BIT(data, 1);
machine().bookkeeping().coin_counter_w(1,~data & 4);
machine().bookkeeping().coin_counter_w(0,~data & 8);
}
@@ -812,7 +812,7 @@ TIMER_CALLBACK_MEMBER(galaga_state::cpu3_interrupt_callback)
void galaga_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
/* create the interrupt timer */
m_cpu3_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(galaga_state::cpu3_interrupt_callback),this));
save_item(NAME(m_main_irq_mask));
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index d019dc3e259..a129a2ec115 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -720,7 +720,7 @@ WRITE8_MEMBER(galaxian_state::start_lamp_w)
{
/* offset 0 = 1P START LAMP */
/* offset 1 = 2P START LAMP */
- m_lamp[offset] = BIT(data, 0);
+ m_lamps[offset] = BIT(data, 0);
}
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp
index e8d3f133c61..028b8002048 100644
--- a/src/mame/drivers/gaplus.cpp
+++ b/src/mame/drivers/gaplus.cpp
@@ -486,8 +486,8 @@ static const char *const gaplus_sample_names[] =
WRITE8_MEMBER(gaplus_state::out_lamps0)
{
- m_lamp[0] = BIT(data, 0);
- m_lamp[1] = BIT(data, 1);
+ m_lamps[0] = BIT(data, 0);
+ m_lamps[1] = BIT(data, 1);
machine().bookkeeping().coin_lockout_global_w(data & 4);
machine().bookkeeping().coin_counter_w(0, ~data & 8);
}
@@ -499,7 +499,7 @@ WRITE8_MEMBER(gaplus_state::out_lamps1)
void gaplus_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
m_namcoio0_run_timer = timer_alloc(TIMER_NAMCOIO0_RUN);
m_namcoio1_run_timer = timer_alloc(TIMER_NAMCOIO1_RUN);
diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp
index 017101791d4..acd73ee15a6 100644
--- a/src/mame/drivers/gei.cpp
+++ b/src/mame/drivers/gei.cpp
@@ -93,7 +93,7 @@ public:
, m_screen(*this, "screen")
, m_signature(*this, "signature")
, m_rombank(*this, "rombank")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -140,7 +140,7 @@ public:
void sprtauth_map(address_map &map);
void suprpokr_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
private:
@@ -160,7 +160,7 @@ private:
required_device<screen_device> m_screen;
optional_region_ptr<uint8_t> m_signature;
optional_memory_bank m_rombank;
- output_finder<13> m_lamp;
+ output_finder<13> m_lamps;
};
@@ -215,24 +215,24 @@ uint32_t gei_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c
WRITE8_MEMBER(gei_state::lamps_w)
{
/* 5 button lamps */
- m_lamp[0] = BIT(data, 0);
- m_lamp[1] = BIT(data, 1);
- m_lamp[2] = BIT(data, 2);
- m_lamp[3] = BIT(data, 3);
- m_lamp[4] = BIT(data, 4);
+ m_lamps[0] = BIT(data, 0);
+ m_lamps[1] = BIT(data, 1);
+ m_lamps[2] = BIT(data, 2);
+ m_lamps[3] = BIT(data, 3);
+ m_lamps[4] = BIT(data, 4);
/* 3 button lamps for deal, cancel, stand in poker games;
lamp order verified in poker and selection self tests */
- m_lamp[7] = BIT(data, 5);
- m_lamp[5] = BIT(data, 6);
- m_lamp[6] = BIT(data, 7);
+ m_lamps[7] = BIT(data, 5);
+ m_lamps[5] = BIT(data, 6);
+ m_lamps[6] = BIT(data, 7);
}
WRITE8_MEMBER(gei_state::sound_w)
{
/* bit 3 - coin lockout, lamp10 in poker / lamp6 in trivia test modes */
machine().bookkeeping().coin_lockout_global_w(BIT(~data, 3));
- m_lamp[9] = BIT(data, 3);
+ m_lamps[9] = BIT(data, 3);
/* bit 5 - ticket out in trivia games */
if (m_ticket.found())
@@ -250,13 +250,13 @@ WRITE8_MEMBER(gei_state::sound2_w)
/* bit 3,6 - coin lockout, lamp 10 + 11 in selection test mode */
machine().bookkeeping().coin_lockout_w(0, BIT(~data, 3));
machine().bookkeeping().coin_lockout_w(1, BIT(~data, 6));
- m_lamp[9] = BIT(data, 3);
- m_lamp[10] = BIT(data, 6);
+ m_lamps[9] = BIT(data, 3);
+ m_lamps[10] = BIT(data, 6);
/* bit 4,5 - lamps 12, 13 in selection test mode;
12 lights up if dsw maximum bet = 30 an bet > 15 or if dsw maximum bet = 10 an bet = 10 */
- m_lamp[11] = BIT(data, 4);
- m_lamp[12] = BIT(data, 5);
+ m_lamps[11] = BIT(data, 4);
+ m_lamps[12] = BIT(data, 5);
/* bit 7 goes directly to the sound amplifier */
m_dac->write(BIT(data, 7));
@@ -265,13 +265,13 @@ WRITE8_MEMBER(gei_state::sound2_w)
WRITE8_MEMBER(gei_state::lamps2_w)
{
/* bit 4 - play/raise button lamp, lamp 9 in poker test mode */
- m_lamp[8] = BIT(data, 4);
+ m_lamps[8] = BIT(data, 4);
}
WRITE8_MEMBER(gei_state::nmi_w)
{
/* bit 4 - play/raise button lamp, lamp 9 in selection test mode */
- m_lamp[8] = BIT(data, 4);
+ m_lamps[8] = BIT(data, 4);
/* bit 6 enables NMI */
m_nmi_mask = data & 0x40;
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index 47669df6513..dadac86919c 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -1305,7 +1305,7 @@ public:
m_ay8910(*this, "ay8910"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(goldnpkr_videoram_w);
@@ -1382,7 +1382,7 @@ public:
void witchcrd_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
@@ -1392,7 +1392,7 @@ protected:
optional_device<ay8910_device> m_ay8910;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- output_finder<5> m_lamp;
+ output_finder<5> m_lamps;
tilemap_t *m_bg_tilemap;
uint8_t m_mux_data;
@@ -1774,11 +1774,11 @@ WRITE8_MEMBER(goldnpkr_state::lamps_a_w)
*/
data = data ^ 0xff;
- m_lamp[0] = BIT(data, 0); /* Lamp 0 */
- m_lamp[1] = BIT(data, 1); /* Lamp 1 */
- m_lamp[2] = BIT(data, 2); /* Lamp 2 */
- m_lamp[3] = BIT(data, 3); /* Lamp 3 */
- m_lamp[4] = BIT(data, 4); /* Lamp 4 */
+ m_lamps[0] = BIT(data, 0); /* Lamp 0 */
+ m_lamps[1] = BIT(data, 1); /* Lamp 1 */
+ m_lamps[2] = BIT(data, 2); /* Lamp 2 */
+ m_lamps[3] = BIT(data, 3); /* Lamp 3 */
+ m_lamps[4] = BIT(data, 4); /* Lamp 4 */
machine().bookkeeping().coin_counter_w(0, data & 0x40); /* counter1 */
machine().bookkeeping().coin_counter_w(1, data & 0x80); /* counter2 */
@@ -4285,7 +4285,7 @@ DISCRETE_SOUND_END
MACHINE_START_MEMBER(goldnpkr_state, mondial)
{
- m_lamp.resolve();
+ m_lamps.resolve();
uint8_t *ROM = memregion("maincpu")->base();
membank("bank1")->configure_entries(0, 2, &ROM[0], 0x4000);
diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index 00604a845d5..ae9793cc5c5 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -303,28 +303,28 @@ WRITE8_MEMBER(goldstar_state::p1_lamps_w)
skill98 is like schery97 but doesn't activate bit 0 for stop
nfb96, roypok96 and nc96 sets are like schery97 but they don't activate bit 2 for select
*/
- m_lamp[0] = BIT(data, 0);
- m_lamp[1] = BIT(data, 1);
- m_lamp[2] = BIT(data, 2);
- m_lamp[3] = BIT(data, 3);
- m_lamp[4] = BIT(data, 4);
- m_lamp[5] = BIT(data, 5);
- m_lamp[6] = BIT(data, 6);
- m_lamp[7] = BIT(data, 7);
+ m_lamps[0] = BIT(data, 0);
+ m_lamps[1] = BIT(data, 1);
+ m_lamps[2] = BIT(data, 2);
+ m_lamps[3] = BIT(data, 3);
+ m_lamps[4] = BIT(data, 4);
+ m_lamps[5] = BIT(data, 5);
+ m_lamps[6] = BIT(data, 6);
+ m_lamps[7] = BIT(data, 7);
// popmessage("p1 lamps: %02X", data);
}
WRITE8_MEMBER(goldstar_state::p2_lamps_w)
{
- m_lamp[8 + 0] = BIT(data, 0);
- m_lamp[8 + 1] = BIT(data, 1);
- m_lamp[8 + 2] = BIT(data, 2);
- m_lamp[8 + 3] = BIT(data, 3);
- m_lamp[8 + 4] = BIT(data, 4);
- m_lamp[8 + 5] = BIT(data, 5);
- m_lamp[8 + 6] = BIT(data, 6);
- m_lamp[8 + 7] = BIT(data, 7);
+ m_lamps[8 + 0] = BIT(data, 0);
+ m_lamps[8 + 1] = BIT(data, 1);
+ m_lamps[8 + 2] = BIT(data, 2);
+ m_lamps[8 + 3] = BIT(data, 3);
+ m_lamps[8 + 4] = BIT(data, 4);
+ m_lamps[8 + 5] = BIT(data, 5);
+ m_lamps[8 + 6] = BIT(data, 6);
+ m_lamps[8 + 7] = BIT(data, 7);
// popmessage("p2 lamps: %02X", data);
}
@@ -1203,12 +1203,12 @@ WRITE8_MEMBER(unkch_state::unkcm_0x02_w)
if (!m_vblank_irq_enable)
m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
- m_lamp[0] = BIT(data, 0); /* Bet-A / Stop 2 */
- m_lamp[1] = BIT(data, 1); /* Start / Stop All */
- m_lamp[2] = BIT(data, 2); /* Info / Small / Stop 3 */
- m_lamp[3] = BIT(data, 3); /* Big */
- m_lamp[4] = BIT(data, 4); /* Bet-B / D-Up */
- m_lamp[5] = BIT(data, 5); /* Take / Stop 1 */
+ m_lamps[0] = BIT(data, 0); /* Bet-A / Stop 2 */
+ m_lamps[1] = BIT(data, 1); /* Start / Stop All */
+ m_lamps[2] = BIT(data, 2); /* Info / Small / Stop 3 */
+ m_lamps[3] = BIT(data, 3); /* Big */
+ m_lamps[4] = BIT(data, 4); /* Bet-B / D-Up */
+ m_lamps[5] = BIT(data, 5); /* Take / Stop 1 */
}
WRITE8_MEMBER(unkch_state::unkcm_0x03_w)
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index 5cd9c92b59b..5ed47353714 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -223,7 +223,7 @@ VBlank duration: 1/VSYNC * (16/256) = 1017.6 us
void gottlieb_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
/* register for save states */
save_item(NAME(m_joystick_select));
save_item(NAME(m_track));
@@ -328,9 +328,9 @@ WRITE8_MEMBER(gottlieb_state::reactor_output_w)
{
general_output_w(space, offset, data & ~0xe0);
- m_led[0] = BIT(data, 5);
- m_led[1] = BIT(data, 6);
- m_led[2] = BIT(data, 7);
+ m_leds[0] = BIT(data, 5);
+ m_leds[1] = BIT(data, 6);
+ m_leds[2] = BIT(data, 7);
}
WRITE8_MEMBER(gottlieb_state::qbert_output_w)
diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp
index ae79c30e21b..6b2cec25b48 100644
--- a/src/mame/drivers/igs009.cpp
+++ b/src/mame/drivers/igs009.cpp
@@ -55,7 +55,7 @@ public:
, m_bg_scroll2(*this, "bg_scroll2")
, m_fg_tile_ram(*this, "fg_tile_ram")
, m_fg_color_ram(*this, "fg_color_ram")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(reel1_ram_w);
@@ -116,7 +116,7 @@ protected:
required_shared_ptr<uint8_t> m_bg_scroll2;
required_shared_ptr<uint8_t> m_fg_tile_ram;
required_shared_ptr<uint8_t> m_fg_color_ram;
- output_finder<7> m_led;
+ output_finder<7> m_leds;
tilemap_t *m_reel1_tilemap;
tilemap_t *m_reel2_tilemap;
@@ -408,7 +408,7 @@ WRITE8_MEMBER(igs009_state::nmi_and_coins_w)
machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in
machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin out mech
- m_led[6] = BIT(data, 6); // led for coin out / m_hopper active
+ m_leds[6] = BIT(data, 6); // led for coin out / m_hopper active
m_nmi_enable = data; // data & 0x80 // nmi enable?
@@ -418,8 +418,8 @@ WRITE8_MEMBER(igs009_state::nmi_and_coins_w)
WRITE8_MEMBER(igs009_state::video_and_leds_w)
{
- m_led[4] = BIT(data, 0); // start?
- m_led[5] = BIT(data, 2); // l_bet?
+ m_leds[4] = BIT(data, 0); // start?
+ m_leds[5] = BIT(data, 2); // l_bet?
m_video_enable = data & 0x40;
m_hopper = (~data)& 0x80;
@@ -430,10 +430,10 @@ WRITE8_MEMBER(igs009_state::video_and_leds_w)
WRITE8_MEMBER(igs009_state::leds_w)
{
- m_led[0] = BIT(data, 0); // stop_1
- m_led[1] = BIT(data, 1); // stop_2
- m_led[2] = BIT(data, 2); // stop_3
- m_led[3] = BIT(data, 3); // stop
+ m_leds[0] = BIT(data, 0); // stop_1
+ m_leds[1] = BIT(data, 1); // stop_2
+ m_leds[2] = BIT(data, 2); // stop_3
+ m_leds[3] = BIT(data, 3); // stop
// data & 0x10?
m_out[2] = data;
@@ -801,7 +801,7 @@ GFXDECODE_END
void igs009_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_video_enable));
diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp
index d78f2520ecd..b2a21eb3bd2 100644
--- a/src/mame/drivers/igspoker.cpp
+++ b/src/mame/drivers/igspoker.cpp
@@ -92,7 +92,7 @@ public:
, m_screen(*this, "screen")
, m_palette(*this, "palette")
, m_led(*this, "led0")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 1U)
{ }
DECLARE_READ8_MEMBER(igs_irqack_r);
@@ -137,7 +137,7 @@ public:
void number10_io_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); m_lamp.resolve(); }
+ virtual void machine_start() override { m_led.resolve(); m_lamps.resolve(); }
virtual void machine_reset() override;
virtual void video_start() override;
@@ -149,7 +149,7 @@ protected:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
output_finder<> m_led;
- output_finder<7> m_lamp;
+ output_finder<6> m_lamps;
int m_nmi_enable;
int m_bg_enable;
int m_hopper;
@@ -311,12 +311,12 @@ WRITE8_MEMBER(igspoker_state::igs_lamps_w)
---x ---- Hold5 lamp.
xx-- ---- one pulse once bet amount allows start.
*/
- m_lamp[1] = BIT(data, 1); /* Lamp 1 - HOLD 1 */
- m_lamp[2] = BIT(data, 5); /* Lamp 2 - HOLD 2 */
- m_lamp[3] = BIT(data, 4); /* Lamp 3 - HOLD 3 */
- m_lamp[4] = BIT(data, 3); /* Lamp 4 - HOLD 4 */
- m_lamp[5] = BIT(data, 2); /* Lamp 5 - HOLD 5 */
- m_lamp[6] = BIT(data, 0); /* Lamp 6 - START */
+ m_lamps[0] = BIT(data, 1); /* Lamp 1 - HOLD 1 */
+ m_lamps[1] = BIT(data, 5); /* Lamp 2 - HOLD 2 */
+ m_lamps[2] = BIT(data, 4); /* Lamp 3 - HOLD 3 */
+ m_lamps[3] = BIT(data, 3); /* Lamp 4 - HOLD 4 */
+ m_lamps[4] = BIT(data, 2); /* Lamp 5 - HOLD 5 */
+ m_lamps[5] = BIT(data, 0); /* Lamp 6 - START */
m_hopper = (~data)& 0x80;
diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp
index c84c0dafbe6..44bb0a56951 100644
--- a/src/mame/drivers/isbc.cpp
+++ b/src/mame/drivers/isbc.cpp
@@ -48,7 +48,7 @@ public:
, m_statuslatch(*this, "statuslatch")
, m_bios(*this, "user1")
, m_biosram(*this, "biosram")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE_LINE_MEMBER(write_centronics_ack);
@@ -87,7 +87,7 @@ public:
void rpc86_io(address_map &map);
void rpc86_mem(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
@@ -101,7 +101,7 @@ protected:
optional_device<ls259_device> m_statuslatch;
optional_memory_region m_bios;
optional_shared_ptr<u16> m_biosram;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
private:
bool m_upperen;
@@ -340,12 +340,12 @@ WRITE_LINE_MEMBER(isbc_state::bus_intr_out2_w)
WRITE_LINE_MEMBER(isbc_state::led_ds1_w)
{
- m_led[0] = state ? 0 : 1;
+ m_leds[0] = state ? 0 : 1;
}
WRITE_LINE_MEMBER(isbc_state::led_ds3_w)
{
- m_led[1] = state ? 0 : 1;
+ m_leds[1] = state ? 0 : 1;
}
WRITE_LINE_MEMBER(isbc_state::megabyte_select_w)
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index 529797d2f6f..29e3981efca 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -448,7 +448,7 @@ WRITE16_MEMBER(itech32_state::int1_ack_w)
void itech32_state::machine_start()
{
membank("soundbank")->configure_entries(0, 256, memregion("soundcpu")->base() + 0x10000, 0x4000);
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_vint_state));
save_item(NAME(m_xint_state));
@@ -742,9 +742,9 @@ WRITE8_MEMBER(itech32_state::drivedge_portb_out)
/* bit 4 controls the ticket dispenser */
/* bit 5 controls the coin counter */
/* bit 6 controls the diagnostic sound LED */
- m_led[1] = BIT(data, 0);
- m_led[2] = BIT(data, 1);
- m_led[3] = BIT(data, 2);
+ m_leds[1] = BIT(data, 0);
+ m_leds[2] = BIT(data, 1);
+ m_leds[3] = BIT(data, 2);
m_ticket->motor_w(BIT(data, 4));
machine().bookkeeping().coin_counter_w(0, BIT(data, 5));
}
@@ -752,7 +752,7 @@ WRITE8_MEMBER(itech32_state::drivedge_portb_out)
WRITE_LINE_MEMBER(itech32_state::drivedge_turbo_light)
{
- m_led[0] = state ? 1 : 0;
+ m_leds[0] = state ? 1 : 0;
}
diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp
index 7d4cf919578..f8d4e869d3c 100644
--- a/src/mame/drivers/jackie.cpp
+++ b/src/mame/drivers/jackie.cpp
@@ -71,7 +71,7 @@ public:
, m_fg_tile_ram(*this, "fg_tile_ram")
, m_fg_color_ram(*this, "fg_color_ram")
, m_led(*this, "led")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 1U)
{ }
DECLARE_WRITE8_MEMBER(fg_tile_w);
@@ -129,7 +129,7 @@ protected:
required_shared_ptr<uint8_t> m_fg_tile_ram;
required_shared_ptr<uint8_t> m_fg_color_ram;
output_finder<> m_led;
- output_finder<7> m_lamp;
+ output_finder<6> m_lamps;
int m_exp_bank;
tilemap_t *m_fg_tilemap;
@@ -279,7 +279,7 @@ uint32_t jackie_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
void jackie_state::machine_start()
{
m_led.resolve();
- m_lamp.resolve();
+ m_lamps.resolve();
save_item(NAME(m_exp_bank));
// save_item(NAME(m_irq_enable)); //always 1?
@@ -362,12 +362,12 @@ WRITE8_MEMBER(jackie_state::lamps_w)
---- -x-- Hold5 lamp.
---- ---x Start lamp.
*/
- m_lamp[1] = BIT(data, 1); /* Lamp 1 - HOLD 1 */
- m_lamp[2] = BIT(data, 5); /* Lamp 2 - HOLD 2 */
- m_lamp[3] = BIT(data, 4); /* Lamp 3 - HOLD 3 */
- m_lamp[4] = BIT(data, 3); /* Lamp 4 - HOLD 4 */
- m_lamp[5] = BIT(data, 2); /* Lamp 5 - HOLD 5 */
- m_lamp[6] = BIT(data, 0); /* Lamp 6 - START */
+ m_lamps[0] = BIT(data, 1); /* Lamp 1 - HOLD 1 */
+ m_lamps[1] = BIT(data, 5); /* Lamp 2 - HOLD 2 */
+ m_lamps[2] = BIT(data, 4); /* Lamp 3 - HOLD 3 */
+ m_lamps[3] = BIT(data, 3); /* Lamp 4 - HOLD 4 */
+ m_lamps[4] = BIT(data, 2); /* Lamp 5 - HOLD 5 */
+ m_lamps[5] = BIT(data, 0); /* Lamp 6 - START */
m_hopper = (~data)& 0x80;
diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp
index b5e5e815892..5fcd9252a77 100644
--- a/src/mame/drivers/jubilee.cpp
+++ b/src/mame/drivers/jubilee.cpp
@@ -213,7 +213,7 @@ public:
m_colorram(*this, "colorram"),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(jubileep_videoram_w);
@@ -228,7 +228,7 @@ public:
void jubileep_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
uint8_t mux_sel;
@@ -239,7 +239,7 @@ protected:
tilemap_t *m_bg_tilemap;
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
- output_finder<9> m_lamp;
+ output_finder<9> m_lamps;
};
@@ -418,19 +418,19 @@ WRITE8_MEMBER(jubilee_state::unk_w)
{
if (muxlamps == 1)
{
- m_lamp[0] = BIT(data, 0); /* lamp */
+ m_lamps[0] = BIT(data, 0); /* lamp */
logerror("CRU: LAAAAAAMP 0 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 0");
}
if (muxlamps == 2)
{
- m_lamp[3] = BIT(data, 0); /* lamp */
+ m_lamps[3] = BIT(data, 0); /* lamp */
logerror("CRU: LAAAAAAMP 3 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 3");
}
if (muxlamps == 3)
{
- m_lamp[6] = BIT(data, 0); /* lamp */
+ m_lamps[6] = BIT(data, 0); /* lamp */
logerror("CRU: LAAAAAAMP 6 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 6");
}
@@ -440,19 +440,19 @@ WRITE8_MEMBER(jubilee_state::unk_w)
{
if (muxlamps == 1)
{
- m_lamp[1] = BIT(data, 0); /* lamp */
+ m_lamps[1] = BIT(data, 0); /* lamp */
logerror("CRU: LAAAAAAMP 1 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 1");
}
if (muxlamps == 2)
{
- m_lamp[4] = BIT(data, 0); /* lamp */
+ m_lamps[4] = BIT(data, 0); /* lamp */
logerror("CRU: LAAAAAAMP 4 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 4");
}
if (muxlamps == 3)
{
- m_lamp[7] = BIT(data, 0); /* lamp */
+ m_lamps[7] = BIT(data, 0); /* lamp */
logerror("CRU: LAAAAAAMP 7 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 7");
}
@@ -462,19 +462,19 @@ WRITE8_MEMBER(jubilee_state::unk_w)
{
if (muxlamps == 1)
{
- m_lamp[2] = BIT(data, 0); /* lamp */
+ m_lamps[2] = BIT(data, 0); /* lamp */
logerror("CRU: LAAAAAAMP 2 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 2");
}
if (muxlamps == 2)
{
- m_lamp[5] = BIT(data, 0); /* lamp */
+ m_lamps[5] = BIT(data, 0); /* lamp */
logerror("CRU: LAAAAAAMP 5 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 5");
}
if (muxlamps == 3)
{
- m_lamp[8] = BIT(data, 0); /* lamp */
+ m_lamps[8] = BIT(data, 0); /* lamp */
logerror("CRU: LAAAAAAMP 8 write to address %04x: %d\n", offset<<1, data & 1);
// popmessage("LAMP 8");
}
diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp
index 30dfd1c9a4e..2e8ebc434dd 100644
--- a/src/mame/drivers/kas89.cpp
+++ b/src/mame/drivers/kas89.cpp
@@ -223,7 +223,7 @@ public:
m_svc(*this, "SVC"),
m_dsw(*this, "DSW"),
m_unk(*this, "UNK"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(mux_w);
@@ -267,7 +267,7 @@ protected:
required_ioport m_svc;
required_ioport m_dsw;
required_ioport m_unk;
- output_finder<38> m_lamp;
+ output_finder<38> m_lamps;
};
@@ -277,8 +277,8 @@ protected:
void kas89_state::machine_start()
{
- m_lamp.resolve();
- m_lamp[37] = 0; /* turning off the operator led */
+ m_lamps.resolve();
+ m_lamps[37] = 0; /* turning off the operator led */
}
void kas89_state::machine_reset()
@@ -315,7 +315,7 @@ READ8_MEMBER(kas89_state::mux_r)
case 0x20: return m_pl6->read();
case 0x40:
{
- m_lamp[37] = BIT(~m_svc->read(), 5); /* Operator Key LAMP */
+ m_lamps[37] = BIT(~m_svc->read(), 5); /* Operator Key LAMP */
return m_svc->read();
}
case 0x80: return m_dsw->read(); /* Polled at $162a through NMI routine */
@@ -381,7 +381,7 @@ WRITE8_MEMBER(kas89_state::sound_comm_w)
uint8_t i;
for ( i = 0; i < 37; i++ )
{
- m_lamp[i] = 0; /* All roulette LEDs OFF */
+ m_lamps[i] = 0; /* All roulette LEDs OFF */
}
}
@@ -427,7 +427,7 @@ WRITE8_MEMBER(kas89_state::led_mux_select_w)
uint8_t i;
for ( i = 0; i < 37; i++ )
{
- m_lamp[i] = 0; /* All LEDs OFF */
+ m_lamps[i] = 0; /* All LEDs OFF */
}
switch(data)
@@ -436,69 +436,69 @@ WRITE8_MEMBER(kas89_state::led_mux_select_w)
{
for ( i = 0; i < 37; i++ )
{
- m_lamp[i] = 0; /* All LEDs OFF */
+ m_lamps[i] = 0; /* All LEDs OFF */
}
}
case 0x01:
{
- m_lamp[11] = BIT(m_leds_mux_data, 0); /* Number 11 LED */
- m_lamp[36] = BIT(m_leds_mux_data, 1); /* Number 36 LED */
- m_lamp[13] = BIT(m_leds_mux_data, 2); /* Number 13 LED */
- m_lamp[27] = BIT(m_leds_mux_data, 3); /* Number 27 LED */
- m_lamp[06] = BIT(m_leds_mux_data, 4); /* Number 6 LED */
- m_lamp[34] = BIT(m_leds_mux_data, 5); /* Number 34 LED */
- m_lamp[17] = BIT(m_leds_mux_data, 6); /* Number 17 LED */
- m_lamp[25] = BIT(m_leds_mux_data, 7); /* Number 25 LED */
+ m_lamps[11] = BIT(m_leds_mux_data, 0); /* Number 11 LED */
+ m_lamps[36] = BIT(m_leds_mux_data, 1); /* Number 36 LED */
+ m_lamps[13] = BIT(m_leds_mux_data, 2); /* Number 13 LED */
+ m_lamps[27] = BIT(m_leds_mux_data, 3); /* Number 27 LED */
+ m_lamps[06] = BIT(m_leds_mux_data, 4); /* Number 6 LED */
+ m_lamps[34] = BIT(m_leds_mux_data, 5); /* Number 34 LED */
+ m_lamps[17] = BIT(m_leds_mux_data, 6); /* Number 17 LED */
+ m_lamps[25] = BIT(m_leds_mux_data, 7); /* Number 25 LED */
break;
}
case 0x02:
{
- m_lamp[ 2] = BIT(m_leds_mux_data, 0); /* Number 2 LED */
- m_lamp[21] = BIT(m_leds_mux_data, 1); /* Number 21 LED */
- m_lamp[ 4] = BIT(m_leds_mux_data, 2); /* Number 4 LED */
- m_lamp[19] = BIT(m_leds_mux_data, 3); /* Number 19 LED */
- m_lamp[15] = BIT(m_leds_mux_data, 4); /* Number 15 LED */
- m_lamp[32] = BIT(m_leds_mux_data, 5); /* Number 32 LED */
- m_lamp[ 0] = BIT(m_leds_mux_data, 6); /* Number 0 LED */
- m_lamp[26] = BIT(m_leds_mux_data, 7); /* Number 26 LED */
+ m_lamps[ 2] = BIT(m_leds_mux_data, 0); /* Number 2 LED */
+ m_lamps[21] = BIT(m_leds_mux_data, 1); /* Number 21 LED */
+ m_lamps[ 4] = BIT(m_leds_mux_data, 2); /* Number 4 LED */
+ m_lamps[19] = BIT(m_leds_mux_data, 3); /* Number 19 LED */
+ m_lamps[15] = BIT(m_leds_mux_data, 4); /* Number 15 LED */
+ m_lamps[32] = BIT(m_leds_mux_data, 5); /* Number 32 LED */
+ m_lamps[ 0] = BIT(m_leds_mux_data, 6); /* Number 0 LED */
+ m_lamps[26] = BIT(m_leds_mux_data, 7); /* Number 26 LED */
break;
}
case 0x04:
{
- m_lamp[ 3] = BIT(m_leds_mux_data, 0); /* Number 3 LED */
- m_lamp[35] = BIT(m_leds_mux_data, 1); /* Number 35 LED */
- m_lamp[12] = BIT(m_leds_mux_data, 2); /* Number 12 LED */
- m_lamp[28] = BIT(m_leds_mux_data, 3); /* Number 28 LED */
- m_lamp[ 7] = BIT(m_leds_mux_data, 4); /* Number 7 LED */
- m_lamp[29] = BIT(m_leds_mux_data, 5); /* Number 29 LED */
- m_lamp[18] = BIT(m_leds_mux_data, 6); /* Number 18 LED */
+ m_lamps[ 3] = BIT(m_leds_mux_data, 0); /* Number 3 LED */
+ m_lamps[35] = BIT(m_leds_mux_data, 1); /* Number 35 LED */
+ m_lamps[12] = BIT(m_leds_mux_data, 2); /* Number 12 LED */
+ m_lamps[28] = BIT(m_leds_mux_data, 3); /* Number 28 LED */
+ m_lamps[ 7] = BIT(m_leds_mux_data, 4); /* Number 7 LED */
+ m_lamps[29] = BIT(m_leds_mux_data, 5); /* Number 29 LED */
+ m_lamps[18] = BIT(m_leds_mux_data, 6); /* Number 18 LED */
break;
}
case 0x08:
{
- m_lamp[22] = BIT(m_leds_mux_data, 0); /* Number 22 LED */
- m_lamp[ 9] = BIT(m_leds_mux_data, 1); /* Number 9 LED */
- m_lamp[31] = BIT(m_leds_mux_data, 2); /* Number 31 LED */
- m_lamp[14] = BIT(m_leds_mux_data, 3); /* Number 14 LED */
- m_lamp[20] = BIT(m_leds_mux_data, 4); /* Number 20 LED */
- m_lamp[ 1] = BIT(m_leds_mux_data, 5); /* Number 1 LED */
- m_lamp[33] = BIT(m_leds_mux_data, 6); /* Number 33 LED */
+ m_lamps[22] = BIT(m_leds_mux_data, 0); /* Number 22 LED */
+ m_lamps[ 9] = BIT(m_leds_mux_data, 1); /* Number 9 LED */
+ m_lamps[31] = BIT(m_leds_mux_data, 2); /* Number 31 LED */
+ m_lamps[14] = BIT(m_leds_mux_data, 3); /* Number 14 LED */
+ m_lamps[20] = BIT(m_leds_mux_data, 4); /* Number 20 LED */
+ m_lamps[ 1] = BIT(m_leds_mux_data, 5); /* Number 1 LED */
+ m_lamps[33] = BIT(m_leds_mux_data, 6); /* Number 33 LED */
break;
}
case 0x10:
{
- m_lamp[16] = BIT(m_leds_mux_data, 0); /* Number 16 LED */
- m_lamp[24] = BIT(m_leds_mux_data, 1); /* Number 24 LED */
- m_lamp[ 5] = BIT(m_leds_mux_data, 2); /* Number 5 LED */
- m_lamp[10] = BIT(m_leds_mux_data, 3); /* Number 10 LED */
- m_lamp[23] = BIT(m_leds_mux_data, 4); /* Number 23 LED */
- m_lamp[ 8] = BIT(m_leds_mux_data, 5); /* Number 8 LED */
- m_lamp[30] = BIT(m_leds_mux_data, 6); /* Number 30 LED */
+ m_lamps[16] = BIT(m_leds_mux_data, 0); /* Number 16 LED */
+ m_lamps[24] = BIT(m_leds_mux_data, 1); /* Number 24 LED */
+ m_lamps[ 5] = BIT(m_leds_mux_data, 2); /* Number 5 LED */
+ m_lamps[10] = BIT(m_leds_mux_data, 3); /* Number 10 LED */
+ m_lamps[23] = BIT(m_leds_mux_data, 4); /* Number 23 LED */
+ m_lamps[ 8] = BIT(m_leds_mux_data, 5); /* Number 8 LED */
+ m_lamps[30] = BIT(m_leds_mux_data, 6); /* Number 30 LED */
break;
}
@@ -506,7 +506,7 @@ WRITE8_MEMBER(kas89_state::led_mux_select_w)
{
for ( i = 0; i < 37; i++ )
{
- m_lamp[i] = 1; /* All LEDs ON */
+ m_lamps[i] = 1; /* All LEDs ON */
}
}
}
diff --git a/src/mame/drivers/kenseim.cpp b/src/mame/drivers/kenseim.cpp
index 0549755f019..d7d1dea5769 100644
--- a/src/mame/drivers/kenseim.cpp
+++ b/src/mame/drivers/kenseim.cpp
@@ -159,7 +159,7 @@ public:
m_from68k_st4(0),
m_from68k_st3(0),
m_from68k_st2(0),
- m_lamp(*this, "lamp%u", 1U)
+ m_lamps(*this, "lamp%u", 1U)
{
for (int i = 0; i < 6; i++)
{
@@ -254,7 +254,7 @@ private:
int mole_state_a[6];
int mole_state_b[6];
- output_finder<20> m_lamp;
+ output_finder<20> m_lamps;
};
@@ -265,7 +265,7 @@ private:
void kenseim_state::set_leds(uint32_t ledstates)
{
for (int i=0; i<20; i++)
- m_lamp[i] = BIT(ledstates, i);
+ m_lamps[i] = BIT(ledstates, i);
}
// could be wrong
@@ -702,7 +702,7 @@ void kenseim_state::init_kenseim()
m_led_clock = 0;
m_led_latch = 0;
- m_lamp.resolve();
+ m_lamps.resolve();
}
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index b1cabefa939..cb8d3e5c45e 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -397,7 +397,7 @@ public:
m_sensor(*this, "SENSOR"),
m_encoder(*this, "ENCODER"),
m_gunmania_id(*this, "gunmania_id"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
double m_pad_position[ 6 ];
@@ -527,7 +527,7 @@ public:
void konami573a_map(address_map &map);
void konami573d_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void driver_start() override;
required_ioport m_analog0;
@@ -601,7 +601,7 @@ private:
optional_ioport m_sensor;
optional_ioport m_encoder;
optional_device<ds2401_device> m_gunmania_id;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
};
void ATTR_PRINTF( 3,4 ) ksys573_state::verboselog( int n_level, const char *s_fmt, ... )
@@ -1177,11 +1177,11 @@ WRITE8_MEMBER( ksys573_state::ddr_output_callback )
break;
case 17:
- m_lamp[0] = data ? 0 : 1; // start 1
+ m_lamps[0] = data ? 0 : 1; // start 1
break;
case 18:
- m_lamp[1] = data ? 0 : 1; // start 2
+ m_lamps[1] = data ? 0 : 1; // start 2
break;
case 20:
@@ -1233,12 +1233,12 @@ WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b6 )
WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b5 )
{
- m_lamp[0] = state ? 1 : 0; // start left
+ m_lamps[0] = state ? 1 : 0; // start left
}
WRITE_LINE_MEMBER( ksys573_state::gtrfrks_lamps_b4 )
{
- m_lamp[1] = state ? 1 : 0; // start right
+ m_lamps[1] = state ? 1 : 0; // start right
}
/* ddr solo */
@@ -1275,7 +1275,7 @@ WRITE8_MEMBER( ksys573_state::ddrsolo_output_callback )
break;
case 20:
- m_lamp[0] = data ? 0 : 1; // start
+ m_lamps[0] = data ? 0 : 1; // start
break;
case 21:
@@ -1344,7 +1344,7 @@ WRITE8_MEMBER( ksys573_state::drmn_output_callback )
case 13: // drmn2+
case 21: // drmn
- m_lamp[0] = data ? 1 : 0; // start
+ m_lamps[0] = data ? 1 : 0; // start
break;
case 14: // drmn2+
@@ -1494,7 +1494,7 @@ WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b0 )
WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b1 )
{
- m_lamp[1] = state ? 1 : 0; // start 1p
+ m_lamps[1] = state ? 1 : 0; // start 1p
}
WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b2 )
@@ -1509,7 +1509,7 @@ WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b3 )
WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b4 )
{
- m_lamp[0] = state ? 1 : 0; // start 2p
+ m_lamps[0] = state ? 1 : 0; // start 2p
}
WRITE_LINE_MEMBER( ksys573_state::dmx_lamps_b5 )
@@ -1723,7 +1723,7 @@ WRITE8_MEMBER( ksys573_state::mamboagg_output_callback )
WRITE_LINE_MEMBER( ksys573_state::mamboagg_lamps_b3 )
{
- m_lamp[0] = state ? 1 : 0; // start 1p
+ m_lamps[0] = state ? 1 : 0; // start 1p
}
WRITE_LINE_MEMBER( ksys573_state::mamboagg_lamps_b4 )
diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp
index 54fcdfddf5d..b55c89bfa9f 100644
--- a/src/mame/drivers/kungfur.cpp
+++ b/src/mame/drivers/kungfur.cpp
@@ -74,7 +74,7 @@ public:
m_adpcm1(*this, "adpcm1"),
m_adpcm2(*this, "adpcm2"),
m_digits(*this, "digit%u", 0U),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(kungfur_output_w);
@@ -102,7 +102,7 @@ private:
required_device<msm5205_device> m_adpcm1;
required_device<msm5205_device> m_adpcm2;
output_finder<14> m_digits;
- output_finder<8> m_lamp;
+ output_finder<8> m_lamps;
};
@@ -139,13 +139,13 @@ WRITE8_MEMBER(kungfur_state::kungfur_output_w)
if ((data & 7) == 6)
{
for (u8 i = 0; i < 5; i++)
- m_lamp[i] = BIT(m_latch[2], i);
+ m_lamps[i] = BIT(m_latch[2], i);
}
// d7: game-over lamp, d3-d4: marquee lamps
- m_lamp[5] = BIT(data, 7);
- m_lamp[6] = BIT(data, 3);
- m_lamp[7] = BIT(data, 4);
+ m_lamps[5] = BIT(data, 7);
+ m_lamps[6] = BIT(data, 3);
+ m_lamps[7] = BIT(data, 4);
// d5: N/C?
// d6: coincounter
@@ -280,7 +280,7 @@ INPUT_PORTS_END
void kungfur_state::machine_start()
{
m_digits.resolve();
- m_lamp.resolve();
+ m_lamps.resolve();
save_item(NAME(m_control));
save_item(NAME(m_latch));
diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp
index 4759b12892f..6b767637031 100644
--- a/src/mame/drivers/lethalj.cpp
+++ b/src/mame/drivers/lethalj.cpp
@@ -178,16 +178,16 @@ WRITE16_MEMBER(lethalj_state::ripribit_control_w)
{
machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
m_ticket->motor_w(BIT(data, 1));
- m_lamp[0] = BIT(data, 2);
+ m_lamps[0] = BIT(data, 2);
}
WRITE16_MEMBER(lethalj_state::cfarm_control_w)
{
m_ticket->motor_w(BIT(data, 0));
- m_lamp[0] = BIT(data, 2);
- m_lamp[1] = BIT(data, 3);
- m_lamp[2] = BIT(data, 4);
+ m_lamps[0] = BIT(data, 2);
+ m_lamps[1] = BIT(data, 3);
+ m_lamps[2] = BIT(data, 4);
machine().bookkeeping().coin_counter_w(0, BIT(data, 7));
}
@@ -195,9 +195,9 @@ WRITE16_MEMBER(lethalj_state::cfarm_control_w)
WRITE16_MEMBER(lethalj_state::cclownz_control_w)
{
m_ticket->motor_w(BIT(data, 0));
- m_lamp[0] = BIT(data, 2);
- m_lamp[1] = BIT(data, 4);
- m_lamp[2] = BIT(data, 5);
+ m_lamps[0] = BIT(data, 2);
+ m_lamps[1] = BIT(data, 4);
+ m_lamps[2] = BIT(data, 5);
machine().bookkeeping().coin_counter_w(0, BIT(data, 6));
}
diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp
index 41f4a1621b6..78aa4d2ee78 100644
--- a/src/mame/drivers/lockon.cpp
+++ b/src/mame/drivers/lockon.cpp
@@ -419,7 +419,7 @@ WRITE8_MEMBER(lockon_state::ym2203_out_b)
machine().bookkeeping().coin_counter_w(2, data & 0x20);
/* 'Lock-On' lamp */
- m_lamp[1] = BIT(~data, 4);
+ m_lamp = BIT(~data, 4);
}
/*************************************
diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp
index d5cb1c8285e..3800078655a 100644
--- a/src/mame/drivers/lucky74.cpp
+++ b/src/mame/drivers/lucky74.cpp
@@ -878,10 +878,10 @@ WRITE8_MEMBER(lucky74_state::lamps_a_w)
---- xx-- BIG + SMALL (need to be individualized)
*/
- m_lamp[8] = BIT(data, 0); /* D-UP */
- m_lamp[9] = BIT(data, 1); /* TAKE SCORE */
- m_lamp[10] = BIT(data, 2); /* BIG */
- m_lamp[11] = BIT(data, 3); /* SMALL */
+ m_lamps[8] = BIT(data, 0); /* D-UP */
+ m_lamps[9] = BIT(data, 1); /* TAKE SCORE */
+ m_lamps[10] = BIT(data, 2); /* BIG */
+ m_lamps[11] = BIT(data, 3); /* SMALL */
}
WRITE8_MEMBER(lucky74_state::lamps_b_w)
@@ -898,14 +898,14 @@ WRITE8_MEMBER(lucky74_state::lamps_b_w)
x--- ---- CANCEL (should lit start too?)
*/
- m_lamp[0] = BIT(data, 0); /* HOLD1 */
- m_lamp[1] = BIT(data, 1); /* HOLD2 */
- m_lamp[2] = BIT(data, 2); /* HOLD3 */
- m_lamp[3] = BIT(data, 3); /* HOLD4 */
- m_lamp[4] = BIT(data, 4); /* HOLD5 */
- m_lamp[5] = BIT(data, 5); /* BET */
- m_lamp[6] = BIT(data, 6) | BIT(data, 7); /* START */
- m_lamp[7] = BIT(data, 7); /* CANCEL */
+ m_lamps[0] = BIT(data, 0); /* HOLD1 */
+ m_lamps[1] = BIT(data, 1); /* HOLD2 */
+ m_lamps[2] = BIT(data, 2); /* HOLD3 */
+ m_lamps[3] = BIT(data, 3); /* HOLD4 */
+ m_lamps[4] = BIT(data, 4); /* HOLD5 */
+ m_lamps[5] = BIT(data, 5); /* BET */
+ m_lamps[6] = BIT(data, 6) | BIT(data, 7); /* START */
+ m_lamps[7] = BIT(data, 7); /* CANCEL */
}
diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp
index 14d6fe77b4c..551e03bb055 100644
--- a/src/mame/drivers/magic10.cpp
+++ b/src/mame/drivers/magic10.cpp
@@ -119,7 +119,7 @@ public:
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 1U)
{ }
DECLARE_WRITE16_MEMBER(layer0_videoram_w);
@@ -151,7 +151,7 @@ public:
void sgsafari_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
tilemap_t *m_layer0_tilemap;
@@ -166,7 +166,7 @@ protected:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- output_finder<9> m_lamp;
+ output_finder<8> m_lamps;
};
@@ -307,14 +307,14 @@ WRITE16_MEMBER(magic10_state::magic10_out_w)
// popmessage("lamps: %02X", data);
- m_lamp[1] = BIT(data, 0); /* Lamp 1 - HOLD 1 */
- m_lamp[2] = BIT(data, 1); /* Lamp 2 - HOLD 2 */
- m_lamp[3] = BIT(data, 2); /* Lamp 3 - HOLD 3 */
- m_lamp[4] = BIT(data, 3); /* Lamp 4 - HOLD 4 */
- m_lamp[5] = BIT(data, 4); /* Lamp 5 - HOLD 5 */
- m_lamp[6] = BIT(data, 5); /* Lamp 6 - START */
- m_lamp[7] = BIT(data, 6); /* Lamp 7 - PLAY (BET/TAKE/CANCEL) */
- m_lamp[8] = BIT(data, 8); /* Lamp 8 - PAYOUT/SUPERGAME */
+ m_lamps[0] = BIT(data, 0); /* Lamp 1 - HOLD 1 */
+ m_lamps[1] = BIT(data, 1); /* Lamp 2 - HOLD 2 */
+ m_lamps[2] = BIT(data, 2); /* Lamp 3 - HOLD 3 */
+ m_lamps[3] = BIT(data, 3); /* Lamp 4 - HOLD 4 */
+ m_lamps[4] = BIT(data, 4); /* Lamp 5 - HOLD 5 */
+ m_lamps[5] = BIT(data, 5); /* Lamp 6 - START */
+ m_lamps[6] = BIT(data, 6); /* Lamp 7 - PLAY (BET/TAKE/CANCEL) */
+ m_lamps[7] = BIT(data, 8); /* Lamp 8 - PAYOUT/SUPERGAME */
machine().bookkeeping().coin_counter_w(0, data & 0x400);
}
diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp
index c71f85dc7d9..ff0077c049b 100644
--- a/src/mame/drivers/mainevt.cpp
+++ b/src/mame/drivers/mainevt.cpp
@@ -72,10 +72,10 @@ WRITE8_MEMBER(mainevt_state::mainevt_coin_w)
{
machine().bookkeeping().coin_counter_w(0, data & 0x10);
machine().bookkeeping().coin_counter_w(1, data & 0x20);
- m_led[0] = BIT(data, 0);
- m_led[1] = BIT(data, 1);
- m_led[2] = BIT(data, 2);
- m_led[3] = BIT(data, 3);
+ m_leds[0] = BIT(data, 0);
+ m_leds[1] = BIT(data, 1);
+ m_leds[2] = BIT(data, 2);
+ m_leds[3] = BIT(data, 3);
}
WRITE8_MEMBER(mainevt_state::mainevt_sh_irqtrigger_w)
@@ -388,7 +388,7 @@ WRITE8_MEMBER(mainevt_state::volume_callback)
void mainevt_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
m_rombank->configure_entries(0, 4, memregion("maincpu")->base(), 0x2000);
save_item(NAME(m_nmi_enable));
diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp
index 8f5af0ea6c4..7feac629715 100644
--- a/src/mame/drivers/majorpkr.cpp
+++ b/src/mame/drivers/majorpkr.cpp
@@ -480,7 +480,7 @@ public:
m_rom_bank(*this, "rom_bank"),
m_fg_vram(*this, "fg_vram"),
m_bg_vram(*this, "bg_vram"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(rom_bank_w);
@@ -506,7 +506,7 @@ public:
void vrambanks(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
required_device<gfxdecode_device> m_gfxdecode;
@@ -521,7 +521,7 @@ protected:
int m_mux_data;
int m_flip_state;
- output_finder<13> m_lamp;
+ output_finder<13> m_lamps;
};
@@ -684,13 +684,13 @@ WRITE8_MEMBER(majorpkr_state::lamps_a_w)
-x-- ---- Small lamp.
x--- ---- Unknown.
*/
- m_lamp[0] = BIT(data, 0); // Lamp 0: Hold 1.
- m_lamp[1] = BIT(data, 1); // Lamp 1: Hold 2.
- m_lamp[2] = BIT(data, 2); // Lamp 2: Hold 3.
- m_lamp[3] = BIT(data, 3); // Lamp 3: Hold 4.
- m_lamp[4] = BIT(data, 4); // Lamp 4: Hold 5.
- m_lamp[5] = BIT(data, 5); // Lamp 5: Big or Small (need identification).
- m_lamp[6] = BIT(data, 6); // Lamp 6: Big or Small (need identification).
+ m_lamps[0] = BIT(data, 0); // Lamp 0: Hold 1.
+ m_lamps[1] = BIT(data, 1); // Lamp 1: Hold 2.
+ m_lamps[2] = BIT(data, 2); // Lamp 2: Hold 3.
+ m_lamps[3] = BIT(data, 3); // Lamp 3: Hold 4.
+ m_lamps[4] = BIT(data, 4); // Lamp 4: Hold 5.
+ m_lamps[5] = BIT(data, 5); // Lamp 5: Big or Small (need identification).
+ m_lamps[6] = BIT(data, 6); // Lamp 6: Big or Small (need identification).
if (data & 0x80)
logerror("Lamps A: Write to 13h: %02x\n", data);
@@ -710,12 +710,12 @@ WRITE8_MEMBER(majorpkr_state::lamps_b_w)
--x- ---- Fever lamp.
xx-- ---- Unknown.
*/
- m_lamp[7] = BIT(data, 0); // Lamp 7: Bet.
- m_lamp[8] = BIT(data, 1); // Lamp 8: Draw.
- m_lamp[9] = BIT(data, 2); // Lamp 9: Cancel.
- m_lamp[10] = BIT(data, 3); // Lamp 10: Take.
- m_lamp[11] = BIT(data, 4); // Lamp 11: D-UP.
- m_lamp[12] = BIT(data, 5); // Lamp 12: Fever.
+ m_lamps[7] = BIT(data, 0); // Lamp 7: Bet.
+ m_lamps[8] = BIT(data, 1); // Lamp 8: Draw.
+ m_lamps[9] = BIT(data, 2); // Lamp 9: Cancel.
+ m_lamps[10] = BIT(data, 3); // Lamp 10: Take.
+ m_lamps[11] = BIT(data, 4); // Lamp 11: D-UP.
+ m_lamps[12] = BIT(data, 5); // Lamp 12: Fever.
if (data & 0xc0)
logerror("Lamps B: Write to 14h: %02x\n", data);
diff --git a/src/mame/drivers/marywu.cpp b/src/mame/drivers/marywu.cpp
index 42e8d0f7556..ba5a66d5e8b 100644
--- a/src/mame/drivers/marywu.cpp
+++ b/src/mame/drivers/marywu.cpp
@@ -30,7 +30,7 @@ public:
marywu_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_digits(*this, "digit%u", 0U)
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(display_7seg_data_w);
@@ -47,7 +47,7 @@ private:
uint8_t m_selected_7seg_module;
virtual void machine_start() override;
output_finder<32> m_digits;
- output_finder<30> m_led;
+ output_finder<30> m_leds;
};
static INPUT_PORTS_START( marywu )
@@ -111,21 +111,21 @@ INPUT_PORTS_END
WRITE8_MEMBER( marywu_state::ay1_port_a_w )
{
for (uint8_t i=0; i<8; i++){
- m_led[i] = BIT(data, i);
+ m_leds[i] = BIT(data, i);
}
}
WRITE8_MEMBER( marywu_state::ay1_port_b_w )
{
for (uint8_t i=0; i<8; i++){
- m_led[i+8] = BIT(data, i);
+ m_leds[i+8] = BIT(data, i);
}
}
WRITE8_MEMBER( marywu_state::ay2_port_a_w )
{
for (uint8_t i=0; i<8; i++){
- m_led[i+16] = BIT(data, i);
+ m_leds[i+16] = BIT(data, i);
}
}
@@ -133,7 +133,7 @@ WRITE8_MEMBER( marywu_state::ay2_port_b_w )
{
for (uint8_t i=0; i<6; i++){
/* we only have 30 LEDs. The last 2 bits in this port are unused. */
- m_led[i+24] = BIT(data, i);
+ m_leds[i+24] = BIT(data, i);
}
}
@@ -181,7 +181,7 @@ void marywu_state::io_map(address_map &map)
void marywu_state::machine_start()
{
m_digits.resolve();
- m_led.resolve();
+ m_leds.resolve();
}
MACHINE_CONFIG_START(marywu_state::marywu)
diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp
index 1612dd295eb..5c00f009639 100644
--- a/src/mame/drivers/maxaflex.cpp
+++ b/src/mame/drivers/maxaflex.cpp
@@ -45,8 +45,8 @@ public:
, m_console(*this, "console")
, m_joy01(*this, "djoy_0_1")
, m_joy23(*this, "djoy_2_3")
- , m_lamp(*this, "lamp%u", 0U)
- , m_digit(*this, "digit%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
+ , m_digits(*this, "digit%u", 0U)
{
}
@@ -84,8 +84,8 @@ private:
required_ioport m_console;
required_ioport m_joy01;
required_ioport m_joy23;
- output_finder<4> m_lamp;
- output_finder<3> m_digit;
+ output_finder<4> m_lamps;
+ output_finder<3> m_digits;
};
@@ -164,10 +164,10 @@ WRITE8_MEMBER(maxaflex_state::mcu_portB_w)
/* latch for lamps */
if (BIT(diff, 6) && !BIT(data, 6))
{
- m_lamp[0] = BIT(m_portC_out, 0);
- m_lamp[1] = BIT(m_portC_out, 1);
- m_lamp[2] = BIT(m_portC_out, 2);
- m_lamp[3] = BIT(m_portC_out, 3);
+ m_lamps[0] = BIT(m_portC_out, 0);
+ m_lamps[1] = BIT(m_portC_out, 1);
+ m_lamps[2] = BIT(m_portC_out, 2);
+ m_lamps[3] = BIT(m_portC_out, 3);
}
}
@@ -188,7 +188,7 @@ WRITE8_MEMBER(maxaflex_state::mcu_portC_w)
/* displays */
uint8_t const sel = m_portB_out & 0x03;
if (3U > sel)
- m_digit[sel] = ls48_map[m_portC_out];
+ m_digits[sel] = ls48_map[m_portC_out];
}
INPUT_CHANGED_MEMBER(maxaflex_state::coin_inserted)
@@ -295,8 +295,8 @@ void maxaflex_state::machine_start()
{
atari_common_state::machine_start();
- m_lamp.resolve();
- m_digit.resolve();
+ m_lamps.resolve();
+ m_digits.resolve();
save_item(NAME(m_portB_out));
save_item(NAME(m_portC_out));
@@ -313,8 +313,8 @@ void maxaflex_state::machine_reset()
m_portB_out = 0xff;
m_portC_out = 0xff;
- std::fill(std::begin(m_lamp), std::end(m_lamp), 0);
- std::fill(std::begin(m_digit), std::end(m_digit), 0x00);
+ std::fill(std::begin(m_lamps), std::end(m_lamps), 0);
+ std::fill(std::begin(m_digits), std::end(m_digits), 0x00);
}
TIMER_DEVICE_CALLBACK_MEMBER( maxaflex_state::mf_interrupt )
diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp
index 2c15a1c383d..74d12369ecb 100644
--- a/src/mame/drivers/mazerbla.cpp
+++ b/src/mame/drivers/mazerbla.cpp
@@ -129,8 +129,8 @@ public:
, m_vcu(*this,"vcu")
, m_screen(*this, "screen")
, m_soundlatch(*this, "soundlatch")
- , m_led(*this, "led%u", 0U)
- , m_lamp(*this, "lamp%u", 0U)
+ , m_leds(*this, "led%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(cfb_rom_bank_sel_w);
@@ -181,8 +181,8 @@ protected:
required_device<mb_vcu_device> m_vcu;
required_device<screen_device> m_screen;
optional_device<generic_latch_8_device> m_soundlatch;
- output_finder<3> m_led;
- output_finder<2> m_lamp;
+ output_finder<3> m_leds;
+ output_finder<2> m_lamps;
uint8_t m_port02_status;
uint32_t m_gfx_rom_bank; /* graphics ROMs are banked */
@@ -402,7 +402,7 @@ WRITE8_MEMBER(mazerbla_state::zpu_led_w)
{
/* 0x6e - reset (offset = 0)*/
/* 0x6f - set */
- m_led[0] = BIT(offset, 0);
+ m_leds[0] = BIT(offset, 0);
}
WRITE8_MEMBER(mazerbla_state::zpu_lamps_w)
@@ -410,8 +410,8 @@ WRITE8_MEMBER(mazerbla_state::zpu_lamps_w)
/* bit 4 = /LAMP0 */
/* bit 5 = /LAMP1 */
- /*m_lamp[0] = BIT(data, 4);*/
- /*m_lamp[1] = BIT(data, 5);*/
+ /*m_lamps[0] = BIT(data, 4);*/
+ /*m_lamps[1] = BIT(data, 5);*/
}
WRITE8_MEMBER(mazerbla_state::zpu_coin_counter_w)
@@ -423,13 +423,13 @@ WRITE8_MEMBER(mazerbla_state::zpu_coin_counter_w)
WRITE8_MEMBER(mazerbla_state::cfb_led_w)
{
/* bit 7 - led on */
- m_led[2] = BIT(data, 7);
+ m_leds[2] = BIT(data, 7);
}
WRITE8_MEMBER(mazerbla_state::gg_led_ctrl_w)
{
/* bit 0, bit 1 - led on */
- m_led[1] = BIT(data, 0);
+ m_leds[1] = BIT(data, 0);
}
@@ -444,7 +444,7 @@ WRITE8_MEMBER(mazerbla_state::vsb_ls273_audio_control_w)
m_vsb_ls273 = data;
/* bit 5 - led on */
- m_led[1] = BIT(data, 5);
+ m_leds[1] = BIT(data, 5);
}
WRITE8_MEMBER(mazerbla_state::sound_int_clear_w)
@@ -927,8 +927,8 @@ INTERRUPT_GEN_MEMBER(mazerbla_state::sound_interrupt)
void mazerbla_state::machine_start()
{
- m_led.resolve();
- m_lamp.resolve();
+ m_leds.resolve();
+ m_lamps.resolve();
membank("bank1")->configure_entries(0, 256, memregion("sub2")->base() + 0x10000, 0x2000);
diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp
index 797a881082e..f78a0409632 100644
--- a/src/mame/drivers/mcr.cpp
+++ b/src/mame/drivers/mcr.cpp
@@ -414,24 +414,24 @@ READ8_MEMBER(mcr_dpoker_state::ip0_r)
WRITE8_MEMBER(mcr_dpoker_state::lamps1_w)
{
// cpanel button lamps (white)
- m_lamp[0] = BIT(data, 0); // hold 1
- m_lamp[1] = BIT(data, 4); // hold 2
- m_lamp[2] = BIT(data, 5); // hold 3
- m_lamp[3] = BIT(data, 6); // hold 4
- m_lamp[4] = BIT(data, 7); // hold 5
- m_lamp[5] = BIT(data, 1); // deal
- m_lamp[6] = BIT(data, 2); // cancel
- m_lamp[7] = BIT(data, 3); // stand
+ m_lamps[0] = BIT(data, 0); // hold 1
+ m_lamps[1] = BIT(data, 4); // hold 2
+ m_lamps[2] = BIT(data, 5); // hold 3
+ m_lamps[3] = BIT(data, 6); // hold 4
+ m_lamps[4] = BIT(data, 7); // hold 5
+ m_lamps[5] = BIT(data, 1); // deal
+ m_lamps[6] = BIT(data, 2); // cancel
+ m_lamps[7] = BIT(data, 3); // stand
}
WRITE8_MEMBER(mcr_dpoker_state::lamps2_w)
{
// d5: button lamp: service or change
- m_lamp[8] = BIT(data, 5);
+ m_lamps[8] = BIT(data, 5);
// d0-d4: marquee lamps: coin 1 to 5 --> output lamps 9 to 13
for (int i = 0; i < 5; i++)
- m_lamp[9 + i] = BIT(data, i);
+ m_lamps[9 + i] = BIT(data, i);
// d6, d7: unused?
}
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index 97361f7a30a..28a958439f5 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -319,9 +319,9 @@ WRITE8_MEMBER(mcr3_state::powerdrv_op5_w)
/* bit 3 -> J1-10 = lamp 1 */
/* bit 2 -> J1-8 = lamp 2 */
/* bit 1 -> J1-6 = lamp 3 */
- m_lamp[0] = BIT(data, 3);
- m_lamp[1] = BIT(data, 2);
- m_lamp[2] = BIT(data, 1);
+ m_lamps[0] = BIT(data, 3);
+ m_lamps[1] = BIT(data, 2);
+ m_lamps[2] = BIT(data, 1);
/* remaining bits go to standard connections */
mcrmono_control_port_w(space, offset, data);
@@ -362,9 +362,9 @@ WRITE8_MEMBER(mcr3_state::stargrds_op5_w)
/* bit 2 controls light #0 */
/* bit 3 controls light #1 */
/* bit 4 controls light #2 */
- m_lamp[0] = BIT(data, 2);
- m_lamp[1] = BIT(data, 3);
- m_lamp[2] = BIT(data, 4);
+ m_lamps[0] = BIT(data, 2);
+ m_lamps[1] = BIT(data, 3);
+ m_lamps[2] = BIT(data, 4);
/* remaining bits go to standard connections */
mcrmono_control_port_w(space, offset, data);
diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp
index 41287f781b9..1d65c4f8668 100644
--- a/src/mame/drivers/merit.cpp
+++ b/src/mame/drivers/merit.cpp
@@ -96,7 +96,7 @@ public:
, m_backup_ram(*this, "backup_ram")
, m_maincpu(*this, "maincpu")
, m_screen(*this, "screen")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
void dodge_nvram_init(nvram_device &nvram, void *base, size_t size);
@@ -163,13 +163,13 @@ protected:
optional_shared_ptr<uint8_t> m_backup_ram;
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
- output_finder<10> m_led;
+ output_finder<10> m_leds;
};
void merit_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
m_question_address = 0;
m_ram_palette = std::make_unique<uint8_t[]>(RAM_PALETTE_SIZE);
@@ -346,21 +346,21 @@ WRITE_LINE_MEMBER(merit_state::hsync_changed)
WRITE8_MEMBER(merit_state::led1_w)
{
/* 5 button lamps player 1 */
- m_led[0] = BIT(~data, 0);
- m_led[1] = BIT(~data, 1);
- m_led[2] = BIT(~data, 2);
- m_led[3] = BIT(~data, 3);
- m_led[4] = BIT(~data, 4);
+ m_leds[0] = BIT(~data, 0);
+ m_leds[1] = BIT(~data, 1);
+ m_leds[2] = BIT(~data, 2);
+ m_leds[3] = BIT(~data, 3);
+ m_leds[4] = BIT(~data, 4);
}
WRITE8_MEMBER(merit_state::led2_w)
{
/* 5 button lamps player 2 */
- m_led[5] = BIT(~data, 0);
- m_led[6] = BIT(~data, 1);
- m_led[7] = BIT(~data, 2);
- m_led[8] = BIT(~data, 3);
- m_led[9] = BIT(~data, 4);
+ m_leds[5] = BIT(~data, 0);
+ m_leds[6] = BIT(~data, 1);
+ m_leds[7] = BIT(~data, 2);
+ m_leds[8] = BIT(~data, 3);
+ m_leds[9] = BIT(~data, 4);
/* coin counter */
machine().bookkeeping().coin_counter_w(0, BIT(~data, 7));
diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp
index 6092d9180c1..fd0239b685d 100644
--- a/src/mame/drivers/meyc8080.cpp
+++ b/src/mame/drivers/meyc8080.cpp
@@ -78,7 +78,7 @@ public:
, m_videoram_2(*this, "vram2")
, m_maincpu(*this, "maincpu")
, m_dac(*this, "dac")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(lights_1_w);
@@ -93,14 +93,14 @@ public:
void meyc8080_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
required_shared_ptr<uint8_t> m_videoram_0;
required_shared_ptr<uint8_t> m_videoram_1;
required_shared_ptr<uint8_t> m_videoram_2;
required_device<cpu_device> m_maincpu;
required_device<dac_byte_interface> m_dac;
- output_finder<11> m_lamp;
+ output_finder<11> m_lamps;
};
@@ -190,11 +190,11 @@ WRITE8_MEMBER(meyc8080_state::lights_1_w)
xxxx ---- Seems unused...
*/
- m_lamp[0] = BIT(data, 0); /* Lamp 0 */
- m_lamp[1] = BIT(data, 1); /* Lamp 1 */
- m_lamp[2] = BIT(data, 2); /* Lamp 2 */
- m_lamp[3] = BIT(data, 3); /* Lamp 3 */
- m_lamp[4] = BIT(data, 4); /* Lamp 4 */
+ m_lamps[0] = BIT(data, 0); /* Lamp 0 */
+ m_lamps[1] = BIT(data, 1); /* Lamp 1 */
+ m_lamps[2] = BIT(data, 2); /* Lamp 2 */
+ m_lamps[3] = BIT(data, 3); /* Lamp 3 */
+ m_lamps[4] = BIT(data, 4); /* Lamp 4 */
logerror("lights 1: %02x\n", data);
}
@@ -237,13 +237,13 @@ WRITE8_MEMBER(meyc8080_state::lights_2_w)
xxx- ---- Unknown.
*/
- m_lamp[5] = BIT(data, 0); /* Lamp 5 */
- m_lamp[6] = BIT(data, 1); /* Lamp 6 */
- m_lamp[7] = BIT(data, 2); /* Lamp 7 */
- m_lamp[8] = BIT(data, 3); /* Lamp 8 */
- m_lamp[9] = BIT(data, 4); /* Lamp 9 */
+ m_lamps[5] = BIT(data, 0); /* Lamp 5 */
+ m_lamps[6] = BIT(data, 1); /* Lamp 6 */
+ m_lamps[7] = BIT(data, 2); /* Lamp 7 */
+ m_lamps[8] = BIT(data, 3); /* Lamp 8 */
+ m_lamps[9] = BIT(data, 4); /* Lamp 9 */
- m_lamp[10] = BIT(data, 5); /* Lamp 10 (Game-Over) */
+ m_lamps[10] = BIT(data, 5); /* Lamp 10 (Game-Over) */
logerror("lights 2: %02x\n", data);
}
diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp
index e69101cc0a0..35ccb98bb14 100644
--- a/src/mame/drivers/mgames.cpp
+++ b/src/mame/drivers/mgames.cpp
@@ -231,7 +231,7 @@ public:
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 1U)
{ }
DECLARE_READ8_MEMBER(mixport_r);
@@ -249,7 +249,7 @@ public:
void main_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
uint8_t m_output[8];
@@ -258,7 +258,7 @@ protected:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- output_finder<10> m_lamp;
+ output_finder<9> m_lamps;
};
@@ -356,8 +356,8 @@ READ8_MEMBER(mgames_state::mixport_r)
WRITE8_MEMBER(mgames_state::outport0_w)
{
- m_lamp[1] = BIT(data, 0); /* Lamp 1 - BET */
- m_lamp[5] = BIT(data, 1); /* Lamp 5 - HOLD 1 */
+ m_lamps[0] = BIT(data, 0); /* Lamp 1 - BET */
+ m_lamps[4] = BIT(data, 1); /* Lamp 5 - HOLD 1 */
m_output[0] = data;
popmessage("outport0 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]);
@@ -377,8 +377,8 @@ WRITE8_MEMBER(mgames_state::outport0_w)
WRITE8_MEMBER(mgames_state::outport1_w)
{
- m_lamp[2] = BIT(data, 0); /* Lamp 2 - DEAL */
- m_lamp[6] = BIT(data, 1); /* Lamp 6 - HOLD 2 */
+ m_lamps[1] = BIT(data, 0); /* Lamp 2 - DEAL */
+ m_lamps[5] = BIT(data, 1); /* Lamp 6 - HOLD 2 */
m_output[1] = data;
popmessage("outport1 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]);
@@ -398,8 +398,8 @@ WRITE8_MEMBER(mgames_state::outport1_w)
WRITE8_MEMBER(mgames_state::outport2_w)
{
- m_lamp[3] = BIT(data, 0); /* Lamp 3 - CANCEL */
- m_lamp[7] = BIT(data, 1); /* Lamp 7 - HOLD 3 */
+ m_lamps[2] = BIT(data, 0); /* Lamp 3 - CANCEL */
+ m_lamps[6] = BIT(data, 1); /* Lamp 7 - HOLD 3 */
m_output[2] = data;
popmessage("outport2 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]);
@@ -419,8 +419,8 @@ WRITE8_MEMBER(mgames_state::outport2_w)
WRITE8_MEMBER(mgames_state::outport3_w)
{
- m_lamp[4] = BIT(data, 0); /* Lamp 4 - STAND */
- m_lamp[8] = BIT(data, 1); /* Lamp 8 - HOLD 4 */
+ m_lamps[3] = BIT(data, 0); /* Lamp 4 - STAND */
+ m_lamps[7] = BIT(data, 1); /* Lamp 8 - HOLD 4 */
m_output[3] = data;
popmessage("outport3 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]);
@@ -440,7 +440,7 @@ WRITE8_MEMBER(mgames_state::outport3_w)
WRITE8_MEMBER(mgames_state::outport4_w)
{
- m_lamp[9] = BIT(data, 1); /* Lamp 9 - HOLD 5 */
+ m_lamps[8] = BIT(data, 1); /* Lamp 9 - HOLD 5 */
m_output[4] = data;
popmessage("outport4 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]);
diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp
index b2bef2461e0..c34ec774965 100644
--- a/src/mame/drivers/midzeus.cpp
+++ b/src/mame/drivers/midzeus.cpp
@@ -72,8 +72,8 @@ public:
midzeus2_state(const machine_config &mconfig, device_type type, const char *tag)
: midzeus_state(mconfig, type, tag)
, m_zeus(*this, "zeus2")
- , m_led(*this, "led%u", 0U)
- , m_lamp(*this, "lamp%u", 0U)
+ , m_leds(*this, "led%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE_LINE_MEMBER(zeus_irq);
@@ -92,14 +92,14 @@ protected:
virtual void machine_start() override
{
MACHINE_START_CALL_MEMBER(midzeus);
- m_led.resolve();
- m_lamp.resolve();
+ m_leds.resolve();
+ m_lamps.resolve();
}
private:
required_device<zeus2_device> m_zeus;
- output_finder<32> m_led;
- output_finder<8> m_lamp;
+ output_finder<32> m_leds;
+ output_finder<8> m_lamps;
};
@@ -448,7 +448,7 @@ WRITE32_MEMBER(midzeus2_state::crusnexo_leds_w)
case 1: /* controls lamps */
for (bit = 0; bit < 8; bit++)
- m_lamp[bit] = BIT(data, bit);
+ m_lamps[bit] = BIT(data, bit);
break;
case 2: /* sets state of selected LEDs */
@@ -462,7 +462,7 @@ WRITE32_MEMBER(midzeus2_state::crusnexo_leds_w)
for (bit = 0; bit < 3; bit++)
if ((crusnexo_leds_select & (1 << bit)) == 0)
for (led = 0; led < 8; led++)
- m_led[bit * 8 + led] = BIT(~data, led);
+ m_leds[bit * 8 + led] = BIT(~data, led);
break;
case 3: /* selects which set of LEDs we are addressing */
diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp
index 4ad97fc26e9..77d76d86b67 100644
--- a/src/mame/drivers/miniboy7.cpp
+++ b/src/mame/drivers/miniboy7.cpp
@@ -164,7 +164,7 @@ public:
m_maincpu(*this, "maincpu"),
m_palette(*this, "palette"),
m_gfxdecode(*this, "gfxdecode"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(ay_pa_w);
@@ -180,7 +180,7 @@ public:
void miniboy7_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void machine_reset() override;
private:
@@ -196,7 +196,7 @@ private:
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
required_device<gfxdecode_device> m_gfxdecode;
- output_finder<5> m_lamp;
+ output_finder<5> m_lamps;
uint8_t m_ay_pb;
int m_gpri;
@@ -314,11 +314,11 @@ WRITE8_MEMBER(miniboy7_state::ay_pa_w)
data = data ^ 0xff;
-// m_lamp[0] = BIT(data, 0); // [----x]
-// m_lamp[1] = BIT(data, 1); // [---x-]
-// m_lamp[2] = BIT(data, 2); // [--x--]
-// m_lamp[3] = BIT(data, 3); // [-x---]
-// m_lamp[4] = BIT(data, 4); // [x----]
+// m_lamps[0] = BIT(data, 0); // [----x]
+// m_lamps[1] = BIT(data, 1); // [---x-]
+// m_lamps[2] = BIT(data, 2); // [--x--]
+// m_lamps[3] = BIT(data, 3); // [-x---]
+// m_lamps[4] = BIT(data, 4); // [x----]
machine().bookkeeping().coin_counter_w(0, data & 0x40); // counter
diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp
index 210f31039bd..0ff7a0f01d0 100644
--- a/src/mame/drivers/missile.cpp
+++ b/src/mame/drivers/missile.cpp
@@ -376,7 +376,7 @@ public:
, m_track1_y(*this, "TRACK1_Y")
, m_screen(*this, "screen")
, m_palette(*this, "palette")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(missile_w);
@@ -422,7 +422,7 @@ protected:
required_ioport m_track1_y;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
const uint8_t *m_mainrom;
const uint8_t *m_writeprom;
@@ -533,7 +533,7 @@ TIMER_CALLBACK_MEMBER(missile_state::adjust_cpu_speed)
void missile_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
/* initialize globals */
m_mainrom = memregion("maincpu")->base();
@@ -748,8 +748,8 @@ WRITE8_MEMBER(missile_state::missile_w)
machine().bookkeeping().coin_counter_w(0, data & 0x20);
machine().bookkeeping().coin_counter_w(1, data & 0x10);
machine().bookkeeping().coin_counter_w(2, data & 0x08);
- m_led[1] = BIT(~data, 2);
- m_led[0] = BIT(~data, 1);
+ m_leds[1] = BIT(~data, 2);
+ m_leds[0] = BIT(~data, 1);
m_ctrld = data & 1;
}
@@ -861,8 +861,8 @@ WRITE8_MEMBER(missile_state::bootleg_w)
machine().bookkeeping().coin_counter_w(0, data & 0x20);
machine().bookkeeping().coin_counter_w(1, data & 0x10);
machine().bookkeeping().coin_counter_w(2, data & 0x08);
- m_led[1] = BIT(~data, 2);
- m_led[0] = BIT(~data, 1);
+ m_leds[1] = BIT(~data, 2);
+ m_leds[0] = BIT(~data, 1);
m_ctrld = data & 1;
}
diff --git a/src/mame/drivers/mk1.cpp b/src/mame/drivers/mk1.cpp
index 3a5fd2ca9a2..bf4b0d3b264 100644
--- a/src/mame/drivers/mk1.cpp
+++ b/src/mame/drivers/mk1.cpp
@@ -55,7 +55,7 @@ public:
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_digits(*this, "digit%u", 0U)
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_READ8_MEMBER(mk1_f8_r);
@@ -74,7 +74,7 @@ private:
uint8_t m_led_data[4];
required_device<cpu_device> m_maincpu;
output_finder<4> m_digits;
- output_finder<4> m_led;
+ output_finder<4> m_leds;
};
@@ -172,7 +172,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mk1_state::mk1_update_leds)
for (int i = 0; i < 4; i++)
{
m_digits[i] = m_led_data[i] >> 1;
- m_led[i] = m_led_data[i] & 0x01;
+ m_leds[i] = m_led_data[i] & 0x01;
m_led_data[i] = 0;
}
}
@@ -181,7 +181,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mk1_state::mk1_update_leds)
void mk1_state::machine_start()
{
m_digits.resolve();
- m_led.resolve();
+ m_leds.resolve();
}
diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp
index 6b76efccfac..c91d1de1ab4 100644
--- a/src/mame/drivers/mk2.cpp
+++ b/src/mame/drivers/mk2.cpp
@@ -69,7 +69,7 @@ public:
, m_speaker(*this, "speaker")
, m_miot(*this, "miot")
, m_digits(*this, "digit%u", 0U)
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_READ8_MEMBER(mk2_read_a);
@@ -88,7 +88,7 @@ private:
required_device<speaker_sound_device> m_speaker;
required_device<mos6530_device> m_miot;
output_finder<6> m_digits;
- output_finder<4> m_led;
+ output_finder<4> m_leds;
};
@@ -135,10 +135,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(mk2_state::update_leds)
for (i=0; i<4; i++)
m_digits[i] = m_led_data[i];
- m_led[0] = BIT(m_led_data[4], 3);
- m_led[1] = BIT(m_led_data[4], 5);
- m_led[2] = BIT(m_led_data[4], 4);
- m_led[3] = BIT(~m_led_data[4], 4);
+ m_leds[0] = BIT(m_led_data[4], 3);
+ m_leds[1] = BIT(m_led_data[4], 5);
+ m_leds[2] = BIT(m_led_data[4], 4);
+ m_leds[3] = BIT(~m_led_data[4], 4);
m_led_data[0] = m_led_data[1] = m_led_data[2] = m_led_data[3] = m_led_data[4] = 0;
}
@@ -146,7 +146,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mk2_state::update_leds)
void mk2_state::machine_start()
{
m_digits.resolve();
- m_led.resolve();
+ m_leds.resolve();
}
READ8_MEMBER( mk2_state::mk2_read_a )
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index d0282e6cc42..67ab8cab9dc 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -846,14 +846,14 @@ WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_lamps1_w)
-X-- ---- Start Lamp 34A
X--- ---- Bet/Double Lamp 29B
*/
- m_lamp[1] = BIT(data, 0); /* Hold 1 Lamp */
- m_lamp[2] = BIT(data, 1); /* Hold 2 Lamp */
- m_lamp[3] = BIT(data, 2); /* Hold 3 Lamp */
- m_lamp[4] = BIT(data, 3); /* Hold 4 Lamp */
- m_lamp[5] = BIT(data, 4); /* Hold 5 Lamp */
- m_lamp[8] = BIT(data, 5); /* Help Lamp */
- m_lamp[6] = BIT(data, 6); /* Start Lamp */
- m_lamp[0] = BIT(data, 7); /* Bet/Double Lamp */
+ m_lamps[1] = BIT(data, 0); /* Hold 1 Lamp */
+ m_lamps[2] = BIT(data, 1); /* Hold 2 Lamp */
+ m_lamps[3] = BIT(data, 2); /* Hold 3 Lamp */
+ m_lamps[4] = BIT(data, 3); /* Hold 4 Lamp */
+ m_lamps[5] = BIT(data, 4); /* Hold 5 Lamp */
+ m_lamps[8] = BIT(data, 5); /* Help Lamp */
+ m_lamps[6] = BIT(data, 6); /* Start Lamp */
+ m_lamps[0] = BIT(data, 7); /* Bet/Double Lamp */
}
WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_lamps2_w)
@@ -866,10 +866,10 @@ WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_lamps2_w)
---- -X-- Maxbet Lamp 30B
---X ---- Upper Lamp Green 25B (Demo Mode)
*/
- m_lamp[9] = BIT(data, 0); /* Payout Lamp */
- m_lamp[12] = BIT(data, 1); /* Upper Lamp Yellow */
- m_lamp[7] = BIT(data, 2); /* Maxbet Lamp */
- m_lamp[10] = BIT(data, 4); /* Upper Lamp Green */
+ m_lamps[9] = BIT(data, 0); /* Payout Lamp */
+ m_lamps[12] = BIT(data, 1); /* Upper Lamp Yellow */
+ m_lamps[7] = BIT(data, 2); /* Maxbet Lamp */
+ m_lamps[10] = BIT(data, 4); /* Upper Lamp Green */
}
WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_lamps3_w)
@@ -879,7 +879,7 @@ WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_lamps3_w)
7654 3210
---- --X- Upper Lamp Red 26B (Service Mode)
*/
- m_lamp[11] = BIT(data, 1); /* Upper Lamp Red */
+ m_lamps[11] = BIT(data, 1); /* Upper Lamp Red */
}
WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_counters_w)
@@ -1010,7 +1010,7 @@ GFXDECODE_END
void igrosoft_gamble_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
save_item(NAME(m_disp_enable));
save_item(NAME(m_rambk));
diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp
index 7d4418bfc7c..48e4f3157a2 100644
--- a/src/mame/drivers/mw18w.cpp
+++ b/src/mame/drivers/mw18w.cpp
@@ -30,7 +30,7 @@ public:
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_digits(*this, "digit%u", 0U),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(mw18w_sound0_w);
@@ -43,10 +43,10 @@ public:
void mw18w_map(address_map &map);
void mw18w_portmap(address_map &map);
private:
- virtual void machine_start() override { m_digits.resolve(); m_lamp.resolve(); }
+ virtual void machine_start() override { m_digits.resolve(); m_lamps.resolve(); }
required_device<cpu_device> m_maincpu;
output_finder<10> m_digits;
- output_finder<81> m_lamp;
+ output_finder<81> m_lamps;
};
@@ -74,7 +74,7 @@ WRITE8_MEMBER(mw18w_state::mw18w_sound1_w)
// d6: bell sound
// d7: backdrop lamp dim control
- m_lamp[80] = BIT(data, 7);
+ m_lamps[80] = BIT(data, 7);
}
WRITE8_MEMBER(mw18w_state::mw18w_lamps_w)
@@ -87,7 +87,7 @@ WRITE8_MEMBER(mw18w_state::mw18w_lamps_w)
// refresh lamp status
for (int i = 0; i < 5; i++)
- m_lamp[col * 10 + i] = BIT(rows, i);
+ m_lamps[col * 10 + i] = BIT(rows, i);
/* lamps info:
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index 17c1b5744fa..e58473ba433 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -1431,7 +1431,7 @@ public:
m_palette(*this, "palette"),
m_generic_paletteram_32(*this, "paletteram"),
m_adc_ports(*this, "ADC.%u", 0),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
render_t m_render;
@@ -1617,7 +1617,7 @@ protected:
uint8_t m_sub_porta;
uint8_t m_sub_portb;
uint8_t m_tssio_port_4;
- output_finder<8> m_lamp;
+ output_finder<8> m_lamps;
};
@@ -2797,7 +2797,7 @@ WRITE16_MEMBER(namcos23_state::ctl_w)
if(m_ctl_led != (data & 0xff)) {
m_ctl_led = data & 0xff;
for(int i = 0; i < 8; i++)
- m_lamp[i] = BIT(data, 7 - i);
+ m_lamps[i] = BIT(data, 7 - i);
}
break;
@@ -3472,7 +3472,7 @@ INPUT_PORTS_END
void namcos23_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
m_c361.timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(namcos23_state::c361_timer_cb),this));
m_c361.timer->adjust(attotime::never);
diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp
index 0041e5277a7..8f011141478 100644
--- a/src/mame/drivers/namcos86.cpp
+++ b/src/mame/drivers/namcos86.cpp
@@ -284,8 +284,8 @@ WRITE8_MEMBER(namcos86_state::coin_w)
WRITE8_MEMBER(namcos86_state::led_w)
{
- m_led[0] = BIT(data, 3);
- m_led[1] = BIT(data, 4);
+ m_leds[0] = BIT(data, 3);
+ m_leds[1] = BIT(data, 4);
}
@@ -329,7 +329,7 @@ void namcos86_state::machine_start()
if (membank("bank2"))
membank("bank2")->configure_entries(0, 4, memregion("cpu2")->base(), 0x2000);
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_wdog));
}
diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp
index 756194617e1..0ff0827b9b2 100644
--- a/src/mame/drivers/norautp.cpp
+++ b/src/mame/drivers/norautp.cpp
@@ -647,14 +647,14 @@ WRITE8_MEMBER(norautp_state::mainlamps_w)
-x-- ---- * HOLD 5 lamp.
x--- ---- * CANCEL lamp.
*/
- m_lamp[0] = BIT(data, 0); /* CHANGE CARD lamp */
- m_lamp[1] = BIT(data, 1); /* SAVE / HALF GAMBLE lamp */
- m_lamp[2] = BIT(data, 2); /* HOLD 1 lamp */
- m_lamp[3] = BIT(data, 3); /* HOLD 2 lamp */
- m_lamp[4] = BIT(data, 4); /* HOLD 3 lamp */
- m_lamp[5] = BIT(data, 5); /* HOLD 4 lamp */
- m_lamp[6] = BIT(data, 6); /* HOLD 5 lamp */
- m_lamp[7] = BIT(data, 7); /* CANCEL lamp */
+ m_lamps[0] = BIT(data, 0); /* CHANGE CARD lamp */
+ m_lamps[1] = BIT(data, 1); /* SAVE / HALF GAMBLE lamp */
+ m_lamps[2] = BIT(data, 2); /* HOLD 1 lamp */
+ m_lamps[3] = BIT(data, 3); /* HOLD 2 lamp */
+ m_lamps[4] = BIT(data, 4); /* HOLD 3 lamp */
+ m_lamps[5] = BIT(data, 5); /* HOLD 4 lamp */
+ m_lamps[6] = BIT(data, 6); /* HOLD 5 lamp */
+ m_lamps[7] = BIT(data, 7); /* CANCEL lamp */
// popmessage("lamps: %02x", data);
}
@@ -672,8 +672,8 @@ WRITE8_MEMBER(norautp_state::soundlamps_w)
xxxx ---- * Discrete Sound Lines.
*/
- m_lamp[8] = BIT(data, 0); /* DEAL / DRAW lamp */
- m_lamp[9] = BIT(data, 1); /* BET / COLLECT lamp */
+ m_lamps[8] = BIT(data, 0); /* DEAL / DRAW lamp */
+ m_lamps[9] = BIT(data, 1); /* BET / COLLECT lamp */
/* the 4 MSB are for discrete sound */
m_discrete->write(space, NORAUTP_SND_EN, (data >> 7) & 0x01);
@@ -697,8 +697,8 @@ WRITE8_MEMBER(norautp_state::counterlamps_w)
-x-- ---- + Coin counter related.
x--- ---- + DEFLECT (always activated).
*/
- m_lamp[10] = BIT(data, 0); /* HI lamp */
- m_lamp[11] = BIT(data, 1); /* LO lamp */
+ m_lamps[10] = BIT(data, 0); /* HI lamp */
+ m_lamps[11] = BIT(data, 1); /* LO lamp */
machine().bookkeeping().coin_counter_w(0, data & 0x10); /* Coin1/3 counter */
machine().bookkeeping().coin_counter_w(1, data & 0x20); /* Coin2 counter */
diff --git a/src/mame/drivers/notechan.cpp b/src/mame/drivers/notechan.cpp
index 7e748f66b52..f32351cff2e 100644
--- a/src/mame/drivers/notechan.cpp
+++ b/src/mame/drivers/notechan.cpp
@@ -306,7 +306,7 @@ public:
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_oki(*this, "oki"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(out_f8_w);
@@ -318,12 +318,12 @@ public:
void notechan_port_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
private:
required_device<cpu_device> m_maincpu;
required_device<okim6295_device> m_oki;
- output_finder<32> m_lamp;
+ output_finder<32> m_lamps;
};
@@ -355,28 +355,28 @@ void notechan_state::notechan_port_map(address_map &map)
WRITE8_MEMBER(notechan_state::out_f8_w)
{
- m_lamp[0] = BIT(data, 0);
- m_lamp[1] = BIT(data, 1);
- m_lamp[2] = BIT(data, 2);
- m_lamp[3] = BIT(data, 3);
- m_lamp[4] = BIT(data, 4);
- m_lamp[5] = BIT(data, 5);
- m_lamp[6] = BIT(data, 6);
- m_lamp[7] = BIT(data, 7);
+ m_lamps[0] = BIT(data, 0);
+ m_lamps[1] = BIT(data, 1);
+ m_lamps[2] = BIT(data, 2);
+ m_lamps[3] = BIT(data, 3);
+ m_lamps[4] = BIT(data, 4);
+ m_lamps[5] = BIT(data, 5);
+ m_lamps[6] = BIT(data, 6);
+ m_lamps[7] = BIT(data, 7);
logerror("Output %02X to $F8\n", data);
}
WRITE8_MEMBER(notechan_state::out_f9_w)
{
- m_lamp[8] = BIT(data, 0);
- m_lamp[9] = BIT(data, 1);
- m_lamp[10] = BIT(data, 2);
- m_lamp[11] = BIT(data, 3);
- m_lamp[12] = BIT(data, 4);
- m_lamp[13] = BIT(data, 5);
- m_lamp[14] = BIT(data, 6);
- m_lamp[15] = BIT(data, 7);
+ m_lamps[8] = BIT(data, 0);
+ m_lamps[9] = BIT(data, 1);
+ m_lamps[10] = BIT(data, 2);
+ m_lamps[11] = BIT(data, 3);
+ m_lamps[12] = BIT(data, 4);
+ m_lamps[13] = BIT(data, 5);
+ m_lamps[14] = BIT(data, 6);
+ m_lamps[15] = BIT(data, 7);
logerror("Output %02X to $F9\n", data);
}
@@ -385,28 +385,28 @@ WRITE8_MEMBER(notechan_state::out_fa_w)
{
m_oki->set_rom_bank(BIT(data, 5));
- m_lamp[16] = BIT(data, 0);
- m_lamp[17] = BIT(data, 1);
- m_lamp[18] = BIT(data, 2);
- m_lamp[19] = BIT(data, 3);
- m_lamp[20] = BIT(data, 4);
- m_lamp[21] = BIT(data, 5);
- m_lamp[22] = BIT(data, 6);
- m_lamp[23] = BIT(data, 7);
+ m_lamps[16] = BIT(data, 0);
+ m_lamps[17] = BIT(data, 1);
+ m_lamps[18] = BIT(data, 2);
+ m_lamps[19] = BIT(data, 3);
+ m_lamps[20] = BIT(data, 4);
+ m_lamps[21] = BIT(data, 5);
+ m_lamps[22] = BIT(data, 6);
+ m_lamps[23] = BIT(data, 7);
logerror("Output %02X to $FA\n", data);
}
WRITE8_MEMBER(notechan_state::out_ff_w)
{
- m_lamp[24] = BIT(data, 0);
- m_lamp[25] = BIT(data, 1);
- m_lamp[26] = BIT(data, 2);
- m_lamp[27] = BIT(data, 3);
- m_lamp[28] = BIT(data, 4);
- m_lamp[29] = BIT(data, 5);
- m_lamp[30] = BIT(data, 6);
- m_lamp[31] = BIT(data, 7);
+ m_lamps[24] = BIT(data, 0);
+ m_lamps[25] = BIT(data, 1);
+ m_lamps[26] = BIT(data, 2);
+ m_lamps[27] = BIT(data, 3);
+ m_lamps[28] = BIT(data, 4);
+ m_lamps[29] = BIT(data, 5);
+ m_lamps[30] = BIT(data, 6);
+ m_lamps[31] = BIT(data, 7);
logerror("Output %02X to $FF\n", data);
}
diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp
index 4a9950e1e62..d44057b94b5 100644
--- a/src/mame/drivers/omegrace.cpp
+++ b/src/mame/drivers/omegrace.cpp
@@ -238,7 +238,7 @@ public:
, m_audiocpu(*this, "audiocpu")
, m_dvg(*this, "dvg")
, m_soundlatch(*this, "soundlatch")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_READ8_MEMBER(omegrace_vg_go_r);
@@ -253,14 +253,14 @@ public:
void sound_port(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<dvg_device> m_dvg;
required_device<generic_latch_8_device> m_soundlatch;
- output_finder<4> m_led;
+ output_finder<4> m_leds;
};
@@ -343,10 +343,10 @@ WRITE8_MEMBER(omegrace_state::omegrace_leds_w)
machine().bookkeeping().coin_counter_w(1,data & 0x02);
/* bits 2 to 5 are the start leds (4 and 5 cocktail only) */
- m_led[0] = BIT(~data, 2);
- m_led[1] = BIT(~data, 3);
- m_led[2] = BIT(~data, 4);
- m_led[3] = BIT(~data, 5);
+ m_leds[0] = BIT(~data, 2);
+ m_leds[1] = BIT(~data, 3);
+ m_leds[2] = BIT(~data, 4);
+ m_leds[3] = BIT(~data, 5);
/* bit 6 flips screen (not supported) */
}
diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp
index 7ab3906aab9..92905244bad 100644
--- a/src/mame/drivers/peyper.cpp
+++ b/src/mame/drivers/peyper.cpp
@@ -50,7 +50,7 @@ public:
: genpin_class(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_switch(*this, "SWITCH.%u", 0)
- , m_led(*this, "led_%u", 1U)
+ , m_leds(*this, "led_%u", 1U)
, m_dpl(*this, "dpl_%u", 0U)
{ }
@@ -84,7 +84,7 @@ private:
uint8_t m_disp_layout[36];
required_device<cpu_device> m_maincpu;
required_ioport_array<4> m_switch;
- output_finder<4> m_led;
+ output_finder<4> m_leds;
output_finder<34> m_dpl; // 0 used as black hole
};
@@ -134,10 +134,10 @@ WRITE8_MEMBER( peyper_state::disp_w )
switch (q)
{
case 34: // player indicator lights (7-digit only)
- m_led[0] = BIT(a, 0); // PLAYER 1
- m_led[1] = BIT(a, 1); // PLAYER 2
- m_led[2] = BIT(a, 2); // PLAYER 3
- m_led[3] = BIT(a, 3); // PLAYER 4
+ m_leds[0] = BIT(a, 0); // PLAYER 1
+ m_leds[1] = BIT(a, 1); // PLAYER 2
+ m_leds[2] = BIT(a, 2); // PLAYER 3
+ m_leds[3] = BIT(a, 3); // PLAYER 4
break;
case 35: // units digits show 0
@@ -160,7 +160,7 @@ WRITE8_MEMBER( peyper_state::disp_w )
case 38: // player 2 indicators (6-digit only)
case 39: // player 3 indicators (6-digit only)
case 40: // player 4 indicators (6-digit only)
- m_led[q - 37] = BIT(a, 1); // player indicator
+ m_leds[q - 37] = BIT(a, 1); // player indicator
m_dpl[q - 7] = BIT(a, 2) ? 6 : 0; // million led (we show blank or 1 in millions digit)
// bit 3, looks like it turns on all the decimal points, reason unknown
break;
@@ -591,7 +591,7 @@ void peyper_state::machine_start()
{
genpin_class::machine_start();
- m_led.resolve();
+ m_leds.resolve();
m_dpl.resolve();
save_item(NAME(m_digit));
diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp
index 0e50f9d70e7..06b00388fba 100644
--- a/src/mame/drivers/poolshrk.cpp
+++ b/src/mame/drivers/poolshrk.cpp
@@ -58,9 +58,9 @@ WRITE8_MEMBER(poolshrk_state::da_latch_w)
WRITE8_MEMBER(poolshrk_state::led_w)
{
if (offset & 2)
- m_led[0] = BIT(offset, 0);
+ m_leds[0] = BIT(offset, 0);
if (offset & 4)
- m_led[1] = BIT(offset, 0);
+ m_leds[1] = BIT(offset, 0);
}
diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp
index d2fa51e7077..ffddda0d0e2 100644
--- a/src/mame/drivers/portrait.cpp
+++ b/src/mame/drivers/portrait.cpp
@@ -105,8 +105,8 @@ WRITE8_MEMBER(portrait_state::ctrl_w)
machine().bookkeeping().coin_counter_w(2, data & 0x04);
/* the 2 lamps near the camera */
- m_lamp[0] = BIT(data, 3);
- m_lamp[1] = BIT(data, 6);
+ m_lamps[0] = BIT(data, 3);
+ m_lamps[1] = BIT(data, 6);
/* shows the black and white photo from the camera */
output().set_value("photo", (data >> 7) & 1);
diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp
index be50f4ef35f..6954e966ff8 100644
--- a/src/mame/drivers/quantum.cpp
+++ b/src/mame/drivers/quantum.cpp
@@ -67,13 +67,13 @@ public:
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_avg(*this, "avg"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
void quantum(machine_config &config);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
DECLARE_READ16_MEMBER(trackball_r);
DECLARE_WRITE16_MEMBER(led_w);
DECLARE_READ8_MEMBER(input_1_r);
@@ -83,7 +83,7 @@ protected:
private:
required_device<cpu_device> m_maincpu;
required_device<avg_quantum_device> m_avg;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
@@ -133,8 +133,8 @@ WRITE16_MEMBER(quantum_state::led_w)
/* bit 3 = select second trackball for cocktail mode? */
/* bits 4 and 5 are LED controls */
- m_led[0] = BIT(data, 4);
- m_led[1] = BIT(data, 5);
+ m_leds[0] = BIT(data, 4);
+ m_leds[1] = BIT(data, 5);
/* bits 6 and 7 flip screen */
m_avg->set_flip_x (data & 0x40);
diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp
index 1f9a7d7b697..2f5e59f8956 100644
--- a/src/mame/drivers/quizshow.cpp
+++ b/src/mame/drivers/quizshow.cpp
@@ -46,7 +46,7 @@ public:
m_main_ram(*this, "main_ram"),
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_CUSTOM_INPUT_MEMBER(tape_headpos_r);
@@ -55,7 +55,7 @@ public:
void quizshow(machine_config &config);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void machine_reset() override;
virtual void video_start() override;
void mem_map(address_map &map);
@@ -81,7 +81,7 @@ private:
required_shared_ptr<uint8_t> m_main_ram;
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
- output_finder<11> m_lamp;
+ output_finder<11> m_lamps;
tilemap_t *m_tilemap;
uint32_t m_clocks;
@@ -146,7 +146,7 @@ WRITE8_MEMBER(quizshow_state::lamps1_w)
{
// d0-d3: P1 answer button lamps
for (int i = 0; i < 4; i++)
- m_lamp[i] = BIT(data, i);
+ m_lamps[i] = BIT(data, i);
// d4-d7: N/C
}
@@ -155,7 +155,7 @@ WRITE8_MEMBER(quizshow_state::lamps2_w)
{
// d0-d3: P2 answer button lamps
for (int i = 0; i < 4; i++)
- m_lamp[i + 4] = BIT(data, i);
+ m_lamps[i + 4] = BIT(data, i);
// d4-d7: N/C
}
@@ -163,8 +163,8 @@ WRITE8_MEMBER(quizshow_state::lamps2_w)
WRITE8_MEMBER(quizshow_state::lamps3_w)
{
// d0-d1: start button lamps
- m_lamp[8] = BIT(data, 0);
- m_lamp[9] = BIT(data, 1);
+ m_lamps[8] = BIT(data, 0);
+ m_lamps[9] = BIT(data, 1);
// d2-d3: unused? (chip is shared with tape_control_w)
// d4-d7: N/C
@@ -173,7 +173,7 @@ WRITE8_MEMBER(quizshow_state::lamps3_w)
WRITE8_MEMBER(quizshow_state::tape_control_w)
{
// d2: enable user category select (changes tape head position)
- m_lamp[10] = BIT(data, 2);
+ m_lamps[10] = BIT(data, 2);
m_category_enable = (data & 0xc) == 0xc;
// d3: tape motor
diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp
index 23725d49acf..55862b3c2a1 100644
--- a/src/mame/drivers/re900.cpp
+++ b/src/mame/drivers/re900.cpp
@@ -95,7 +95,7 @@ public:
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_rom(*this, "rom"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
// common
@@ -116,7 +116,7 @@ public:
void mem_prg(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
required_device<cpu_device> m_maincpu;
@@ -129,7 +129,7 @@ protected:
uint8_t m_ledant;
uint8_t m_player;
uint8_t m_stat_a;
- output_finder<84> m_lamp;
+ output_finder<84> m_lamps;
};
@@ -141,12 +141,12 @@ READ8_MEMBER(re900_state::re_psg_portA_r)
{
if ((ioport("IN0")->read() & 0x01) == 0)
{
- m_lamp[0] = 1; // Operator Key ON
+ m_lamps[0] = 1; // Operator Key ON
}
else
{
- m_lamp[0] = 0; // Operator Key OFF
+ m_lamps[0] = 0; // Operator Key OFF
}
return ioport("IN0")->read();
@@ -158,18 +158,18 @@ READ8_MEMBER(re900_state::re_psg_portB_r)
logerror("llamada a re_psg_portB_r\n");
/* This is a hack to select the active player due to Keyboard size restrictions */
- m_lamp[m_player] = 1;
+ m_lamps[m_player] = 1;
if (ioport("IN_S")->read())
{
if (!m_stat_a)
{
- m_lamp[1] = 0;
- m_lamp[2] = 0;
- m_lamp[3] = 0;
- m_lamp[4] = 0;
- m_lamp[5] = 0;
- m_lamp[6] = 0;
+ m_lamps[1] = 0;
+ m_lamps[2] = 0;
+ m_lamps[3] = 0;
+ m_lamps[4] = 0;
+ m_lamps[5] = 0;
+ m_lamps[6] = 0;
m_player++;
if (m_player == 7)
@@ -177,7 +177,7 @@ READ8_MEMBER(re900_state::re_psg_portB_r)
m_player = 1;
}
- m_lamp[m_player] = 1; /* It shows active player via layout buttons */
+ m_lamps[m_player] = 1; /* It shows active player via layout buttons */
m_stat_a = 1;
}
}
@@ -226,11 +226,11 @@ WRITE8_MEMBER(re900_state::re_mux_port_B_w)
if (data == 0x7f)
{
- m_lamp[20 + led] = 1;
+ m_lamps[20 + led] = 1;
if (led != m_ledant)
{
- m_lamp[20 + m_ledant] = 0;
+ m_lamps[20 + m_ledant] = 0;
m_ledant = led;
}
}
@@ -238,8 +238,8 @@ WRITE8_MEMBER(re900_state::re_mux_port_B_w)
WRITE8_MEMBER(re900_state::cpu_port_0_w)
{
-// m_lamp[7] = 1 ^ ( (data >> 4) & 1); /* Cont. Sal */
-// m_lamp[8] = 1 ^ ( (data >> 5) & 1); /* Cont. Ent */
+// m_lamps[7] = 1 ^ ( (data >> 4) & 1); /* Cont. Sal */
+// m_lamps[8] = 1 ^ ( (data >> 5) & 1); /* Cont. Ent */
}
WRITE8_MEMBER(re900_state::watchdog_reset_w)
diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp
index 2bc63699af9..2ec1caf4bd8 100644
--- a/src/mame/drivers/roul.cpp
+++ b/src/mame/drivers/roul.cpp
@@ -81,7 +81,7 @@ public:
m_maincpu(*this, "maincpu"),
m_soundcpu(*this, "soundcpu"),
m_soundlatch(*this, "soundlatch"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_READ8_MEMBER(blitter_status_r);
@@ -99,14 +99,14 @@ public:
void sound_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
required_device<generic_latch_8_device> m_soundlatch;
- output_finder<256> m_lamp;
+ output_finder<256> m_lamps;
uint8_t m_reg[0x10];
std::unique_ptr<uint8_t[]> m_videobuf;
@@ -206,8 +206,8 @@ WRITE8_MEMBER(roul_state::ball_w)
{
int lamp = data;
- m_lamp[data] = 1;
- m_lamp[m_lamp_old] = 0;
+ m_lamps[data] = 1;
+ m_lamps[m_lamp_old] = 0;
m_lamp_old = lamp;
}
diff --git a/src/mame/drivers/runaway.cpp b/src/mame/drivers/runaway.cpp
index ee67e5847f7..391c40ae474 100644
--- a/src/mame/drivers/runaway.cpp
+++ b/src/mame/drivers/runaway.cpp
@@ -38,7 +38,7 @@ TIMER_CALLBACK_MEMBER(runaway_state::interrupt_callback)
void runaway_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
m_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(runaway_state::interrupt_callback),this));
}
@@ -73,7 +73,7 @@ READ8_MEMBER(runaway_state::runaway_pot_r)
WRITE8_MEMBER(runaway_state::runaway_led_w)
{
- m_led[offset] = BIT(~data, 0);
+ m_leds[offset] = BIT(~data, 0);
}
diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp
index d93080fa35a..d1e2427b758 100644
--- a/src/mame/drivers/sderby.cpp
+++ b/src/mame/drivers/sderby.cpp
@@ -206,9 +206,9 @@ WRITE16_MEMBER(sderby_state::sderby_out_w)
x--- ---- End of Race lamp.
*/
- m_lamp[1] = BIT(data, 0); /* Lamp 1 - START */
- m_lamp[2] = BIT(data, 1); /* Lamp 2 - BET */
- m_lamp[3] = BIT(data, 15); /* Lamp 3 - END OF RACE */
+ m_lamps[0] = BIT(data, 0); /* Lamp 1 - START */
+ m_lamps[1] = BIT(data, 1); /* Lamp 2 - BET */
+ m_lamps[2] = BIT(data, 15); /* Lamp 3 - END OF RACE */
machine().bookkeeping().coin_counter_w(0, data & 0x2000);
}
@@ -251,13 +251,13 @@ WRITE16_MEMBER(sderby_state::scmatto_out_w)
--x- ---- Coin counter.
*/
- m_lamp[1] = BIT(data, 0); /* Lamp 1 - HOLD 1 */
- m_lamp[2] = BIT(data, 1); /* Lamp 2 - HOLD 2 */
- m_lamp[3] = BIT(data, 2); /* Lamp 3 - HOLD 3 */
- m_lamp[4] = BIT(data, 3); /* Lamp 4 - HOLD 4 */
- m_lamp[5] = BIT(data, 4); /* Lamp 5 - HOLD 5 */
- m_lamp[6] = BIT(data, 5); /* Lamp 6 - START */
- m_lamp[7] = BIT(data, 6); /* Lamp 7 - BET */
+ m_lamps[0] = BIT(data, 0); /* Lamp 1 - HOLD 1 */
+ m_lamps[1] = BIT(data, 1); /* Lamp 2 - HOLD 2 */
+ m_lamps[2] = BIT(data, 2); /* Lamp 3 - HOLD 3 */
+ m_lamps[3] = BIT(data, 3); /* Lamp 4 - HOLD 4 */
+ m_lamps[4] = BIT(data, 4); /* Lamp 5 - HOLD 5 */
+ m_lamps[5] = BIT(data, 5); /* Lamp 6 - START */
+ m_lamps[6] = BIT(data, 6); /* Lamp 7 - BET */
machine().bookkeeping().coin_counter_w(0, data & 0x2000);
}
@@ -287,8 +287,8 @@ WRITE16_MEMBER(sderby_state::roulette_out_w)
---- x--- Unknown (always activated).
*/
- m_lamp[1] = BIT(data, 0); /* Lamp 1 - START */
- m_lamp[2] = BIT(data, 1); /* Lamp 2 - BET */
+ m_lamps[0] = BIT(data, 0); /* Lamp 1 - START */
+ m_lamps[1] = BIT(data, 1); /* Lamp 2 - BET */
}
diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp
index 20a750d950d..8908aedab22 100644
--- a/src/mame/drivers/segahang.cpp
+++ b/src/mame/drivers/segahang.cpp
@@ -70,8 +70,8 @@ WRITE8_MEMBER( segahang_state::video_lamps_w )
m_segaic16vid->set_display_enable(data & 0x10);
// bits 2 & 3: control the lamps
- m_lamp[1] = BIT(data, 3);
- m_lamp[0] = BIT(data, 2);
+ m_lamps[1] = BIT(data, 3);
+ m_lamps[0] = BIT(data, 2);
// bits 0 & 1: update coin counters
machine().bookkeeping().coin_counter_w(1, data & 0x02);
diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp
index c8efe5fee28..530ee898b97 100644
--- a/src/mame/drivers/segas16a.cpp
+++ b/src/mame/drivers/segas16a.cpp
@@ -184,8 +184,8 @@ WRITE8_MEMBER( segas16a_state::misc_control_w )
// bits 2 & 3: control the lamps, allowing for overrides
if (((m_video_control ^ data) & 0x0c) && !m_lamp_changed_w.isnull())
m_lamp_changed_w(m_video_control ^ data, data);
- m_lamp[1] = BIT(data, 3);
- m_lamp[0] = BIT(data, 2);
+ m_lamps[1] = BIT(data, 3);
+ m_lamps[0] = BIT(data, 2);
m_video_control = data;
diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp
index 44192a0b9db..b14aa0594b2 100644
--- a/src/mame/drivers/segas16b.cpp
+++ b/src/mame/drivers/segas16b.cpp
@@ -1113,8 +1113,8 @@ WRITE16_MEMBER( segas16b_state::standard_io_w )
m_sprites->set_flip(data & 0x40);
if (!m_disable_screen_blanking)
m_segaic16vid->set_display_enable(data & 0x20);
- m_lamp[1] = BIT(data, 3);
- m_lamp[0] = BIT(data, 2);
+ m_lamps[1] = BIT(data, 3);
+ m_lamps[0] = BIT(data, 2);
machine().bookkeeping().coin_counter_w(1, data & 0x02);
machine().bookkeeping().coin_counter_w(0, data & 0x01);
return;
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index 596be93af90..d84924f4373 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -642,7 +642,7 @@ void segas32_upd7725_state::device_start()
void segas32_cd_state::device_start()
{
common_start(0);
- m_lamp.resolve();
+ m_lamps.resolve();
}
void sega_multi32_state::device_start()
@@ -2444,13 +2444,13 @@ segas32_upd7725_state::segas32_upd7725_state(const machine_config &mconfig, cons
WRITE8_MEMBER(segas32_cd_state::lamps1_w)
{
for (int i = 0; i < 8; i++)
- m_lamp[i] = BIT(data, i);
+ m_lamps[i] = BIT(data, i);
}
WRITE8_MEMBER(segas32_cd_state::lamps2_w)
{
for (int i = 0; i < 8; i++)
- m_lamp[8 + i] = BIT(data, i);
+ m_lamps[8 + i] = BIT(data, i);
}
WRITE_LINE_MEMBER(segas32_cd_state::scsi_irq_w)
@@ -2508,7 +2508,7 @@ DEFINE_DEVICE_TYPE(SEGA_S32_CD_DEVICE, segas32_cd_state, "segas32_pcb_cd", "Sega
segas32_cd_state::segas32_cd_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segas32_state(mconfig, SEGA_S32_CD_DEVICE, tag, owner, clock)
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{
}
diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp
index fce95e86f89..df648138f70 100644
--- a/src/mame/drivers/segaufo.cpp
+++ b/src/mame/drivers/segaufo.cpp
@@ -84,7 +84,7 @@ public:
m_upd(*this, "upd"),
m_counters(*this, "counter%u", 0U),
m_digits(*this, "digit%u", 0U),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
void ufomini(machine_config &config);
@@ -146,7 +146,7 @@ private:
optional_device<upd7759_device> m_upd;
output_finder<2 * 4> m_counters;
output_finder<2> m_digits;
- output_finder<28> m_lamp;
+ output_finder<28> m_lamps;
};
@@ -295,7 +295,7 @@ WRITE8_MEMBER(ufo_state::cp_lamps_w)
// d0-d3: p1/p2 button lamps
// other bits: ?
for (int i = 0; i < 4; i++)
- m_lamp[i] = BIT(~data, i);
+ m_lamps[i] = BIT(~data, i);
}
WRITE8_MEMBER(ufo_state::cp_digits_w)
@@ -334,8 +334,8 @@ WRITE8_MEMBER(ufo_state::ufo_lamps_w)
// 11 = red, red
// 01 = green, red
// 10 = red, green
- m_lamp[10] = data & 0x03;
- m_lamp[11] = (data >> 2) & 0x03;
+ m_lamps[10] = data & 0x03;
+ m_lamps[11] = (data >> 2) & 0x03;
// d4,d5: ?
// d6,d7: coincounters
@@ -402,7 +402,7 @@ WRITE8_MEMBER(ufo_state::ex_cp_lamps_w)
{
// d0,d1,d4,d5: p1/p2 button lamps
for (int i = 0; i < 4; i++)
- m_lamp[i] = BIT(~data, ((i&1) + (i&2) * 2));
+ m_lamps[i] = BIT(~data, ((i&1) + (i&2) * 2));
// d2,d3,d6,d7: p1/p2 coincounters
for (int i = 0; i < 4; i++)
@@ -433,7 +433,7 @@ WRITE8_MEMBER(ufo_state::ex_ufo800_lamps_w)
// d0-d4: 5 red leds on ufo
// other bits: ?
for (int i = 0; i < 5; i++)
- m_lamp[10 + i] = BIT(data, i);
+ m_lamps[10 + i] = BIT(data, i);
}
/* 315-5338A */
@@ -444,13 +444,13 @@ WRITE8_MEMBER(ufo_state::ex_ufo21_lamps1_w)
// d1-d6 are the 6 red leds on each ufo
// d7: ?
for (int i = 1; i < 7; i++)
- m_lamp[10 + i] = BIT(data, i);
+ m_lamps[10 + i] = BIT(data, i);
}
WRITE8_MEMBER(ufo_state::ex_ufo21_lamps2_w)
{
for (int i = 1; i < 7; i++)
- m_lamp[20 + i] = BIT(data, i);
+ m_lamps[20 + i] = BIT(data, i);
}
WRITE8_MEMBER(ufo_state::ex_upd_start_w)
@@ -749,7 +749,7 @@ void ufo_state::machine_start()
{
m_counters.resolve();
m_digits.resolve();
- m_lamp.resolve();
+ m_lamps.resolve();
// init/zerofill/register for savestates
static const float motor_speeds[4] =
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index a829eda3c1c..6c7361832cd 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -310,7 +310,7 @@ segaxbd_state::segaxbd_state(const machine_config &mconfig, device_type type, co
, m_io0_porta(*this, "IO0PORTA")
, m_adc_ports(*this, "ADC%u", 0)
, m_mux_ports(*this, "MUX%u", 0)
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{
memset(m_adc_reverse, 0, sizeof(m_adc_reverse));
palette_init();
@@ -322,7 +322,7 @@ void segaxbd_state::device_start()
if(!m_segaic16road->started())
throw device_missing_dependencies();
- m_lamp.resolve();
+ m_lamps.resolve();
// point globals to allocated memory regions
m_segaic16road->segaic16_roadram_0 = reinterpret_cast<uint16_t *>(memshare("roadram")->ptr());
@@ -690,10 +690,10 @@ void segaxbd_state::generic_iochip0_lamps_w(uint8_t data)
// d6: danger lamp
// in clone aburner, lamps work only in testmode?
- m_lamp[0] = BIT(data, 5);
- m_lamp[1] = BIT(data, 6);
- m_lamp[2] = BIT(data, 1);
- m_lamp[3] = BIT(data, 2);
+ m_lamps[0] = BIT(data, 5);
+ m_lamps[1] = BIT(data, 6);
+ m_lamps[2] = BIT(data, 1);
+ m_lamps[3] = BIT(data, 2);
}
diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp
index 02d86d8226e..c662af42f90 100644
--- a/src/mame/drivers/seta2.cpp
+++ b/src/mame/drivers/seta2.cpp
@@ -429,13 +429,13 @@ WRITE16_MEMBER(seta2_state::reelquak_leds_w)
{
if (ACCESSING_BITS_0_7)
{
- m_led[0] = BIT(data, 0); // start
- m_led[1] = BIT(data, 1); // small
- m_led[2] = BIT(data, 2); // bet
- m_led[3] = BIT(data, 3); // big
- m_led[4] = BIT(data, 4); // double up
- m_led[5] = BIT(data, 5); // collect
- m_led[6] = BIT(data, 6); // bet cancel
+ m_leds[0] = BIT(data, 0); // start
+ m_leds[1] = BIT(data, 1); // small
+ m_leds[2] = BIT(data, 2); // bet
+ m_leds[3] = BIT(data, 3); // big
+ m_leds[4] = BIT(data, 4); // double up
+ m_leds[5] = BIT(data, 5); // collect
+ m_leds[6] = BIT(data, 6); // bet cancel
}
if (ACCESSING_BITS_8_15)
{
@@ -557,9 +557,9 @@ WRITE16_MEMBER(staraudi_state::staraudi_lamps1_w)
COMBINE_DATA(&m_lamps1);
if (ACCESSING_BITS_0_7)
{
- m_led[0] = BIT(data, 0); // Lamp 1 |
- m_led[1] = BIT(data, 1); // Lamp 2 |- Camera Lamps
- m_led[2] = BIT(data, 2); // Lamp 3 |
+ m_leds[0] = BIT(data, 0); // Lamp 1 |
+ m_leds[1] = BIT(data, 1); // Lamp 2 |- Camera Lamps
+ m_leds[2] = BIT(data, 2); // Lamp 3 |
// data & 0x0008 ); // Degauss
}
staraudi_debug_outputs();
@@ -571,8 +571,8 @@ WRITE16_MEMBER(staraudi_state::staraudi_lamps2_w)
if (ACCESSING_BITS_0_7)
{
// data & 0x0020 ); // ? Always On
- m_led[3] = BIT(data, 6); // 2P Switch Lamp
- m_led[4] = BIT(data, 7); // 1P Switch Lamp
+ m_leds[3] = BIT(data, 6); // 2P Switch Lamp
+ m_leds[4] = BIT(data, 7); // 1P Switch Lamp
}
staraudi_debug_outputs();
}
@@ -652,14 +652,14 @@ WRITE16_MEMBER(seta2_state::telpacfl_lamp1_w)
{
if (ACCESSING_BITS_0_7)
{
- m_lamp[0] = BIT(data, 0); //
- m_lamp[1] = BIT(data, 1); //
- m_lamp[2] = BIT(data, 2); //
- m_lamp[3] = BIT(data, 3); //
- m_lamp[4] = BIT(data, 4); //
- m_lamp[5] = BIT(data, 5); //
- m_lamp[6] = BIT(data, 6); //
- m_lamp[7] = BIT(data, 7); //
+ m_lamps[0] = BIT(data, 0); //
+ m_lamps[1] = BIT(data, 1); //
+ m_lamps[2] = BIT(data, 2); //
+ m_lamps[3] = BIT(data, 3); //
+ m_lamps[4] = BIT(data, 4); //
+ m_lamps[5] = BIT(data, 5); //
+ m_lamps[6] = BIT(data, 6); //
+ m_lamps[7] = BIT(data, 7); //
}
// popmessage("LAMP1 %04X", data);
@@ -669,9 +669,9 @@ WRITE16_MEMBER(seta2_state::telpacfl_lamp2_w)
{
if (ACCESSING_BITS_0_7)
{
- m_lamp[8] = BIT(data, 0); // on/off lamp (throughout)
- m_lamp[9] = BIT(data, 1); // bet lamp
- m_lamp[10] = BIT(data, 2); // payout lamp
+ m_lamps[8] = BIT(data, 0); // on/off lamp (throughout)
+ m_lamps[9] = BIT(data, 1); // bet lamp
+ m_lamps[10] = BIT(data, 2); // payout lamp
m_dispenser->motor_w( data & 0x0008 ); // coin out motor
machine().bookkeeping().coin_counter_w(0, data & 0x0010); // coin out counter
// data & 0x0020 ); // on credit increase
@@ -994,14 +994,14 @@ WRITE16_MEMBER(funcube_state::funcube_leds_w)
{
*m_funcube_leds = data;
- m_led[0] = BIT(~data, 0); // win lamp (red)
- m_led[1] = BIT(~data, 1); // win lamp (green)
+ m_leds[0] = BIT(~data, 0); // win lamp (red)
+ m_leds[1] = BIT(~data, 1); // win lamp (green)
// Set in a moving pattern: 0111 -> 1011 -> 1101 -> 1110
- m_led[2] = BIT(~data, 4);
- m_led[3] = BIT(~data, 5);
- m_led[4] = BIT(~data, 6);
- m_led[5] = BIT(~data, 7);
+ m_leds[2] = BIT(~data, 4);
+ m_leds[3] = BIT(~data, 5);
+ m_leds[4] = BIT(~data, 6);
+ m_leds[5] = BIT(~data, 7);
funcube_debug_outputs();
}
@@ -1024,7 +1024,7 @@ WRITE16_MEMBER(funcube_state::funcube_outputs_w)
// Bit 1: high on pay out
// Bit 3: low after coining up, blinks on pay out
- m_led[6] = BIT(~data, 3);
+ m_leds[6] = BIT(~data, 3);
funcube_debug_outputs();
}
diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp
index 6ee05fbe6e3..4e7dd7383e6 100644
--- a/src/mame/drivers/sfbonus.cpp
+++ b/src/mame/drivers/sfbonus.cpp
@@ -298,7 +298,7 @@ public:
m_2c01_regs(*this, "2c01_regs"),
m_3000_regs(*this, "3000_regs"),
m_3800_regs(*this, "3800_regs"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(sfbonus_videoram_w);
@@ -450,7 +450,7 @@ public:
void sfbonus_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void machine_reset() override;
virtual void video_start() override;
@@ -478,7 +478,7 @@ protected:
std::unique_ptr<uint8_t[]> m_reel3_ram;
std::unique_ptr<uint8_t[]> m_reel4_ram;
std::unique_ptr<uint8_t[]> m_videoram;
- output_finder<6> m_lamp;
+ output_finder<6> m_lamps;
};
@@ -1193,22 +1193,22 @@ uint32_t sfbonus_state::screen_update_sfbonus(screen_device &screen, bitmap_ind1
|| (ipt == INPUT_PORTS_NAME(amcoe2_poker)))
{
// based on pirpok2
- m_lamp[0] = BIT(m_1800_regs[6], 0);
- m_lamp[1] = BIT(m_1800_regs[6], 2);
- m_lamp[2] = BIT(m_1800_regs[5], 2);
- m_lamp[3] = BIT(m_1800_regs[5], 0);
- m_lamp[4] = BIT(m_1800_regs[4], 2);
- m_lamp[5] = BIT(m_1800_regs[4], 0);
+ m_lamps[0] = BIT(m_1800_regs[6], 0);
+ m_lamps[1] = BIT(m_1800_regs[6], 2);
+ m_lamps[2] = BIT(m_1800_regs[5], 2);
+ m_lamps[3] = BIT(m_1800_regs[5], 0);
+ m_lamps[4] = BIT(m_1800_regs[4], 2);
+ m_lamps[5] = BIT(m_1800_regs[4], 0);
}
else if ((ipt == INPUT_PORTS_NAME(amcoe1_reels3)) || (ipt == INPUT_PORTS_NAME(amcoe1_reels4))
|| (ipt == INPUT_PORTS_NAME(amcoe1_poker)))
{
- m_lamp[0] = BIT(m_1800_regs[0], 1);
- m_lamp[1] = BIT(m_1800_regs[4], 1);
- m_lamp[2] = BIT(m_1800_regs[3], 1);
- m_lamp[3] = BIT(m_1800_regs[6], 2);
- m_lamp[4] = BIT(m_1800_regs[4], 2);
- m_lamp[5] = BIT(m_1800_regs[3], 2);
+ m_lamps[0] = BIT(m_1800_regs[0], 1);
+ m_lamps[1] = BIT(m_1800_regs[4], 1);
+ m_lamps[2] = BIT(m_1800_regs[3], 1);
+ m_lamps[3] = BIT(m_1800_regs[6], 2);
+ m_lamps[4] = BIT(m_1800_regs[4], 2);
+ m_lamps[5] = BIT(m_1800_regs[3], 2);
}
return 0;
diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp
index 055e8801348..87ca1f24ff5 100644
--- a/src/mame/drivers/sigmab98.cpp
+++ b/src/mame/drivers/sigmab98.cpp
@@ -150,7 +150,7 @@ public:
m_spriteram(*this, "spriteram"),
m_vregs(*this, "vregs"),
m_vtable(*this, "vtable"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(gegege_regs_w);
@@ -281,7 +281,7 @@ public:
void tdoboon_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
virtual void video_start() override;
// Required devices
@@ -301,7 +301,7 @@ protected:
optional_shared_ptr<uint8_t> m_spriteram; // optional as some games allocate it themselves (due to banking)
optional_shared_ptr<uint8_t> m_vregs; // optional as some games allocate it themselves (due to banking)
optional_shared_ptr<uint8_t> m_vtable; // optional as some games allocate it themselves (due to banking)
- output_finder<8> m_led;
+ output_finder<8> m_leds;
std::vector<uint8_t> m_paletteram;
@@ -964,7 +964,7 @@ WRITE8_MEMBER(sigmab98_state::eeprom_w)
// 10 led?
WRITE8_MEMBER(sigmab98_state::c4_w)
{
- m_led[0] = BIT(data, 4);
+ m_leds[0] = BIT(data, 4);
m_c4 = data;
show_outputs();
@@ -985,8 +985,8 @@ WRITE8_MEMBER(sigmab98_state::c6_w)
if ((data & 0x08) && !(m_c6 & 0x08))
m_buffered_spriteram->copy();
- m_led[1] = BIT(data, 4);
- m_led[2] = BIT(data, 5);
+ m_leds[1] = BIT(data, 4);
+ m_leds[2] = BIT(data, 5);
m_c6 = data;
show_outputs();
@@ -1207,10 +1207,10 @@ WRITE8_MEMBER(lufykzku_state::lufykzku_c6_w)
// machine().bookkeeping().coin_counter_w(2, data & 0x02); // (unused coin in)
machine().bookkeeping().coin_counter_w(0, data & 0x04); // medal in
machine().bookkeeping().coin_counter_w(3, data & 0x08); // medal out
- m_led[0] = BIT(data, 4); // button led
-// m_led[1] = BIT(data, 5); // (unused button led)
-// m_led[2] = BIT(data, 6); // (unused button led)
-// m_led[3] = BIT(data, 7); // (unused button led)
+ m_leds[0] = BIT(data, 4); // button led
+// m_leds[1] = BIT(data, 5); // (unused button led)
+// m_leds[2] = BIT(data, 6); // (unused button led)
+// m_leds[3] = BIT(data, 7); // (unused button led)
m_c6 = data;
show_outputs();
@@ -1451,7 +1451,7 @@ READ8_MEMBER(sigmab98_state::sammymdl_leds_r)
}
WRITE8_MEMBER(sigmab98_state::sammymdl_leds_w)
{
- m_led[0] = BIT(data, 0); // button
+ m_leds[0] = BIT(data, 0); // button
m_out[1] = data;
show_3_outputs();
@@ -1783,10 +1783,10 @@ void sigmab98_state::gocowboy_map(address_map &map)
WRITE8_MEMBER(sigmab98_state::gocowboy_leds_w)
{
- m_led[0] = BIT(data, 0); // button
- m_led[1] = BIT(data, 1); // coin lockout? (after coining up, but not for service coin)
- m_led[2] = BIT(data, 2); // ? long after a prize is not collected
- m_led[3] = BIT(data, 3); // ? "don't forget the large prizes"
+ m_leds[0] = BIT(data, 0); // button
+ m_leds[1] = BIT(data, 1); // coin lockout? (after coining up, but not for service coin)
+ m_leds[2] = BIT(data, 2); // ? long after a prize is not collected
+ m_leds[3] = BIT(data, 3); // ? "don't forget the large prizes"
// 10 hopper enable?
// 20 hopper motor on (active low)?
@@ -2011,14 +2011,14 @@ WRITE8_MEMBER(sigmab98_state::haekaka_b000_w)
WRITE8_MEMBER(sigmab98_state::haekaka_leds_w)
{
// All used
- m_led[0] = BIT(data, 0);
- m_led[1] = BIT(data, 1);
- m_led[2] = BIT(data, 2);
- m_led[3] = BIT(data, 3);
- m_led[4] = BIT(data, 4);
- m_led[5] = BIT(data, 5);
- m_led[6] = BIT(data, 6);
- m_led[7] = BIT(data, 7);
+ m_leds[0] = BIT(data, 0);
+ m_leds[1] = BIT(data, 1);
+ m_leds[2] = BIT(data, 2);
+ m_leds[3] = BIT(data, 3);
+ m_leds[4] = BIT(data, 4);
+ m_leds[5] = BIT(data, 5);
+ m_leds[6] = BIT(data, 6);
+ m_leds[7] = BIT(data, 7);
m_out[1] = data;
show_3_outputs();
diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp
index d87fee84ae8..200a362bd39 100644
--- a/src/mame/drivers/skykid.cpp
+++ b/src/mame/drivers/skykid.cpp
@@ -62,8 +62,8 @@ READ8_MEMBER(skykid_state::inputport_r)
WRITE8_MEMBER(skykid_state::skykid_led_w)
{
- m_led[0] = BIT(data, 3);
- m_led[1] = BIT(data, 4);
+ m_leds[0] = BIT(data, 3);
+ m_leds[1] = BIT(data, 4);
}
WRITE8_MEMBER(skykid_state::skykid_subreset_w)
@@ -95,7 +95,7 @@ WRITE8_MEMBER(skykid_state::skykid_irq_2_ctrl_w)
void skykid_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
/* configure the banks */
membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x2000);
diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp
index 697db06f3b8..bd7ecc01b1a 100644
--- a/src/mame/drivers/skylncr.cpp
+++ b/src/mame/drivers/skylncr.cpp
@@ -157,7 +157,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
m_hopper(*this, "hopper"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 1U)
{ }
DECLARE_WRITE8_MEMBER(skylncr_videoram_w);
@@ -202,7 +202,7 @@ public:
void ramdac_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
tilemap_t *m_tmap;
@@ -230,7 +230,7 @@ protected:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_device<ticket_dispenser_device> m_hopper;
- output_finder<8> m_lamp;
+ output_finder<7> m_lamps;
};
@@ -435,13 +435,13 @@ WRITE8_MEMBER(skylncr_state::skylncr_nmi_enable_w)
WRITE8_MEMBER(skylncr_state::mbutrfly_prot_w)
{
- m_lamp[1] = BIT(data, 0); // Slot Stop 2
- m_lamp[2] = BIT(data, 1); // Slot Stop 1
- m_lamp[3] = BIT(data, 2); // Take
- m_lamp[4] = BIT(data, 3); // Bet
- m_lamp[5] = BIT(data, 4); // Slot Stop 3
- m_lamp[6] = BIT(data, 5); // Start
- m_lamp[7] = BIT(data, 6); // Payout
+ m_lamps[0] = BIT(data, 0); // Slot Stop 2
+ m_lamps[1] = BIT(data, 1); // Slot Stop 1
+ m_lamps[2] = BIT(data, 2); // Take
+ m_lamps[3] = BIT(data, 3); // Bet
+ m_lamps[4] = BIT(data, 4); // Slot Stop 3
+ m_lamps[5] = BIT(data, 5); // Start
+ m_lamps[6] = BIT(data, 6); // Payout
m_mbutrfly_prot = BIT(data, 7);
}
diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp
index 9d7bb60df2f..a9cb2660a0b 100644
--- a/src/mame/drivers/smsmcorp.cpp
+++ b/src/mame/drivers/smsmcorp.cpp
@@ -231,7 +231,7 @@ public:
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_screen(*this, "screen"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(bankswitch_w);
@@ -263,7 +263,7 @@ protected:
uint8_t m_vid_regs[7];
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
- output_finder<10> m_lamp;
+ output_finder<10> m_lamps;
};
@@ -415,20 +415,20 @@ READ8_MEMBER(smsmfg_state::ppi0_c_r)
WRITE8_MEMBER(smsmfg_state::ppi0_a_w)
{
//popmessage("Lamps: %d %d %d %d %d %d %d", BIT(data,7), BIT(data,6), BIT(data,5), BIT(data,4), BIT(data,3), BIT(data,2), BIT(data,1) );
- m_lamp[0] = BIT(~data, 7); /* Display Light 1 */
- m_lamp[1] = BIT(~data, 6); /* Display Light 2 */
- m_lamp[2] = BIT(~data, 5); /* Display Light 3 */
- m_lamp[3] = BIT(~data, 4); /* Display Light 4 */
- m_lamp[4] = BIT(~data, 3); /* Display Light 5 */
- m_lamp[5] = BIT(~data, 2); /* Bet Light */
- m_lamp[6] = BIT(~data, 1); /* Deal Light */
- m_lamp[7] = BIT(~data, 0); /* Draw Light */
+ m_lamps[0] = BIT(~data, 7); /* Display Light 1 */
+ m_lamps[1] = BIT(~data, 6); /* Display Light 2 */
+ m_lamps[2] = BIT(~data, 5); /* Display Light 3 */
+ m_lamps[3] = BIT(~data, 4); /* Display Light 4 */
+ m_lamps[4] = BIT(~data, 3); /* Display Light 5 */
+ m_lamps[5] = BIT(~data, 2); /* Bet Light */
+ m_lamps[6] = BIT(~data, 1); /* Deal Light */
+ m_lamps[7] = BIT(~data, 0); /* Draw Light */
}
WRITE8_MEMBER(smsmfg_state::ppi0_b_w)
{
- m_lamp[8] = BIT(~data, 7); /* Stand Light */
- m_lamp[9] = BIT(~data, 6); /* Cancel Light */
+ m_lamps[8] = BIT(~data, 7); /* Stand Light */
+ m_lamps[9] = BIT(~data, 6); /* Cancel Light */
machine().bookkeeping().coin_counter_w(0, BIT(data,1));
machine().bookkeeping().coin_lockout_w(0, BIT(data,5));
@@ -530,7 +530,7 @@ void smsmfg_state::sub_map(address_map &map)
void smsmfg_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
membank("bank1")->configure_entries(0, 16, memregion("questions")->base(), 0x4000);
save_item(NAME(m_communication_port_status));
@@ -539,7 +539,7 @@ void smsmfg_state::machine_start()
MACHINE_START_MEMBER(smsmfg_state,sureshot)
{
- m_lamp.resolve();
+ m_lamps.resolve();
save_item(NAME(m_communication_port_status));
save_item(NAME(m_communication_port));
}
diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp
index 2413e11431d..72cb2d38998 100644
--- a/src/mame/drivers/snookr10.cpp
+++ b/src/mame/drivers/snookr10.cpp
@@ -698,13 +698,13 @@ WRITE8_MEMBER(snookr10_state::output_port_0_w)
m_bit4 = m_outporth & 1;
m_bit5 = (m_outporth >> 1) & 1;
- m_lamp[0] = m_bit5; /* Lamp 0 - START */
- m_lamp[1] = m_bit2; /* Lamp 1 - CANCEL */
- m_lamp[2] = m_bit0; /* Lamp 2 - STOP1 */
- m_lamp[3] = m_bit1; /* Lamp 3 - STOP2 */
- m_lamp[4] = m_bit0; /* Lamp 4 - STOP3 */
- m_lamp[5] = m_bit3; /* Lamp 5 - STOP4 */
- m_lamp[6] = m_bit4; /* Lamp 6 - STOP5 */
+ m_lamps[0] = m_bit5; /* Lamp 0 - START */
+ m_lamps[1] = m_bit2; /* Lamp 1 - CANCEL */
+ m_lamps[2] = m_bit0; /* Lamp 2 - STOP1 */
+ m_lamps[3] = m_bit1; /* Lamp 3 - STOP2 */
+ m_lamps[4] = m_bit0; /* Lamp 4 - STOP3 */
+ m_lamps[5] = m_bit3; /* Lamp 5 - STOP4 */
+ m_lamps[6] = m_bit4; /* Lamp 6 - STOP5 */
machine().bookkeeping().coin_counter_w(0, data & 0x01); /* Coin in */
machine().bookkeeping().coin_counter_w(1, data & 0x10); /* Key in */
@@ -739,13 +739,13 @@ WRITE8_MEMBER(snookr10_state::output_port_1_w)
m_bit4 = data & 1;
m_bit5 = (data >> 1) & 1;
- m_lamp[0] = m_bit5; /* Lamp 0 - START */
- m_lamp[1] = m_bit2; /* Lamp 1 - CANCEL */
- m_lamp[2] = m_bit0; /* Lamp 2 - STOP1 */
- m_lamp[3] = m_bit1; /* Lamp 3 - STOP2 */
- m_lamp[4] = m_bit0; /* Lamp 4 - STOP3 */
- m_lamp[5] = m_bit3; /* Lamp 5 - STOP4 */
- m_lamp[6] = m_bit4; /* Lamp 6 - STOP5 */
+ m_lamps[0] = m_bit5; /* Lamp 0 - START */
+ m_lamps[1] = m_bit2; /* Lamp 1 - CANCEL */
+ m_lamps[2] = m_bit0; /* Lamp 2 - STOP1 */
+ m_lamps[3] = m_bit1; /* Lamp 3 - STOP2 */
+ m_lamps[4] = m_bit0; /* Lamp 4 - STOP3 */
+ m_lamps[5] = m_bit3; /* Lamp 5 - STOP4 */
+ m_lamps[6] = m_bit4; /* Lamp 6 - STOP5 */
}
diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp
index 0bb5a31ed14..c1580d18c42 100644
--- a/src/mame/drivers/softbox.cpp
+++ b/src/mame/drivers/softbox.cpp
@@ -295,9 +295,9 @@ WRITE8_MEMBER( softbox_state::ppi1_pc_w )
*/
- m_led[LED_A] = BIT(~data, 0);
- m_led[LED_B] = BIT(~data, 1);
- m_led[LED_READY] = BIT(~data, 2);
+ m_leds[LED_A] = BIT(~data, 0);
+ m_leds[LED_B] = BIT(~data, 1);
+ m_leds[LED_READY] = BIT(~data, 2);
}
static DEVICE_INPUT_DEFAULTS_START( terminal )
@@ -321,7 +321,7 @@ DEVICE_INPUT_DEFAULTS_END
void softbox_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
}
diff --git a/src/mame/drivers/spcforce.cpp b/src/mame/drivers/spcforce.cpp
index db064b9d2ba..e0425fa9ba4 100644
--- a/src/mame/drivers/spcforce.cpp
+++ b/src/mame/drivers/spcforce.cpp
@@ -48,7 +48,7 @@ TODO:
void spcforce_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
save_item(NAME(m_sn76496_latch));
save_item(NAME(m_sn76496_select));
@@ -110,9 +110,9 @@ WRITE8_MEMBER(spcforce_state::soundtrigger_w)
WRITE8_MEMBER(spcforce_state::misc_outputs_w)
{
- m_lamp[0] = BIT(data, 0); // 1P start lamp
+ m_lamps[0] = BIT(data, 0); // 1P start lamp
machine().bookkeeping().coin_counter_w(0, BIT(data, 1));
- m_lamp[1] = BIT(data, 2); // 2P start lamp
+ m_lamps[1] = BIT(data, 2); // 2P start lamp
machine().bookkeeping().coin_counter_w(1, BIT(data, 3));
}
diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp
index 26c6e4f12fa..41264a5ec3c 100644
--- a/src/mame/drivers/spoker.cpp
+++ b/src/mame/drivers/spoker.cpp
@@ -50,7 +50,7 @@ public:
m_bg_tile_ram(*this, "bg_tile_ram"),
m_fg_tile_ram(*this, "fg_tile_ram"),
m_fg_color_ram(*this, "fg_color_ram"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
required_device<cpu_device> m_maincpu;
@@ -65,7 +65,7 @@ public:
required_shared_ptr<uint8_t> m_fg_color_ram;
tilemap_t *m_fg_tilemap;
- output_finder<7> m_led;
+ output_finder<7> m_leds;
// common
int m_nmi_ack;
@@ -189,7 +189,7 @@ WRITE8_MEMBER(spoker_state::nmi_and_coins_w)
machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in
machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin out mech
- m_led[6] = BIT(data, 6); // led for coin out / hopper active
+ m_leds[6] = BIT(data, 6); // led for coin out / hopper active
if(((m_nmi_ack & 0x80) == 0) && data & 0x80)
m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
@@ -202,8 +202,8 @@ WRITE8_MEMBER(spoker_state::nmi_and_coins_w)
WRITE8_MEMBER(spoker_state::video_and_leds_w)
{
- m_led[4] = BIT(data, 0); // start?
- m_led[5] = BIT(data, 2); // l_bet?
+ m_leds[4] = BIT(data, 0); // start?
+ m_leds[5] = BIT(data, 2); // l_bet?
m_video_enable = data & 0x40;
m_hopper = (~data)& 0x80;
@@ -214,10 +214,10 @@ WRITE8_MEMBER(spoker_state::video_and_leds_w)
WRITE8_MEMBER(spoker_state::leds_w)
{
- m_led[0] = BIT(data, 0); // stop_1
- m_led[1] = BIT(data, 1); // stop_2
- m_led[2] = BIT(data, 2); // stop_3
- m_led[3] = BIT(data, 3); // stop
+ m_leds[0] = BIT(data, 0); // stop_1
+ m_leds[1] = BIT(data, 1); // stop_2
+ m_leds[2] = BIT(data, 2); // stop_3
+ m_leds[3] = BIT(data, 3); // stop
// data & 0x10?
m_out[2] = data;
@@ -582,7 +582,7 @@ GFXDECODE_END
void spoker_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_nmi_ack));
save_item(NAME(m_out));
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 463a9de11a2..4b1c38acc08 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -95,7 +95,7 @@ public:
, m_screen(*this, "screen")
, m_palette(*this, "palette")
, m_hopper(*this, "hopper")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(ss9601_byte_lo_w);
@@ -189,7 +189,7 @@ public:
void xtrain_io(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
layer_t m_layers[2];
uint8_t m_ss9601_byte_lo;
@@ -211,7 +211,7 @@ protected:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
optional_device<ticket_dispenser_device> m_hopper;
- output_finder<9> m_led;
+ output_finder<9> m_leds;
private:
inline void ss9601_get_tile_info(layer_t *l, tile_data &tileinfo, tilemap_memory_index tile_index);
@@ -997,20 +997,20 @@ WRITE16_MEMBER(subsino2_state::new2001_outputs_w)
case 0:
if (ACCESSING_BITS_8_15)
{
- m_led[0] = BIT(data, 14); // record?
- m_led[1] = BIT(data, 13); // shoot now
- m_led[2] = BIT(data, 12); // double
- m_led[3] = BIT(data, 11); // black/red
+ m_leds[0] = BIT(data, 14); // record?
+ m_leds[1] = BIT(data, 13); // shoot now
+ m_leds[2] = BIT(data, 12); // double
+ m_leds[3] = BIT(data, 11); // black/red
}
if (ACCESSING_BITS_0_7)
{
- m_led[4] = BIT(data, 7); // start
- m_led[5] = BIT(data, 6); // take
- m_led[6] = BIT(data, 5); // black/red
+ m_leds[4] = BIT(data, 7); // start
+ m_leds[5] = BIT(data, 6); // take
+ m_leds[6] = BIT(data, 5); // black/red
machine().bookkeeping().coin_counter_w(0, data & 0x0010); // coin in / key in
- m_led[7] = BIT(data, 2); // ?
- m_led[8] = BIT(data, 1); // ?
+ m_leds[7] = BIT(data, 2); // ?
+ m_leds[8] = BIT(data, 1); // ?
}
break;
}
@@ -1092,15 +1092,15 @@ WRITE16_MEMBER(subsino2_state::humlan_outputs_w)
case 0:
if (ACCESSING_BITS_8_15)
{
- m_led[5] = BIT(data, 13); // big or small
- m_led[4] = BIT(data, 10); // double
- m_led[3] = BIT(data, 9); // big or small
- m_led[2] = BIT(data, 8); // bet
+ m_leds[5] = BIT(data, 13); // big or small
+ m_leds[4] = BIT(data, 10); // double
+ m_leds[3] = BIT(data, 9); // big or small
+ m_leds[2] = BIT(data, 8); // bet
}
if (ACCESSING_BITS_0_7)
{
- m_led[1] = BIT(data, 7); // take
- m_led[0] = BIT(data, 6); // start
+ m_leds[1] = BIT(data, 7); // take
+ m_leds[0] = BIT(data, 6); // start
machine().bookkeeping().coin_counter_w(1, data & 0x0004); // key in
machine().bookkeeping().coin_counter_w(0, data & 0x0002); // coin in
}
@@ -1131,21 +1131,21 @@ WRITE8_MEMBER(subsino2_state::expcard_outputs_w)
break;
case 1: // C
- m_led[0] = BIT(data, 1); // raise
+ m_leds[0] = BIT(data, 1); // raise
break;
case 2: // B
- m_led[1] = BIT(data, 2); // hold 4 / small & hold 5 / big ?
- m_led[2] = BIT(data, 3); // hold 1 / bet
- m_led[3] = BIT(data, 4); // hold 2 / take ?
- m_led[4] = BIT(data, 5); // hold 3 / double up ?
+ m_leds[1] = BIT(data, 2); // hold 4 / small & hold 5 / big ?
+ m_leds[2] = BIT(data, 3); // hold 1 / bet
+ m_leds[3] = BIT(data, 4); // hold 2 / take ?
+ m_leds[4] = BIT(data, 5); // hold 3 / double up ?
break;
case 3: // A
machine().bookkeeping().coin_counter_w(0, data & 0x01 ); // coin in
machine().bookkeeping().coin_counter_w(1, data & 0x02 ); // key in
- m_led[5] = BIT(data, 4); // start
+ m_leds[5] = BIT(data, 4); // start
break;
}
@@ -1170,11 +1170,11 @@ WRITE8_MEMBER(subsino2_state::mtrain_outputs_w)
break;
case 1:
- m_led[0] = BIT(data, 0); // stop reel?
- m_led[1] = BIT(data, 1); // stop reel? (double or take)
- m_led[2] = BIT(data, 2); // start all
- m_led[3] = BIT(data, 3); // bet / stop all
- m_led[4] = BIT(data, 5); // stop reel? (double or take)
+ m_leds[0] = BIT(data, 0); // stop reel?
+ m_leds[1] = BIT(data, 1); // stop reel? (double or take)
+ m_leds[2] = BIT(data, 2); // start all
+ m_leds[3] = BIT(data, 3); // bet / stop all
+ m_leds[4] = BIT(data, 5); // stop reel? (double or take)
break;
case 2:
@@ -1385,22 +1385,22 @@ WRITE8_MEMBER(subsino2_state::xplan_outputs_w)
break;
case 1:
- m_led[0] = BIT(data, 1); // raise
+ m_leds[0] = BIT(data, 1); // raise
break;
case 2: // B
- m_led[1] = BIT(data, 2); // hold 1 / big ?
- m_led[2] = BIT(data, 3); // hold 5 / bet
- m_led[3] = BIT(data, 4); // hold 4 ?
- m_led[4] = BIT(data, 5); // hold 2 / double up
- m_led[5] = BIT(data, 6); // hold 3 / small ?
+ m_leds[1] = BIT(data, 2); // hold 1 / big ?
+ m_leds[2] = BIT(data, 3); // hold 5 / bet
+ m_leds[3] = BIT(data, 4); // hold 4 ?
+ m_leds[4] = BIT(data, 5); // hold 2 / double up
+ m_leds[5] = BIT(data, 6); // hold 3 / small ?
break;
case 3: // A
machine().bookkeeping().coin_counter_w(0, data & 0x01 );
machine().bookkeeping().coin_counter_w(1, data & 0x02 );
- m_led[6] = BIT(data, 4); // start / take
+ m_leds[6] = BIT(data, 4); // start / take
break;
}
@@ -1489,23 +1489,23 @@ WRITE8_MEMBER(subsino2_state::xtrain_outputs_w)
break;
case 1: // C
- m_led[0] = BIT(data, 1); // re-double
- m_led[1] = BIT(data, 2); // half double
+ m_leds[0] = BIT(data, 1); // re-double
+ m_leds[1] = BIT(data, 2); // half double
break;
case 2: // B
- m_led[2] = BIT(data, 1); // hold 3 / small
- m_led[3] = BIT(data, 2); // hold 2 / big
- m_led[4] = BIT(data, 3); // bet
- m_led[5] = BIT(data, 4); // hold1 / take
- m_led[6] = BIT(data, 5); // double up
+ m_leds[2] = BIT(data, 1); // hold 3 / small
+ m_leds[3] = BIT(data, 2); // hold 2 / big
+ m_leds[4] = BIT(data, 3); // bet
+ m_leds[5] = BIT(data, 4); // hold1 / take
+ m_leds[6] = BIT(data, 5); // double up
break;
case 3: // A
machine().bookkeeping().coin_counter_w(0, data & 0x01 ); // coin in
machine().bookkeeping().coin_counter_w(1, data & 0x02 ); // key in
- m_led[7] = BIT(data, 4); // start
+ m_leds[7] = BIT(data, 4); // start
break;
}
diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp
index 094a22519c2..4bffc8a9a42 100644
--- a/src/mame/drivers/suna16.cpp
+++ b/src/mame/drivers/suna16.cpp
@@ -59,10 +59,10 @@ WRITE16_MEMBER(suna16_state::bssoccer_leds_w)
{
if (ACCESSING_BITS_0_7)
{
- m_led[0] = BIT(data, 0);
- m_led[1] = BIT(data, 1);
- m_led[2] = BIT(data, 2);
- m_led[3] = BIT(data, 3);
+ m_leds[0] = BIT(data, 0);
+ m_leds[1] = BIT(data, 1);
+ m_leds[2] = BIT(data, 2);
+ m_leds[3] = BIT(data, 3);
machine().bookkeeping().coin_counter_w(0, data & 0x10);
}
if (data & ~0x1f) logerror("CPU#0 PC %06X - Leds unknown bits: %04X\n", m_maincpu->pc(), data);
@@ -74,8 +74,8 @@ WRITE16_MEMBER(suna16_state::uballoon_leds_w)
if (ACCESSING_BITS_0_7)
{
machine().bookkeeping().coin_counter_w(0, data & 0x01);
- m_led[0] = BIT(data, 1);
- m_led[1] = BIT(data, 2);
+ m_leds[0] = BIT(data, 1);
+ m_leds[1] = BIT(data, 2);
}
if (data & ~0x07) logerror("CPU#0 PC %06X - Leds unknown bits: %04X\n", m_maincpu->pc(), data);
}
@@ -309,7 +309,7 @@ void suna16_state::bestbest_sound_map(address_map &map)
MACHINE_START_MEMBER(suna16_state, bssoccer)
{
- m_led.resolve();
+ m_leds.resolve();
m_bank1->configure_entries(0, 8, memregion("pcm1")->base() + 0x1000, 0x10000);
m_bank2->configure_entries(0, 8, memregion("pcm2")->base() + 0x1000, 0x10000);
@@ -402,7 +402,7 @@ MACHINE_START_MEMBER(suna16_state,uballoon)
{
m_bank1->configure_entries(0, 2, memregion("pcm1")->base() + 0x400, 0x10000);
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_prot));
}
diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp
index ba2f772a7d8..ce6bac06856 100644
--- a/src/mame/drivers/suna8.cpp
+++ b/src/mame/drivers/suna8.cpp
@@ -708,8 +708,8 @@ WRITE8_MEMBER(suna8_state::brickzn_rombank_w)
*/
WRITE8_MEMBER(suna8_state::brickzn_leds_w)
{
- m_led[0] = BIT(data, 0);
- m_led[1] = BIT(data, 1);
+ m_leds[0] = BIT(data, 0);
+ m_leds[1] = BIT(data, 1);
machine().bookkeeping().coin_counter_w(0, data & 0x04);
logerror("CPU #0 - PC %04X: leds = %02X\n",m_maincpu->pc(),data);
@@ -922,8 +922,8 @@ WRITE8_MEMBER(suna8_state::hardhea2_flipscreen_w)
WRITE8_MEMBER(suna8_state::hardhea2_leds_w)
{
- m_led[0] = BIT(data, 0);
- m_led[1] = BIT(data, 1);
+ m_leds[0] = BIT(data, 0);
+ m_leds[1] = BIT(data, 1);
machine().bookkeeping().coin_counter_w(0, data & 0x04);
if (data & ~0x07) logerror("CPU #0 - PC %04X: unknown leds bits: %02X\n",m_maincpu->pc(),data);
}
@@ -1079,8 +1079,8 @@ WRITE8_MEMBER(suna8_state::starfigh_spritebank_w)
*/
WRITE8_MEMBER(suna8_state::starfigh_leds_w)
{
- m_led[0] = BIT(data, 0);
- m_led[1] = BIT(data, 1);
+ m_leds[0] = BIT(data, 0);
+ m_leds[1] = BIT(data, 1);
machine().bookkeeping().coin_counter_w(0, data & 0x04);
m_gfxbank = (data & 0x08) ? 4 : 0;
if (data & ~0x0f) logerror("CPU #0 - PC %04X: unknown leds bits: %02X\n",m_maincpu->pc(),data);
@@ -1194,8 +1194,8 @@ WRITE8_MEMBER(suna8_state::suna8_wram_w)
*/
WRITE8_MEMBER(suna8_state::sparkman_rombank_w)
{
- m_led[0] = BIT(data, 0);
- m_led[1] = BIT(data, 1);
+ m_leds[0] = BIT(data, 0);
+ m_leds[1] = BIT(data, 1);
if (data & ~0x03) logerror("CPU #0 - PC %04X: unknown leds bits: %02X\n",m_maincpu->pc(),data);
diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp
index 90d4e055e7f..e7b5bdd52b8 100644
--- a/src/mame/drivers/system16.cpp
+++ b/src/mame/drivers/system16.cpp
@@ -174,8 +174,8 @@ WRITE16_MEMBER(segas1x_bootleg_state::sys16_coinctrl_w)
{
m_coinctrl = data & 0xff;
m_refreshenable = m_coinctrl & 0x20;
- m_led[1] = BIT(m_coinctrl, 3);
- m_led[0] = BIT(m_coinctrl, 2);
+ m_leds[1] = BIT(m_coinctrl, 3);
+ m_leds[0] = BIT(m_coinctrl, 2);
machine().bookkeeping().coin_counter_w(1, m_coinctrl & 0x02);
machine().bookkeeping().coin_counter_w(0, m_coinctrl & 0x01);
/* bit 6 is also used (1 most of the time; 0 in dduxbl, sdi, wb3;
diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp
index 6f6758996f4..96f848533db 100644
--- a/src/mame/drivers/taito_z.cpp
+++ b/src/mame/drivers/taito_z.cpp
@@ -1305,8 +1305,8 @@ WRITE16_MEMBER(taitoz_state::chasehq_cpua_ctrl_w)
{
cpua_ctrl_w(space, offset, data, mem_mask);
- m_lamp[0] = BIT(m_cpua_ctrl, 5);
- m_lamp[1] = BIT(m_cpua_ctrl, 6);
+ m_lamps[0] = BIT(m_cpua_ctrl, 5);
+ m_lamps[1] = BIT(m_cpua_ctrl, 6);
}
WRITE16_MEMBER(taitoz_state::dblaxle_cpua_ctrl_w)
@@ -3166,7 +3166,7 @@ MACHINE_START_MEMBER(taitoz_state,taitoz)
MACHINE_START_MEMBER(taitoz_state,chasehq)
{
- m_lamp.resolve();
+ m_lamps.resolve();
MACHINE_START_CALL_MEMBER(taitoz);
}
diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp
index 627581c4ba8..aded29ea746 100644
--- a/src/mame/drivers/tempest.cpp
+++ b/src/mame/drivers/tempest.cpp
@@ -311,7 +311,7 @@ public:
m_buttons_p2(*this, TEMPEST_BUTTONS_P2_TAG),
m_in1(*this, "IN1/DSW0"),
m_in2(*this, "IN2"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
DECLARE_CUSTOM_INPUT_MEMBER(tempest_knob_r);
@@ -344,7 +344,7 @@ private:
required_ioport m_buttons_p2;
required_ioport m_in1;
required_ioport m_in2;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
uint8_t m_player_select;
};
@@ -352,7 +352,7 @@ private:
void tempest_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_player_select));
}
@@ -413,8 +413,8 @@ READ8_MEMBER(tempest_state::input_port_2_bit_r)
WRITE8_MEMBER(tempest_state::tempest_led_w)
{
- m_led[0] = BIT(~data, 1);
- m_led[1] = BIT(~data, 0);
+ m_leds[0] = BIT(~data, 1);
+ m_leds[1] = BIT(~data, 0);
/* FLIP is bit 0x04 */
m_player_select = data & 0x04;
}
diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp
index 871335793ca..384e75eef34 100644
--- a/src/mame/drivers/tetrisp2.cpp
+++ b/src/mame/drivers/tetrisp2.cpp
@@ -343,10 +343,10 @@ WRITE16_MEMBER(tetrisp2_state::nndmseal_coincounter_w)
}
if (ACCESSING_BITS_8_15)
{
- m_led[0] = BIT(data, 12); // +
- m_led[1] = BIT(data, 13); // -
- m_led[2] = BIT(data, 14); // Cancel
- m_led[3] = BIT(data, 15); // OK
+ m_leds[0] = BIT(data, 12); // +
+ m_leds[1] = BIT(data, 13); // -
+ m_leds[2] = BIT(data, 14); // Cancel
+ m_leds[3] = BIT(data, 15); // OK
}
// popmessage("%04x",data);
}
@@ -595,20 +595,20 @@ WRITE16_MEMBER(stepstag_state::stepstag_neon_w)
// 1f60, 1c60, 0790, 0490, 0b60, 0860, 1390, 1090, 1f60, 1c60, 1390, 1090, 0b60, 0860, 0790, 0490, ...
if (ACCESSING_BITS_0_7)
{
- m_led[32] = 0; //data & 0x0000; // Spot Lights?
- m_led[33] = BIT(data, 4);
- m_led[34] = BIT(data, 5);
- m_led[35] = BIT(data, 6);
+ m_leds[32] = 0; //data & 0x0000; // Spot Lights?
+ m_leds[33] = BIT(data, 4);
+ m_leds[34] = BIT(data, 5);
+ m_leds[35] = BIT(data, 6);
}
if (ACCESSING_BITS_8_15)
{
- m_led[40] = BIT(data, 8);
- m_led[41] = BIT(data, 9);
+ m_leds[40] = BIT(data, 8);
+ m_leds[41] = BIT(data, 9);
- m_led[42] = BIT(data, 10);
- m_led[43] = BIT(data, 11);
- m_led[44] = BIT(data, 12);
+ m_leds[42] = BIT(data, 10);
+ m_leds[43] = BIT(data, 11);
+ m_leds[44] = BIT(data, 12);
}
}
@@ -616,22 +616,22 @@ WRITE16_MEMBER(stepstag_state::stepstag_step_leds_w)
{
if (ACCESSING_BITS_0_7)
{
- m_led[0] = BIT(data, 0); // P2 Front-Left
- m_led[1] = BIT(data, 1); // P2 Front-Right
- m_led[2] = BIT(data, 2); // P2 Left
- m_led[3] = BIT(data, 3); // P2 Right
- m_led[4] = BIT(data, 4); // P2 Back-Left
- m_led[5] = BIT(data, 5); // P2 Back-Right
+ m_leds[0] = BIT(data, 0); // P2 Front-Left
+ m_leds[1] = BIT(data, 1); // P2 Front-Right
+ m_leds[2] = BIT(data, 2); // P2 Left
+ m_leds[3] = BIT(data, 3); // P2 Right
+ m_leds[4] = BIT(data, 4); // P2 Back-Left
+ m_leds[5] = BIT(data, 5); // P2 Back-Right
}
if (ACCESSING_BITS_8_15)
{
- m_led[6] = BIT(data, 8); // P1 Front-Left
- m_led[7] = BIT(data, 9); // P1 Front-Right
- m_led[8] = BIT(data, 10); // P1 Left
- m_led[9] = BIT(data, 11); // P1 Right
- m_led[10] = BIT(data, 12); // P1 Back-Left
- m_led[11] = BIT(data, 13); // P1 Back-Right
+ m_leds[6] = BIT(data, 8); // P1 Front-Left
+ m_leds[7] = BIT(data, 9); // P1 Front-Right
+ m_leds[8] = BIT(data, 10); // P1 Left
+ m_leds[9] = BIT(data, 11); // P1 Right
+ m_leds[10] = BIT(data, 12); // P1 Back-Left
+ m_leds[11] = BIT(data, 13); // P1 Back-Right
}
}
@@ -639,12 +639,12 @@ WRITE16_MEMBER(stepstag_state::stepstag_button_leds_w)
{
if (ACCESSING_BITS_8_15)
{
- m_led[17] = BIT(data, 8); // P2 Start
- m_led[18] = BIT(data, 9); // P2 Left
- m_led[19] = BIT(data, 10); // P2 Right
- m_led[20] = BIT(data, 12); // P1 Start
- m_led[21] = BIT(data, 13); // P1 Left
- m_led[22] = BIT(data, 14); // P1 Right
+ m_leds[17] = BIT(data, 8); // P2 Start
+ m_leds[18] = BIT(data, 9); // P2 Left
+ m_leds[19] = BIT(data, 10); // P2 Right
+ m_leds[20] = BIT(data, 12); // P1 Start
+ m_leds[21] = BIT(data, 13); // P1 Left
+ m_leds[22] = BIT(data, 14); // P1 Right
}
}
diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp
index f59797fca4b..a6b02735515 100644
--- a/src/mame/drivers/thedealr.cpp
+++ b/src/mame/drivers/thedealr.cpp
@@ -48,7 +48,7 @@ public:
m_subcpu(*this, "subcpu"),
m_seta001(*this, "spritegen"),
m_palette(*this, "palette"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
// IOX
@@ -83,7 +83,7 @@ private:
required_device<cpu_device> m_subcpu;
required_device<seta001_device> m_seta001;
required_device<palette_device> m_palette;
- output_finder<8> m_led;
+ output_finder<8> m_leds;
};
/***************************************************************************
@@ -165,14 +165,14 @@ WRITE8_MEMBER(thedealr_state::iox_w)
{
case 0x20: // leds
m_iox_leds = data;
- m_led[0] = BIT(data, 0); // bet
- m_led[1] = BIT(data, 1); // deal
- m_led[2] = BIT(data, 2);
- m_led[3] = BIT(data, 3);
- m_led[4] = BIT(data, 4); // hold 1-5?
- m_led[5] = BIT(data, 5);
- m_led[6] = BIT(data, 6);
- m_led[7] = BIT(data, 7);
+ m_leds[0] = BIT(data, 0); // bet
+ m_leds[1] = BIT(data, 1); // deal
+ m_leds[2] = BIT(data, 2);
+ m_leds[3] = BIT(data, 3);
+ m_leds[4] = BIT(data, 4); // hold 1-5?
+ m_leds[5] = BIT(data, 5);
+ m_leds[6] = BIT(data, 6);
+ m_leds[7] = BIT(data, 7);
break;
case 0x40: // coin counters
@@ -513,7 +513,7 @@ GFXDECODE_END
void thedealr_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
save_item(NAME(m_iox_status));
save_item(NAME(m_iox_ret));
diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp
index 64099334700..f5f6f0c0559 100644
--- a/src/mame/drivers/ti74.cpp
+++ b/src/mame/drivers/ti74.cpp
@@ -91,7 +91,7 @@ public:
m_cart(*this, "cartslot"),
m_key_matrix(*this, "IN.%u", 0),
m_battery_inp(*this, "BATTERY"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
void update_lcd_indicator(u8 y, u8 x, int state);
@@ -123,7 +123,7 @@ private:
u8 m_key_select;
u8 m_power;
- output_finder<80> m_lamp;
+ output_finder<80> m_lamps;
};
@@ -180,7 +180,7 @@ void ti74_state::update_lcd_indicator(u8 y, u8 x, int state)
// above | _LOW _ERROR 2nd INV ALPHA LC INS DEGRAD HEX OCT I/O
// screen- | _P{70} <{71} RUN{3}
// area . SYS{4}
- m_lamp[y * 10 + x] = state ? 1 : 0;
+ m_lamps[y * 10 + x] = state ? 1 : 0;
}
HD44780_PIXEL_UPDATE(ti74_state::ti74_pixel_update)
@@ -498,7 +498,7 @@ void ti74_state::machine_reset()
void ti74_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
if (m_cart->exists())
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0xbfff, read8_delegate(FUNC(generic_slot_device::read_rom),(generic_slot_device*)m_cart));
diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp
index e66ddf6d3f0..3eb58b135e7 100644
--- a/src/mame/drivers/tourtabl.cpp
+++ b/src/mame/drivers/tourtabl.cpp
@@ -24,13 +24,13 @@ public:
tourtabl_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
void tourtabl(machine_config &config);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
DECLARE_WRITE8_MEMBER(tourtabl_led_w);
DECLARE_READ16_MEMBER(tourtabl_read_input_port);
DECLARE_READ8_MEMBER(tourtabl_get_databus_contents);
@@ -38,7 +38,7 @@ protected:
private:
required_device<cpu_device> m_maincpu;
- output_finder<4> m_led;
+ output_finder<4> m_leds;
};
@@ -47,10 +47,10 @@ private:
WRITE8_MEMBER(tourtabl_state::tourtabl_led_w)
{
- m_led[0] = BIT(data, 6); /* start 1 */
- m_led[1] = BIT(data, 5); /* start 2 */
- m_led[2] = BIT(data, 4); /* start 4 */
- m_led[3] = BIT(data, 7); /* select game */
+ m_leds[0] = BIT(data, 6); /* start 1 */
+ m_leds[1] = BIT(data, 5); /* start 2 */
+ m_leds[2] = BIT(data, 4); /* start 4 */
+ m_leds[3] = BIT(data, 7); /* select game */
machine().bookkeeping().coin_lockout_global_w(!(data & 0x80));
}
diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp
index d0c93fcb952..d821a699180 100644
--- a/src/mame/drivers/unico.cpp
+++ b/src/mame/drivers/unico.cpp
@@ -96,8 +96,8 @@ WRITE16_MEMBER(zeropnt_state::zeropnt_sound_bank_w)
memcpy(dst + 0x20000, src, 0x20000);
machine().bookkeeping().coin_counter_w(0,data & 0x1000);
- m_led[0] = BIT(data, 11); // Start 1
- m_led[1] = BIT(data, 10); // Start 2
+ m_leds[0] = BIT(data, 11); // Start 1
+ m_leds[1] = BIT(data, 10); // Start 2
}
}
@@ -192,8 +192,8 @@ WRITE32_MEMBER(zeropnt2_state::zeropnt2_leds_w)
if (ACCESSING_BITS_16_23)
{
machine().bookkeeping().coin_counter_w(0,data & 0x00010000);
- m_led[0] = BIT(data, 23); // Start 1
- m_led[1] = BIT(data, 22); // Start 2
+ m_leds[0] = BIT(data, 23); // Start 1
+ m_leds[1] = BIT(data, 22); // Start 2
}
}
@@ -567,7 +567,7 @@ GFXDECODE_END
void unico_state::machine_start()
{
- m_led.resolve();
+ m_leds.resolve();
}
diff --git a/src/mame/drivers/victory.cpp b/src/mame/drivers/victory.cpp
index 316580bb4c7..0035f1540a2 100644
--- a/src/mame/drivers/victory.cpp
+++ b/src/mame/drivers/victory.cpp
@@ -112,10 +112,10 @@
WRITE8_MEMBER(victory_state::lamp_control_w)
{
- m_lamp[0] = BIT(data, 7);
- m_lamp[1] = BIT(data, 6);
- m_lamp[2] = BIT(data, 5);
- m_lamp[3] = BIT(data, 4);
+ m_lamps[0] = BIT(data, 7);
+ m_lamps[1] = BIT(data, 6);
+ m_lamps[2] = BIT(data, 5);
+ m_lamps[3] = BIT(data, 4);
}
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index e01d639e441..97806f991d9 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -311,7 +311,7 @@ public:
, m_dac(*this, "dac")
, m_gfxdecode(*this, "gfxdecode")
, m_digits(*this, "digit%u", 0U)
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_READ8_MEMBER(videopkr_io_r);
@@ -400,7 +400,7 @@ protected:
required_device<dac_byte_interface> m_dac;
required_device<gfxdecode_device> m_gfxdecode;
output_finder<28> m_digits;
- output_finder<14> m_lamp;
+ output_finder<14> m_lamps;
};
@@ -695,14 +695,14 @@ WRITE8_MEMBER(videopkr_state::videopkr_io_w)
case 0xef: /* Port 2.4 */
{
- m_lamp[0] = BIT(data, 0); /* L_1 */
- m_lamp[1] = BIT(data, 1); /* L_2 */
- m_lamp[2] = BIT(data, 2); /* L_3 */
- m_lamp[3] = BIT(data, 3); /* L_4 */
- m_lamp[4] = BIT(data, 4); /* Coin */
- m_lamp[5] = BIT(data, 5); /* Hopper_1 */
- m_lamp[6] = BIT(data, 6); /* Hopper_2 */
- m_lamp[7] = BIT(data, 7); /* Diverter */
+ m_lamps[0] = BIT(data, 0); /* L_1 */
+ m_lamps[1] = BIT(data, 1); /* L_2 */
+ m_lamps[2] = BIT(data, 2); /* L_3 */
+ m_lamps[3] = BIT(data, 3); /* L_4 */
+ m_lamps[4] = BIT(data, 4); /* Coin */
+ m_lamps[5] = BIT(data, 5); /* Hopper_1 */
+ m_lamps[6] = BIT(data, 6); /* Hopper_2 */
+ m_lamps[7] = BIT(data, 7); /* Diverter */
m_p24_data = data;
m_hp_1 = (~m_p24_data >> 6) & 1;
m_hp_2 = (~m_p24_data >> 5) & 1;
@@ -732,12 +732,12 @@ WRITE8_MEMBER(videopkr_state::videopkr_p1_data_w)
{
m_p1 = data;
- m_lamp[8] = BIT(data, 0); /* Aux_0 - Jackpot mech. counter (Baby Games)*/
- m_lamp[9] = BIT(data, 1); /* Aux_1 - */
- m_lamp[10] = BIT(data, 2); /* Aux_2 - */
- m_lamp[11] = BIT(data, 3); /* Aux_3 - */
- m_lamp[12] = BIT(data, 4); /* Aux_4 - Bell */
- m_lamp[13] = BIT(data, 5); /* Aux_5 - /CIO */
+ m_lamps[8] = BIT(data, 0); /* Aux_0 - Jackpot mech. counter (Baby Games)*/
+ m_lamps[9] = BIT(data, 1); /* Aux_1 - */
+ m_lamps[10] = BIT(data, 2); /* Aux_2 - */
+ m_lamps[11] = BIT(data, 3); /* Aux_3 - */
+ m_lamps[12] = BIT(data, 4); /* Aux_4 - Bell */
+ m_lamps[13] = BIT(data, 5); /* Aux_5 - /CIO */
m_jckp = m_p1 & 1;
@@ -1250,7 +1250,7 @@ GFXDECODE_END
void videopkr_state::machine_start()
{
m_digits.resolve();
- m_lamp.resolve();
+ m_lamps.resolve();
m_vp_sound_p2 = 0xff; /* default P2 latch value */
m_sound_latch = 0xff; /* default sound data latch value */
m_p24_data = 0xff;
diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp
index 5772120998a..db1ea1862a6 100644
--- a/src/mame/drivers/vip.cpp
+++ b/src/mame/drivers/vip.cpp
@@ -464,7 +464,7 @@ READ_LINE_MEMBER( vip_state::ef1_r )
READ_LINE_MEMBER( vip_state::ef2_r )
{
- m_led[LED_TAPE] = m_cassette->input() > 0 ? 1 : 0;
+ m_leds[LED_TAPE] = m_cassette->input() > 0 ? 1 : 0;
return (m_cassette->input() < 0) ? ASSERT_LINE : CLEAR_LINE;
}
@@ -485,7 +485,7 @@ WRITE_LINE_MEMBER( vip_state::q_w )
m_beeper->write(machine().dummy_space(), NODE_01, state);
// Q led
- m_led[LED_Q] = state ? 1 : 0;
+ m_leds[LED_Q] = state ? 1 : 0;
// tape output
m_cassette->output(state ? 1.0 : -1.0);
@@ -621,10 +621,10 @@ void vip_state::machine_start()
ram[addr] = machine().rand() & 0xff;
}
- m_led.resolve();
+ m_leds.resolve();
// turn on power LED
- m_led[LED_POWER] = 1;
+ m_leds[LED_POWER] = 1;
// reset sound
m_beeper->write(machine().dummy_space(), NODE_01, 0);
diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp
index ddaedcdd4c4..f95c135a59d 100644
--- a/src/mame/drivers/wacky_gator.cpp
+++ b/src/mame/drivers/wacky_gator.cpp
@@ -42,7 +42,7 @@ public:
m_samples(*this, "oki"),
m_alligator(*this, "alligator%u", 0U),
m_digit(*this, "digit%u", 0U),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_CUSTOM_INPUT_MEMBER(alligators_rear_sensors_r);
@@ -85,7 +85,7 @@ private:
required_memory_region m_samples;
output_finder<5> m_alligator;
output_finder<8> m_digit;
- output_finder<32> m_lamp;
+ output_finder<32> m_lamps;
int m_adpcm_sel;
uint16_t m_adpcm_pos;
@@ -185,7 +185,7 @@ void wackygtr_state::machine_start()
{
m_alligator.resolve();
m_digit.resolve();
- m_lamp.resolve();
+ m_lamps.resolve();
save_item(NAME(m_adpcm_sel));
save_item(NAME(m_adpcm_pos));
@@ -211,7 +211,7 @@ void wackygtr_state::set_digits(int p, uint8_t value)
void wackygtr_state::set_lamps(int p, uint8_t value)
{
for (int i=0; i<8; i++)
- m_lamp[p + i] = BIT(value, i);
+ m_lamps[p + i] = BIT(value, i);
}
static INPUT_PORTS_START( wackygtr )
diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h
index 4a154060a04..b4af0d7a4cd 100644
--- a/src/mame/includes/ajax.h
+++ b/src/mame/includes/ajax.h
@@ -25,7 +25,7 @@ public:
m_k051316(*this, "k051316"),
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(sound_bank_w);
@@ -68,5 +68,5 @@ protected:
required_device<k051316_device> m_k051316;
required_device<palette_device> m_palette;
required_device<generic_latch_8_device> m_soundlatch;
- output_finder<8> m_lamp;
+ output_finder<8> m_lamps;
};
diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h
index 5d6e812d010..7a17f9e6777 100644
--- a/src/mame/includes/atarifb.h
+++ b/src/mame/includes/atarifb.h
@@ -33,7 +33,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(atarifb_out1_w);
@@ -110,7 +110,7 @@ protected:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
/*----------- defined in audio/atarifb.c -----------*/
diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h
index b5ead477479..a672ba0dacb 100644
--- a/src/mame/includes/atarisy2.h
+++ b/src/mame/includes/atarisy2.h
@@ -35,7 +35,7 @@ public:
, m_tms5220(*this, "tms")
, m_rombank(*this, "rombank%u", 1U)
, m_slapstic(*this, "slapstic")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
void init_ssprint();
@@ -95,7 +95,7 @@ private:
int32_t m_spin_pos; /* track fake position of spinner */
uint32_t m_spin_center_count;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
DECLARE_WRITE16_MEMBER(int0_ack_w);
DECLARE_WRITE16_MEMBER(int1_ack_w);
diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h
index de97d34805a..796609ad172 100644
--- a/src/mame/includes/baraduke.h
+++ b/src/mame/includes/baraduke.h
@@ -15,7 +15,7 @@ public:
m_cus30(*this, "namco"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(inputport_select_w);
@@ -67,5 +67,5 @@ protected:
int m_xscroll[2];
int m_yscroll[2];
int m_copy_sprites;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
};
diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h
index 10db44d8301..5bd25e7abcf 100644
--- a/src/mame/includes/bladestl.h
+++ b/src/mame/includes/bladestl.h
@@ -32,7 +32,7 @@ public:
m_soundlatch(*this, "soundlatch"),
m_trackball(*this, "TRACKBALL.%u", 0),
m_rombank(*this, "rombank"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
/* devices */
@@ -75,5 +75,5 @@ protected:
/* misc */
int m_last_track[4];
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
};
diff --git a/src/mame/includes/bwidow.h b/src/mame/includes/bwidow.h
index db9ff2b4173..642d86c28a8 100644
--- a/src/mame/includes/bwidow.h
+++ b/src/mame/includes/bwidow.h
@@ -17,7 +17,7 @@ public:
, m_in3(*this, "IN3")
, m_in4(*this, "IN4")
, m_dsw2(*this, "DSW2")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_READ8_MEMBER(spacduel_IN3_r);
@@ -38,14 +38,14 @@ public:
void spacduel_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
int m_lastdata;
required_device<cpu_device> m_maincpu;
optional_ioport m_in3;
optional_ioport m_in4;
optional_ioport m_dsw2;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
#endif // MAME_INCLUDES_BWIDOW_H
diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h
index 93241317ecb..c6d286d3699 100644
--- a/src/mame/includes/calomega.h
+++ b/src/mame/includes/calomega.h
@@ -22,7 +22,7 @@ public:
m_in0_3(*this, "IN0-3"),
m_frq(*this, "FRQ"),
m_sw2(*this, "SW2"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 1U)
{ }
DECLARE_WRITE8_MEMBER(calomega_videoram_w);
@@ -63,7 +63,7 @@ public:
void sys905_map(address_map &map);
void sys906_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
private:
@@ -83,7 +83,7 @@ private:
optional_ioport m_in0_3;
optional_ioport m_frq;
optional_ioport m_sw2;
- output_finder<10> m_lamp;
+ output_finder<9> m_lamps;
uint8_t m_tx_line;
int m_s903_mux_data;
diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h
index 834041f0fc8..e2f4722dbf7 100644
--- a/src/mame/includes/cave.h
+++ b/src/mame/includes/cave.h
@@ -68,7 +68,7 @@ public:
, m_screen(*this, "screen")
, m_palette(*this, "palette")
, m_soundlatch(*this, "soundlatch")
- , m_led(*this, "led%u", 0U)
+ , m_led_outputs(*this, "led%u", 0U)
{ }
struct
@@ -315,7 +315,7 @@ protected:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
optional_device<generic_latch_16_device> m_soundlatch;
- output_finder<9> m_led;
+ output_finder<9> m_led_outputs;
int m_rasflag;
int m_old_rasflag;
diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h
index a7ba5ce2dc8..32836b8b15a 100644
--- a/src/mame/includes/ccastles.h
+++ b/src/mame/includes/ccastles.h
@@ -27,7 +27,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
DECLARE_CUSTOM_INPUT_MEMBER(get_vblank);
@@ -73,7 +73,7 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
/* video-related */
const uint8_t *m_syncprom;
diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h
index e9c4f81c6f3..0cf8a12f6a1 100644
--- a/src/mame/includes/cidelsa.h
+++ b/src/mame/includes/cidelsa.h
@@ -49,7 +49,7 @@ public:
: driver_device(mconfig, type, tag)
, m_maincpu(*this, CDP1802_TAG)
, m_vis(*this, CDP1869_TAG)
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER( cdp1869_w );
@@ -87,7 +87,7 @@ protected:
required_device<cosmac_device> m_maincpu;
required_device<cdp1869_device> m_vis;
- output_finder<3> m_led;
+ output_finder<3> m_leds;
// cpu state
int m_reset;
diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h
index a309d7b95a9..aaecf218fbc 100644
--- a/src/mame/includes/cischeat.h
+++ b/src/mame/includes/cischeat.h
@@ -39,7 +39,7 @@ public:
, m_captflag_motor_right(*this, "motor_right")
, m_oki1_bank(*this, "oki1_bank")
, m_oki2_bank(*this, "oki2_bank")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{
for (int side = 0; side < 2; ++side)
m_captflag_motor_command[side] = m_captflag_motor_pos[side] = 0;
@@ -141,7 +141,7 @@ public:
void wildplt_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
virtual void video_start() override;
optional_device_array<megasys1_tilemap_device, 3> m_tmap;
@@ -192,5 +192,5 @@ protected:
optional_memory_bank m_oki2_bank;
uint16_t m_captflag_leds;
- output_finder<5> m_led;
+ output_finder<5> m_leds;
};
diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h
index 2c5d63ace35..562aef4f897 100644
--- a/src/mame/includes/copsnrob.h
+++ b/src/mame/includes/copsnrob.h
@@ -31,7 +31,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
void copsnrob(machine_config &config);
@@ -66,7 +66,7 @@ private:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
#endif // MAME_INCLUDES_COPSNROB_H
diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h
index bc81dec7218..201db9f5d4b 100644
--- a/src/mame/includes/djmain.h
+++ b/src/mame/includes/djmain.h
@@ -19,7 +19,7 @@ public:
, m_palette(*this, "palette")
, m_turntable(*this, {"TT1", "TT2"})
, m_sndram(*this, "sndram")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{
}
@@ -80,7 +80,7 @@ protected:
required_device<palette_device> m_palette;
optional_ioport_array<2> m_turntable;
required_shared_ptr<uint8_t> m_sndram;
- output_finder<3> m_led;
+ output_finder<3> m_leds;
int m_sndram_bank;
int m_turntable_select;
diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h
index f2a5e1ee623..9d112cb4459 100644
--- a/src/mame/includes/epos.h
+++ b/src/mame/includes/epos.h
@@ -15,7 +15,7 @@ public:
m_inputs(*this, { "INPUTS", "INPUTS2" }),
m_maincpu(*this, "maincpu"),
m_palette(*this, "palette"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(dealer_decrypt_rom);
@@ -40,7 +40,7 @@ public:
void epos_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
/* memory pointers */
required_shared_ptr<uint8_t> m_videoram;
@@ -55,5 +55,5 @@ protected:
bool m_ay_porta_multiplex;
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
diff --git a/src/mame/includes/eti660.h b/src/mame/includes/eti660.h
index cf0eb5f78b3..ebe481acfa3 100644
--- a/src/mame/includes/eti660.h
+++ b/src/mame/includes/eti660.h
@@ -36,7 +36,7 @@ public:
, m_cassette(*this, "cassette")
, m_io_keyboard(*this, "KEY.%u", 0)
, m_special(*this, "SPECIAL")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_READ8_MEMBER( pia_r );
@@ -65,7 +65,7 @@ private:
required_device<cassette_image_device> m_cassette;
required_ioport_array<4> m_io_keyboard;
required_ioport m_special;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h
index fa8c3aa638f..64b3015d92f 100644
--- a/src/mame/includes/firetrk.h
+++ b/src/mame/includes/firetrk.h
@@ -60,7 +60,7 @@ public:
, m_bit_7(*this, "BIT_7")
, m_dips(*this, {"DIP_0", "DIP_1"})
, m_steer(*this, {"STEER_1", "STEER_2"})
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(firetrk_output_w);
@@ -120,7 +120,7 @@ public:
void superbug_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
virtual void machine_reset() override;
virtual void video_start() override;
@@ -145,7 +145,7 @@ protected:
optional_ioport m_bit_7;
required_ioport_array<2> m_dips;
optional_ioport_array<2> m_steer;
- output_finder<4> m_led;
+ output_finder<4> m_leds;
uint8_t m_in_service_mode;
uint32_t m_dial[2];
diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h
index 6aadfca6f27..fb142cceb72 100644
--- a/src/mame/includes/foodf.h
+++ b/src/mame/includes/foodf.h
@@ -22,7 +22,7 @@ public:
m_nvram(*this, "nvram"),
m_playfield_tilemap(*this, "playfield"),
m_spriteram(*this, "spriteram"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
void foodf(machine_config &config);
@@ -53,7 +53,7 @@ private:
uint8_t m_playfield_flip;
required_shared_ptr<uint16_t> m_spriteram;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
#endif // MAME_INCLUDES_FOODF_H
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h
index 36e203c13a6..564d44472c2 100644
--- a/src/mame/includes/funworld.h
+++ b/src/mame/includes/funworld.h
@@ -10,7 +10,7 @@ public:
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_READ8_MEMBER(questions_r);
@@ -66,7 +66,7 @@ public:
void witchryl_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
@@ -74,7 +74,7 @@ protected:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- output_finder<8> m_lamp;
+ output_finder<8> m_lamps;
};
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index e0fdfed6046..d933d2a06d8 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -28,7 +28,7 @@ public:
, m_gfxdecode(*this, "gfxdecode")
, m_screen(*this, "screen")
, m_palette(*this, "palette")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_READ8_MEMBER(bosco_dsw_r);
@@ -79,7 +79,7 @@ protected:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
emu_timer *m_cpu3_interrupt_timer;
/* machine state */
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index c3f7f3ca56c..15035db7d73 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -58,7 +58,7 @@ public:
, m_spriteram(*this, "spriteram")
, m_videoram(*this, "videoram")
, m_decrypted_opcodes(*this, "decrypted_opcodes")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
/* video extension callbacks */
@@ -364,7 +364,7 @@ public:
void zigzag_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
required_device<cpu_device> m_maincpu;
@@ -386,7 +386,7 @@ protected:
required_shared_ptr<uint8_t> m_spriteram;
required_shared_ptr<uint8_t> m_videoram;
optional_shared_ptr<uint8_t> m_decrypted_opcodes;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
int m_bullets_base;
int m_sprites_base;
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index fb70548a0e5..342c3e67dea 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -45,7 +45,7 @@ public:
, m_bulletsram(*this,"bulletsram")
, m_rockclim_videoram(*this,"rockclim_vram")
, m_racknrol_tiles_bank(*this,"racknrol_tbank")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
, m_leftclip(2)
{ }
@@ -66,7 +66,7 @@ public:
optional_shared_ptr<uint8_t> m_bulletsram;
optional_shared_ptr<uint8_t> m_rockclim_videoram;
optional_shared_ptr<uint8_t> m_racknrol_tiles_bank;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
int m_irq_line;
uint8_t m__4in1_bank;
@@ -326,7 +326,7 @@ public:
void tazzmang(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
};
#define galaxold_coin_counter_0_w galaxold_coin_counter_w
diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h
index 8c36493ff90..c1c275a9608 100644
--- a/src/mame/includes/gaplus.h
+++ b/src/mame/includes/gaplus.h
@@ -42,7 +42,7 @@ public:
, m_customio_3(*this,"customio_3")
, m_videoram(*this,"videoram")
, m_spriteram(*this,"spriteram")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(irq_1_ctrl_w);
@@ -102,7 +102,7 @@ protected:
required_shared_ptr<uint8_t> m_customio_3;
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_spriteram;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
int m_type;
diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h
index ef92e7e262a..58bd31e4cfc 100644
--- a/src/mame/includes/goldstar.h
+++ b/src/mame/includes/goldstar.h
@@ -23,7 +23,7 @@ public:
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(protection_w);
@@ -82,7 +82,7 @@ public:
void wcherry_readwriteport(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
TILE_GET_INFO_MEMBER(get_goldstar_fg_tile_info);
TILE_GET_INFO_MEMBER(get_cherrym_fg_tile_info);
TILE_GET_INFO_MEMBER(get_goldstar_reel1_tile_info);
@@ -120,7 +120,7 @@ protected:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- output_finder<16> m_lamp;
+ output_finder<16> m_lamps;
};
diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h
index 8f1fa1eac4a..07acb1fc940 100644
--- a/src/mame/includes/gottlieb.h
+++ b/src/mame/includes/gottlieb.h
@@ -52,7 +52,7 @@ public:
, m_generic_paletteram_8(*this, "paletteram")
, m_track_x(*this, "TRACKX")
, m_track_y(*this, "TRACKY")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
void qbert_knocker(uint8_t knock);
@@ -133,7 +133,7 @@ protected:
optional_ioport m_track_x;
optional_ioport m_track_y;
- output_finder<3> m_led; // only used by reactor
+ output_finder<3> m_leds; // only used by reactor
uint8_t m_knocker_prev;
uint8_t m_joystick_select;
diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h
index 1514978db80..9a3d72f529f 100644
--- a/src/mame/includes/irobot.h
+++ b/src/mame/includes/irobot.h
@@ -42,7 +42,7 @@ public:
m_screen(*this, "screen"),
m_palette(*this, "palette"),
m_pokey(*this, "pokey%u", 1U),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
void init_irobot();
@@ -50,7 +50,7 @@ public:
void irobot(machine_config &config);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
virtual void machine_reset() override;
virtual void video_start() override;
void irobot_map(address_map &map);
@@ -119,7 +119,7 @@ private:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
required_device_array<pokey_device, 4> m_pokey;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
#endif // MAME_INCLUDES_IROBOT_H
diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h
index 1f147141344..51968735cb8 100644
--- a/src/mame/includes/itech32.h
+++ b/src/mame/includes/itech32.h
@@ -38,7 +38,7 @@ public:
m_tms1_boot(*this, "tms1_boot"),
m_tms1_ram(*this, "tms1_ram"),
m_tms2_ram(*this, "tms2_ram"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
@@ -58,7 +58,7 @@ public:
optional_shared_ptr<uint32_t> m_tms1_boot;
optional_shared_ptr<uint32_t> m_tms1_ram;
optional_shared_ptr<uint32_t> m_tms2_ram;
- output_finder<4> m_led;
+ output_finder<4> m_leds;
void nvram_init(nvram_device &nvram, void *base, size_t length);
diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h
index 32d840c7e32..3ca1c5cce35 100644
--- a/src/mame/includes/lethalj.h
+++ b/src/mame/includes/lethalj.h
@@ -33,7 +33,7 @@ public:
m_light0_y(*this, "LIGHT0_Y"),
m_light1_x(*this, "LIGHT1_X"),
m_light1_y(*this, "LIGHT1_Y"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE16_MEMBER(ripribit_control_w);
@@ -53,7 +53,7 @@ public:
void gameroom(machine_config &config);
void lethalj_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual void video_start() override;
@@ -65,7 +65,7 @@ protected:
optional_ioport m_light0_y;
optional_ioport m_light1_x;
optional_ioport m_light1_y;
- output_finder<3> m_lamp;
+ output_finder<3> m_lamps;
emu_timer *m_gen_ext1_int_timer;
uint16_t m_blitter_data[8];
diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h
index f99585fa116..bf067775435 100644
--- a/src/mame/includes/lockon.h
+++ b/src/mame/includes/lockon.h
@@ -45,7 +45,7 @@ public:
, m_gfxdecode(*this, "gfxdecode")
, m_screen(*this, "screen")
, m_palette(*this, "palette")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamp(*this, "lamp1")
{ }
void lockon(machine_config &config);
@@ -108,7 +108,7 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- output_finder<2> m_lamp;
+ output_finder<> m_lamp;
DECLARE_READ16_MEMBER(lockon_crtc_r);
DECLARE_WRITE16_MEMBER(lockon_crtc_w);
diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h
index 327acd90a94..ebe756d786f 100644
--- a/src/mame/includes/lucky74.h
+++ b/src/mame/includes/lucky74.h
@@ -14,7 +14,7 @@ public:
m_maincpu(*this, "maincpu"),
m_msm(*this, "msm"),
m_gfxdecode(*this, "gfxdecode"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_READ8_MEMBER(custom_09R81P_port_r);
@@ -41,7 +41,7 @@ public:
void lucky74_portmap(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
virtual void machine_reset() override;
virtual void sound_start() override;
@@ -63,5 +63,5 @@ protected:
required_device<cpu_device> m_maincpu;
required_device<msm5205_device> m_msm;
required_device<gfxdecode_device> m_gfxdecode;
- output_finder<12> m_lamp;
+ output_finder<12> m_lamps;
};
diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h
index ab3c7fec9e1..80ec2fbe175 100644
--- a/src/mame/includes/mainevt.h
+++ b/src/mame/includes/mainevt.h
@@ -24,7 +24,7 @@ public:
, m_k052109(*this, "k052109")
, m_k051960(*this, "k051960")
, m_rombank(*this, "rombank")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(dv_nmienable_w);
@@ -73,5 +73,5 @@ protected:
required_device<k051960_device> m_k051960;
required_memory_bank m_rombank;
- output_finder<4> m_led;
+ output_finder<4> m_leds;
};
diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h
index 6c4126c51b8..faa26470b14 100644
--- a/src/mame/includes/mcr.h
+++ b/src/mame/includes/mcr.h
@@ -140,7 +140,7 @@ public:
mcr_state(mconfig, type, tag),
m_coin_in_timer(*this, "coinin"),
m_hopper_timer(*this, "hopper"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_READ8_MEMBER(ip0_r);
@@ -159,7 +159,7 @@ public:
void mcr_90009_dp(machine_config &config);
protected:
- virtual void machine_start() override { mcr_state::machine_start(); m_lamp.resolve(); }
+ virtual void machine_start() override { mcr_state::machine_start(); m_lamps.resolve(); }
private:
uint8_t m_coin_status;
@@ -167,7 +167,7 @@ private:
required_device<timer_device> m_coin_in_timer;
required_device<timer_device> m_hopper_timer;
- output_finder<14> m_lamp;
+ output_finder<14> m_lamps;
};
class mcr_nflfoot_state : public mcr_state
diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h
index 27da1c42072..54a0c7fce58 100644
--- a/src/mame/includes/mcr3.h
+++ b/src/mame/includes/mcr3.h
@@ -19,7 +19,7 @@ public:
, m_maxrpm_adc(*this, "adc")
, m_lamplatch(*this, "lamplatch")
, m_screen(*this, "screen")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(mcr3_videoram_w);
@@ -73,7 +73,7 @@ public:
void spyhunt_map(address_map &map);
void spyhunt_portmap(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
private:
@@ -81,7 +81,7 @@ private:
optional_device<adc0844_device> m_maxrpm_adc;
optional_device<cd4099_device> m_lamplatch;
required_device<screen_device> m_screen;
- output_finder<3> m_lamp;
+ output_finder<3> m_lamps;
uint8_t m_latched_input;
uint8_t m_maxrpm_adc_control;
diff --git a/src/mame/includes/mhavoc.h b/src/mame/includes/mhavoc.h
index e34cea36a40..db37c3a872b 100644
--- a/src/mame/includes/mhavoc.h
+++ b/src/mame/includes/mhavoc.h
@@ -32,7 +32,7 @@ public:
m_gamma(*this, "gamma"),
m_pokey(*this, "pokey%u", 1U),
m_tms(*this, "tms"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_READ8_MEMBER(dual_pokey_r);
@@ -79,7 +79,7 @@ protected:
optional_device<cpu_device> m_gamma;
optional_device_array<pokey_device, 4> m_pokey;
optional_device<tms5220_device> m_tms;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
uint8_t m_alpha_data;
uint8_t m_alpha_rcvd;
uint8_t m_alpha_xmtd;
diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h
index 6f28bc5b0fd..47a071d5a23 100644
--- a/src/mame/includes/multfish.h
+++ b/src/mame/includes/multfish.h
@@ -24,7 +24,7 @@ public:
m_screen(*this, "screen"),
m_palette(*this, "palette"),
m_hopper(*this, "hopper"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(igrosoft_gamble_vid_w);
@@ -99,7 +99,7 @@ protected:
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
required_device<ticket_dispenser_device> m_hopper;
- output_finder<13> m_lamp;
+ output_finder<13> m_lamps;
};
diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h
index 42b04197f79..7412debed97 100644
--- a/src/mame/includes/namcos86.h
+++ b/src/mame/includes/namcos86.h
@@ -18,7 +18,7 @@ public:
, m_rthunder_videoram2(*this, "videoram2")
, m_rthunder_spriteram(*this, "spriteram")
, m_user1_ptr(*this, "user1")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(bankswitch1_w);
@@ -90,7 +90,7 @@ protected:
required_shared_ptr<uint8_t> m_rthunder_videoram2;
required_shared_ptr<uint8_t> m_rthunder_spriteram;
optional_region_ptr<uint8_t> m_user1_ptr;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
uint8_t *m_spriteram;
int m_wdog;
diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h
index 672d1f73133..cc6d8e33191 100644
--- a/src/mame/includes/norautp.h
+++ b/src/mame/includes/norautp.h
@@ -26,7 +26,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_screen(*this, "screen"),
m_palette(*this, "palette"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE_LINE_MEMBER(ppi2_obf_w);
@@ -71,7 +71,7 @@ public:
void ssjkrpkr_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
std::unique_ptr<uint16_t[]> m_np_vram;
@@ -81,7 +81,7 @@ protected:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- output_finder<12> m_lamp;
+ output_finder<12> m_lamps;
};
/*----------- defined in audio/norautp.c -----------*/
diff --git a/src/mame/includes/pmd85.h b/src/mame/includes/pmd85.h
index 8d72c8df857..2729d5ebb78 100644
--- a/src/mame/includes/pmd85.h
+++ b/src/mame/includes/pmd85.h
@@ -54,7 +54,7 @@ public:
m_bank16(*this, "bank16"),
m_io_dsw0(*this, "DSW0"),
m_palette(*this, "palette"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
uint8_t m_rom_module_present;
@@ -126,7 +126,7 @@ public:
void pmd85_io_map(address_map &map);
void pmd85_mem(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
@@ -157,7 +157,7 @@ protected:
optional_ioport m_io_dsw0;
ioport_port *m_io_port[16];
required_device<palette_device> m_palette;
- output_finder<3> m_led;
+ output_finder<3> m_leds;
void pmd851_update_memory();
void pmd852a_update_memory();
diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h
index 5bef83a8f04..39c17cd2e28 100644
--- a/src/mame/includes/poolshrk.h
+++ b/src/mame/includes/poolshrk.h
@@ -28,7 +28,7 @@ public:
m_playfield_ram(*this, "playfield_ram"),
m_hpos_ram(*this, "hpos_ram"),
m_vpos_ram(*this, "vpos_ram"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
void init_poolshrk();
@@ -52,7 +52,7 @@ protected:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
virtual void video_start() override;
void poolshrk_cpu_map(address_map &map);
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
private:
required_device<cpu_device> m_maincpu;
@@ -64,7 +64,7 @@ private:
required_shared_ptr<uint8_t> m_playfield_ram;
required_shared_ptr<uint8_t> m_hpos_ram;
required_shared_ptr<uint8_t> m_vpos_ram;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
tilemap_t* m_bg_tilemap;
int m_da_latch;
diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h
index 76556dde845..39c7916cc19 100644
--- a/src/mame/includes/portrait.h
+++ b/src/mame/includes/portrait.h
@@ -14,7 +14,7 @@ public:
, m_bgvideoram(*this, "bgvideoram")
, m_fgvideoram(*this, "fgvideoram")
, m_spriteram(*this, "spriteram")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(ctrl_w);
@@ -36,7 +36,7 @@ public:
void portrait_sound_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
required_device<cpu_device> m_maincpu;
@@ -47,7 +47,7 @@ protected:
required_shared_ptr<uint8_t> m_bgvideoram;
required_shared_ptr<uint8_t> m_fgvideoram;
required_shared_ptr<uint8_t> m_spriteram;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
int m_scroll;
tilemap_t *m_foreground;
diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h
index 2535986af53..79112c734cf 100644
--- a/src/mame/includes/runaway.h
+++ b/src/mame/includes/runaway.h
@@ -13,7 +13,7 @@ public:
, m_gfxdecode(*this, "gfxdecode")
, m_screen(*this, "screen")
, m_palette(*this, "palette")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_READ8_MEMBER(runaway_input_r);
@@ -47,5 +47,5 @@ protected:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h
index 2f59f662640..f1f0759633a 100644
--- a/src/mame/includes/sderby.h
+++ b/src/mame/includes/sderby.h
@@ -12,7 +12,7 @@ public:
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 1U)
{ }
DECLARE_READ16_MEMBER(sderby_input_r);
@@ -47,7 +47,7 @@ public:
void spacewin_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
required_shared_ptr<uint16_t> m_videoram;
@@ -63,5 +63,5 @@ protected:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- output_finder<8> m_lamp;
+ output_finder<7> m_lamps;
};
diff --git a/src/mame/includes/segahang.h b/src/mame/includes/segahang.h
index 9547dbf3379..fb5e217b690 100644
--- a/src/mame/includes/segahang.h
+++ b/src/mame/includes/segahang.h
@@ -40,7 +40,7 @@ public:
, m_adc_select(0)
, m_adc_ports(*this, {"ADC0", "ADC1", "ADC2", "ADC3"})
, m_decrypted_opcodes(*this, "decrypted_opcodes")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
// PPI read/write callbacks
@@ -113,7 +113,7 @@ protected:
// driver overrides
virtual void video_start() override;
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void machine_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -144,5 +144,5 @@ protected:
optional_ioport_array<4> m_adc_ports;
bool m_shadow;
optional_shared_ptr<uint16_t> m_decrypted_opcodes;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
};
diff --git a/src/mame/includes/segas16a.h b/src/mame/includes/segas16a.h
index e10eb923192..857b785e827 100644
--- a/src/mame/includes/segas16a.h
+++ b/src/mame/includes/segas16a.h
@@ -54,7 +54,7 @@ public:
, m_read_port(0)
, m_mj_input_num(0)
, m_mj_inputs(*this, {"MJ0", "MJ1", "MJ2", "MJ3", "MJ4", "MJ5"})
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
// PPI read/write callbacks
@@ -132,7 +132,7 @@ protected:
// driver overrides
virtual void video_start() override;
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void machine_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -184,7 +184,7 @@ protected:
uint8_t m_read_port;
uint8_t m_mj_input_num;
optional_ioport_array<6> m_mj_inputs;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
};
class afighter_16a_analog_state : public segas16a_state
diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h
index a26960bd4e7..f11f1f995d7 100644
--- a/src/mame/includes/segas16b.h
+++ b/src/mame/includes/segas16b.h
@@ -65,7 +65,7 @@ public:
, m_decrypted_opcodes(*this, "decrypted_opcodes")
, m_bootleg_scroll(*this, "bootleg_scroll")
, m_bootleg_page(*this, "bootleg_page")
- , m_lamp(*this, "lamp%u", 0U)
+ , m_lamps(*this, "lamp%u", 0U)
{ }
// memory mapping
@@ -198,7 +198,7 @@ protected:
// device overrides
virtual void video_start() override;
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void machine_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -272,7 +272,7 @@ protected:
optional_shared_ptr<uint16_t> m_decrypted_opcodes;
optional_shared_ptr<uint16_t> m_bootleg_scroll;
optional_shared_ptr<uint16_t> m_bootleg_page;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
};
class afighter_16b_analog_state : public segas16b_state
diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h
index 9dcbca0e44a..ac46bd285f1 100644
--- a/src/mame/includes/segas32.h
+++ b/src/mame/includes/segas32.h
@@ -351,7 +351,7 @@ protected:
// virtual void device_reset() override;
private:
- output_finder<16> m_lamp;
+ output_finder<16> m_lamps;
};
class sega_multi32_state : public segas32_state
diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h
index 916aba02ed8..cc324dc34b4 100644
--- a/src/mame/includes/segaxbd.h
+++ b/src/mame/includes/segaxbd.h
@@ -146,7 +146,7 @@ protected:
required_ioport m_io0_porta;
optional_ioport_array<8> m_adc_ports;
optional_ioport_array<4> m_mux_ports;
- output_finder<4> m_lamp;
+ output_finder<4> m_lamps;
protected:
virtual void device_start() override;
diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h
index 825a8c904ca..08928dffe82 100644
--- a/src/mame/includes/seta2.h
+++ b/src/mame/includes/seta2.h
@@ -38,8 +38,8 @@ public:
m_spriteram(*this, "spriteram", 0),
m_tileram(*this, "tileram", 0),
m_vregs(*this, "vregs", 0),
- m_led(*this, "led%u", 0U),
- m_lamp(*this, "lamp%u", 0U)
+ m_leds(*this, "led%u", 0U),
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE16_MEMBER(spriteram16_word_w);
@@ -110,7 +110,7 @@ public:
void telpacfl_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); m_lamp.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); m_lamps.resolve(); }
virtual void video_start() override;
required_device<cpu_device> m_maincpu;
@@ -130,8 +130,8 @@ protected:
optional_shared_ptr<uint16_t> m_spriteram;
optional_shared_ptr<uint16_t> m_tileram;
optional_shared_ptr<uint16_t> m_vregs;
- output_finder<7> m_led;
- output_finder<11> m_lamp;
+ output_finder<7> m_leds;
+ output_finder<11> m_lamps;
int m_xoffset;
int m_yoffset;
diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h
index ef3705ad870..2783c2d849e 100644
--- a/src/mame/includes/skykid.h
+++ b/src/mame/includes/skykid.h
@@ -16,7 +16,7 @@ public:
, m_cus30(*this, "namco")
, m_gfxdecode(*this, "gfxdecode")
, m_palette(*this, "palette")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(inputport_select_w);
@@ -60,7 +60,7 @@ protected:
required_device<namco_cus30_device> m_cus30;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
tilemap_t *m_bg_tilemap;
tilemap_t *m_tx_tilemap;
uint8_t m_priority;
diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h
index 5516b806d95..9b926174620 100644
--- a/src/mame/includes/snookr10.h
+++ b/src/mame/includes/snookr10.h
@@ -9,7 +9,7 @@ public:
m_colorram(*this, "colorram"),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_READ8_MEMBER(dsw_port_1_r);
@@ -36,7 +36,7 @@ public:
void tenballs_map(address_map &map);
protected:
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
int m_outportl;
@@ -52,5 +52,5 @@ protected:
tilemap_t *m_bg_tilemap;
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
- output_finder<7> m_lamp;
+ output_finder<7> m_lamps;
};
diff --git a/src/mame/includes/softbox.h b/src/mame/includes/softbox.h
index 59ae7cae07c..ee72f894540 100644
--- a/src/mame/includes/softbox.h
+++ b/src/mame/includes/softbox.h
@@ -31,7 +31,7 @@ public:
, m_dbrg(*this, COM8116_TAG)
, m_ieee(*this, IEEE488_TAG)
, m_hdc(*this, CORVUS_HDC_TAG)
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
// device_ieee488_interface overrides
@@ -67,7 +67,7 @@ protected:
required_device<com8116_device> m_dbrg;
required_device<ieee488_device> m_ieee;
required_device<corvus_hdc_device> m_hdc;
- output_finder<3> m_led;
+ output_finder<3> m_leds;
};
#endif
diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h
index 378288412ef..11ed0fe4861 100644
--- a/src/mame/includes/spcforce.h
+++ b/src/mame/includes/spcforce.h
@@ -17,7 +17,7 @@ public:
m_scrollram(*this, "scrollram"),
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_WRITE8_MEMBER(SN76496_latch_w);
@@ -57,7 +57,7 @@ protected:
required_shared_ptr<uint8_t> m_scrollram;
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
int m_sn76496_latch;
int m_sn76496_select;
diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h
index 2a1f5a7801b..0c91f7bddb5 100644
--- a/src/mame/includes/suna16.h
+++ b/src/mame/includes/suna16.h
@@ -21,7 +21,7 @@ public:
, m_spriteram2(*this, "spriteram2")
, m_bank1(*this, "bank1")
, m_bank2(*this, "bank2")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
// common
@@ -96,7 +96,7 @@ protected:
optional_memory_bank m_bank1;
optional_memory_bank m_bank2;
- output_finder<4> m_led;
+ output_finder<4> m_leds;
std::unique_ptr<uint16_t[]> m_paletteram;
int m_color_bank;
diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h
index 73b5e002b33..c9ec0a49940 100644
--- a/src/mame/includes/suna8.h
+++ b/src/mame/includes/suna8.h
@@ -30,7 +30,7 @@ public:
m_bank1d(*this, "bank1d"),
m_prot_opcode_toggle(0),
m_remap_sound(0),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
enum GFXBANK_TYPE_T
@@ -156,7 +156,7 @@ public:
void starfigh_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
required_device<cpu_device> m_maincpu;
optional_shared_ptr<uint8_t> m_hardhead_ip;
@@ -207,5 +207,5 @@ protected:
TILE_GET_INFO_MEMBER(get_tile_info);
#endif
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h
index aa165d847e3..7585724dac5 100644
--- a/src/mame/includes/system16.h
+++ b/src/mame/includes/system16.h
@@ -32,7 +32,7 @@ public:
, m_soundlatch(*this, "soundlatch")
, m_adpcm_select(*this, "adpcm_select")
, m_decrypted_opcodes(*this, "decrypted_opcodes")
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE16_MEMBER(sound_command_nmi_w);
@@ -197,7 +197,7 @@ public:
void wb3bbl_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
required_shared_ptr<uint16_t> m_textram;
optional_shared_ptr<uint16_t> m_bg0_tileram;
@@ -293,5 +293,5 @@ protected:
optional_device<generic_latch_8_device> m_soundlatch;
optional_device<ls157_device> m_adpcm_select;
optional_shared_ptr<uint16_t> m_decrypted_opcodes;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
};
diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h
index 2512dde3c96..74f5d10dfea 100644
--- a/src/mame/includes/taito_z.h
+++ b/src/mame/includes/taito_z.h
@@ -38,7 +38,7 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_filter(*this, {"2610.1.r", "2610.1.l", "2610.2.r", "2610.2.l"}),
m_steer(*this, "STEER"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
DECLARE_CUSTOM_INPUT_MEMBER(taitoz_pedal_r);
@@ -96,7 +96,7 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
optional_device_array<filter_volume_device, 4> m_filter;
optional_ioport m_steer;
- output_finder<2> m_lamp;
+ output_finder<2> m_lamps;
DECLARE_WRITE16_MEMBER(cpua_ctrl_w);
DECLARE_WRITE16_MEMBER(bshark_cpua_ctrl_w);
diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h
index 2f54773adc0..dee2e96ca7a 100644
--- a/src/mame/includes/tetrisp2.h
+++ b/src/mame/includes/tetrisp2.h
@@ -32,7 +32,7 @@ public:
m_sub_palette(*this, "sub_palette"),
m_paletteram(*this, "paletteram"),
m_sub_paletteram(*this, "sub_paletteram"),
- m_led(*this, "led%u", 0U)
+ m_leds(*this, "led%u", 0U)
{ }
DECLARE_WRITE16_MEMBER(rockn_systemregs_w);
@@ -104,7 +104,7 @@ public:
void tetrisp2_map(address_map &map);
protected:
- virtual void machine_start() override { m_led.resolve(); }
+ virtual void machine_start() override { m_leds.resolve(); }
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_subcpu;
@@ -134,7 +134,7 @@ protected:
optional_device<palette_device> m_sub_palette;
required_shared_ptr<uint16_t> m_paletteram;
optional_shared_ptr<uint16_t> m_sub_paletteram;
- output_finder<45> m_led;
+ output_finder<45> m_leds;
uint16_t m_rocknms_sub_systemregs[0x10];
uint16_t m_rockn_protectdata;
diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h
index 8bf66dfbe35..c7234827303 100644
--- a/src/mame/includes/unico.h
+++ b/src/mame/includes/unico.h
@@ -15,7 +15,7 @@ public:
unico_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_palette(*this, "palette"),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_maincpu(*this, "maincpu"),
m_oki(*this, "oki"),
m_gfxdecode(*this, "gfxdecode"),
@@ -43,7 +43,7 @@ protected:
void burglarx_map(address_map &map);
required_device<palette_device> m_palette;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
private:
std::unique_ptr<uint16_t[]> m_vram;
diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h
index a1c107bbd4f..b7235600dc1 100644
--- a/src/mame/includes/victory.h
+++ b/src/mame/includes/victory.h
@@ -34,7 +34,7 @@ public:
m_palette(*this, "palette"),
m_videoram(*this, "videoram"),
m_charram(*this, "charram"),
- m_lamp(*this, "lamp%u", 0U)
+ m_lamps(*this, "lamp%u", 0U)
{ }
void victory(machine_config &config);
@@ -61,7 +61,7 @@ protected:
void update_background();
void update_foreground();
- virtual void machine_start() override { m_lamp.resolve(); }
+ virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
void victory_audio(machine_config &config);
void main_io_map(address_map &map);
@@ -90,7 +90,7 @@ private:
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_charram;
- output_finder<4> m_lamp;
+ output_finder<4> m_lamps;
uint16_t m_paletteram[0x40];
std::unique_ptr<uint8_t[]> m_bgbitmap;
diff --git a/src/mame/includes/vip.h b/src/mame/includes/vip.h
index f90aedaacec..b0ab562ef3f 100644
--- a/src/mame/includes/vip.h
+++ b/src/mame/includes/vip.h
@@ -50,7 +50,7 @@ public:
, m_exp_ef1(CLEAR_LINE)
, m_exp_ef3(CLEAR_LINE)
, m_exp_ef4(CLEAR_LINE)
- , m_led(*this, "led%u", 0U)
+ , m_leds(*this, "led%u", 0U)
{ }
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -130,7 +130,7 @@ protected:
// expansion state
uint8_t m_byteio_data;
- output_finder<3> m_led;
+ output_finder<3> m_leds;
};
#endif
diff --git a/src/mame/machine/ajax.cpp b/src/mame/machine/ajax.cpp
index c278cc7b3cc..6ac648670e2 100644
--- a/src/mame/machine/ajax.cpp
+++ b/src/mame/machine/ajax.cpp
@@ -79,14 +79,14 @@ WRITE8_MEMBER(ajax_state::bankswitch_w)
WRITE8_MEMBER(ajax_state::lamps_w)
{
- m_lamp[1] = BIT(data, 1); /* super weapon lamp */
- m_lamp[2] = BIT(data, 2); /* power up lamps */
- m_lamp[5] = BIT(data, 2); /* power up lamps */
- m_lamp[0] = BIT(data, 5); /* start lamp */
- m_lamp[3] = BIT(data, 6); /* game over lamps */
- m_lamp[6] = BIT(data, 6); /* game over lamps */
- m_lamp[4] = BIT(data, 7); /* game over lamps */
- m_lamp[7] = BIT(data, 7); /* game over lamps */
+ m_lamps[1] = BIT(data, 1); /* super weapon lamp */
+ m_lamps[2] = BIT(data, 2); /* power up lamps */
+ m_lamps[5] = BIT(data, 2); /* power up lamps */
+ m_lamps[0] = BIT(data, 5); /* start lamp */
+ m_lamps[3] = BIT(data, 6); /* game over lamps */
+ m_lamps[6] = BIT(data, 6); /* game over lamps */
+ m_lamps[4] = BIT(data, 7); /* game over lamps */
+ m_lamps[7] = BIT(data, 7); /* game over lamps */
}
/* ajax_ls138_f10:
@@ -199,7 +199,7 @@ void ajax_state::machine_start()
uint8_t *MAIN = memregion("maincpu")->base();
uint8_t *SUB = memregion("sub")->base();
- m_lamp.resolve();
+ m_lamps.resolve();
membank("mainbank")->configure_entries(0, 4, &MAIN[0x00000], 0x2000);
membank("mainbank")->configure_entries(4, 8, &MAIN[0x10000], 0x2000);
membank("subbank")->configure_entries(0, 9, &SUB[0x00000], 0x2000);
diff --git a/src/mame/machine/atarifb.cpp b/src/mame/machine/atarifb.cpp
index 5ab2efca34f..2c6969e4004 100644
--- a/src/mame/machine/atarifb.cpp
+++ b/src/mame/machine/atarifb.cpp
@@ -76,8 +76,8 @@ WRITE8_MEMBER(atarifb_state::soccer_out1_w)
m_discrete->write(space, ATARIFB_ATTRACT_EN, data & 0x10); // Attract
m_discrete->write(space, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker
-// m_led[0] = BIT(data, 4); // !!!!!!!!!! Is this correct????
- m_led[1] = BIT(data, 7);
+// m_leds[0] = BIT(data, 4); // !!!!!!!!!! Is this correct????
+ m_leds[1] = BIT(data, 7);
}
diff --git a/src/mame/machine/galaxold.cpp b/src/mame/machine/galaxold.cpp
index f8fab4ba017..0f5036bb1db 100644
--- a/src/mame/machine/galaxold.cpp
+++ b/src/mame/machine/galaxold.cpp
@@ -109,7 +109,7 @@ WRITE8_MEMBER(galaxold_state::galaxold_coin_counter_2_w)
WRITE8_MEMBER(galaxold_state::galaxold_leds_w)
{
- m_led[offset] = BIT(data, 0);
+ m_leds[offset] = BIT(data, 0);
}
READ8_MEMBER(galaxold_state::scramblb_protection_1_r)
diff --git a/src/mame/machine/irobot.cpp b/src/mame/machine/irobot.cpp
index c16cba0571d..3bfb2152b4b 100644
--- a/src/mame/machine/irobot.cpp
+++ b/src/mame/machine/irobot.cpp
@@ -140,8 +140,8 @@ WRITE8_MEMBER(irobot_state::irobot_rom_banksel_w)
membank("bank1")->set_base(&RAM[0x1A000]);
break;
}
- m_led[0] = BIT(data, 4);
- m_led[1] = BIT(data, 5);
+ m_leds[0] = BIT(data, 4);
+ m_leds[1] = BIT(data, 5);
}
TIMER_CALLBACK_MEMBER(irobot_state::scanline_callback)
diff --git a/src/mame/machine/mhavoc.cpp b/src/mame/machine/mhavoc.cpp
index 23183d12f55..232406de97d 100644
--- a/src/mame/machine/mhavoc.cpp
+++ b/src/mame/machine/mhavoc.cpp
@@ -65,7 +65,7 @@ WRITE8_MEMBER(mhavoc_state::mhavoc_gamma_irq_ack_w)
void mhavoc_state::machine_start()
{
- m_lamp.resolve();
+ m_lamps.resolve();
save_item(NAME(m_alpha_data));
save_item(NAME(m_alpha_rcvd));
@@ -269,17 +269,17 @@ WRITE8_MEMBER(mhavoc_state::mhavoc_out_0_w)
/* this is the unpopulated processor in the corner of the pcb farthest from the quad pokey, not used on shipping boards */
/* Bit 0 = Roller light (Blinks on fatal errors) */
- m_lamp[0] = BIT(data, 0);
+ m_lamps[0] = BIT(data, 0);
}
WRITE8_MEMBER(mhavoc_state::alphaone_out_0_w)
{
/* Bit 5 = P2 lamp */
- m_lamp[0] = BIT(~data, 5);
+ m_lamps[0] = BIT(~data, 5);
/* Bit 4 = P1 lamp */
- m_lamp[1] = BIT(~data, 4);
+ m_lamps[1] = BIT(~data, 4);
/* Bit 1 = right coin counter */
machine().bookkeeping().coin_counter_w(1, data & 0x02);
diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp
index fd158211230..f5b543f0c4e 100644
--- a/src/mame/machine/pc1512kb.cpp
+++ b/src/mame/machine/pc1512kb.cpp
@@ -204,7 +204,7 @@ pc1512_keyboard_device::pc1512_keyboard_device(const machine_config &mconfig, co
m_maincpu(*this, I8048_TAG),
m_joy(*this, "joy"),
m_y(*this, "Y%u", 1),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_write_clock(*this),
m_write_data(*this),
m_data_in(1),
@@ -223,7 +223,7 @@ pc1512_keyboard_device::pc1512_keyboard_device(const machine_config &mconfig, co
void pc1512_keyboard_device::device_start()
{
- m_led.resolve();
+ m_leds.resolve();
// allocate timers
m_reset_timer = timer_alloc();
@@ -442,10 +442,10 @@ WRITE8_MEMBER( pc1512_keyboard_device::kb_p2_w )
m_write_clock(BIT(data, 1));
// CAPS LOCK
- m_led[LED_CAPS] = BIT(data, 2);
+ m_leds[LED_CAPS] = BIT(data, 2);
// NUM LOCK
- m_led[LED_NUM] = BIT(data, 3);
+ m_leds[LED_NUM] = BIT(data, 3);
// keyboard row
m_kb_y = (((data >> 4) & 0x07) << 8) | (m_kb_y & 0xff);
diff --git a/src/mame/machine/pc1512kb.h b/src/mame/machine/pc1512kb.h
index 903a98ba1bf..fe5f7c5b30a 100644
--- a/src/mame/machine/pc1512kb.h
+++ b/src/mame/machine/pc1512kb.h
@@ -79,7 +79,7 @@ private:
required_device<vcs_control_port_device> m_joy;
required_ioport_array<11> m_y;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
devcb_write_line m_write_clock;
devcb_write_line m_write_data;
diff --git a/src/mame/machine/pmd85.cpp b/src/mame/machine/pmd85.cpp
index 40b4b21752b..ca16cd117fa 100644
--- a/src/mame/machine/pmd85.cpp
+++ b/src/mame/machine/pmd85.cpp
@@ -257,8 +257,8 @@ WRITE8_MEMBER(pmd85_state::pmd85_ppi_0_portb_w)
WRITE8_MEMBER(pmd85_state::pmd85_ppi_0_portc_w)
{
m_ppi_port_outputs[0][2] = data;
- m_led[PMD85_LED_2] = BIT(data, 3);
- m_led[PMD85_LED_3] = BIT(data, 2);
+ m_leds[PMD85_LED_2] = BIT(data, 3);
+ m_leds[PMD85_LED_3] = BIT(data, 2);
}
/*******************************************************************************
@@ -290,8 +290,8 @@ READ8_MEMBER(pmd85_state::mato_ppi_0_portc_r)
WRITE8_MEMBER(pmd85_state::mato_ppi_0_portc_w)
{
m_ppi_port_outputs[0][2] = data;
- m_led[PMD85_LED_2] = BIT(data, 3);
- m_led[PMD85_LED_3] = BIT(data, 2);
+ m_leds[PMD85_LED_2] = BIT(data, 3);
+ m_leds[PMD85_LED_3] = BIT(data, 2);
}
/*******************************************************************************
diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp
index 9c11fbeb046..de753eefef5 100644
--- a/src/mame/machine/tandy2kb.cpp
+++ b/src/mame/machine/tandy2kb.cpp
@@ -210,7 +210,7 @@ tandy2k_keyboard_device::tandy2k_keyboard_device(const machine_config &mconfig,
device_t(mconfig, TANDY2K_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8048_TAG),
m_y(*this, "Y%u", 0),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_write_clock(*this),
m_write_data(*this),
m_keylatch(0xffff),
@@ -226,7 +226,7 @@ tandy2k_keyboard_device::tandy2k_keyboard_device(const machine_config &mconfig,
void tandy2k_keyboard_device::device_start()
{
- m_led.resolve();
+ m_leds.resolve();
// resolve callbacks
m_write_clock.resolve_safe();
m_write_data.resolve_safe();
@@ -371,8 +371,8 @@ WRITE8_MEMBER( tandy2k_keyboard_device::kb_p2_w )
m_keylatch = ((data & 0x0f) << 8) | (m_keylatch & 0xff);
// led output
- m_led[LED_2] = BIT(~data, 4);
- m_led[LED_1] = BIT(~data, 5);
+ m_leds[LED_2] = BIT(~data, 4);
+ m_leds[LED_1] = BIT(~data, 5);
// keyboard clock
int clock = BIT(data, 6);
diff --git a/src/mame/machine/tandy2kb.h b/src/mame/machine/tandy2kb.h
index ecc9c16cf81..39ecdace66f 100644
--- a/src/mame/machine/tandy2kb.h
+++ b/src/mame/machine/tandy2kb.h
@@ -73,7 +73,7 @@ private:
required_device<cpu_device> m_maincpu;
required_ioport_array<12> m_y;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
devcb_write_line m_write_clock;
devcb_write_line m_write_data;
diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp
index 09a7a7d1592..60af2d67f54 100644
--- a/src/mame/machine/trs80m2kb.cpp
+++ b/src/mame/machine/trs80m2kb.cpp
@@ -211,7 +211,7 @@ trs80m2_keyboard_device::trs80m2_keyboard_device(const machine_config &mconfig,
device_t(mconfig, TRS80M2_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8021_TAG),
m_y(*this, "Y%u", 0),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_write_clock(*this),
m_busy(1),
m_data(1),
@@ -226,7 +226,7 @@ trs80m2_keyboard_device::trs80m2_keyboard_device(const machine_config &mconfig,
void trs80m2_keyboard_device::device_start()
{
- m_led.resolve();
+ m_leds.resolve();
// resolve callbacks
m_write_clock.resolve_safe();
@@ -323,8 +323,8 @@ WRITE8_MEMBER( trs80m2_keyboard_device::kb_p1_w )
m_clk = clk;
}
- m_led[LED_0] = BIT(data, 2);
- m_led[LED_1] = BIT(data, 4);
+ m_leds[LED_0] = BIT(data, 2);
+ m_leds[LED_1] = BIT(data, 4);
}
diff --git a/src/mame/machine/trs80m2kb.h b/src/mame/machine/trs80m2kb.h
index 2859bdbf1ce..9637f240601 100644
--- a/src/mame/machine/trs80m2kb.h
+++ b/src/mame/machine/trs80m2kb.h
@@ -68,7 +68,7 @@ private:
required_device<cpu_device> m_maincpu;
required_ioport_array<12> m_y;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
devcb_write_line m_write_clock;
diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp
index c5af61c9060..46b531f6f06 100644
--- a/src/mame/machine/victor9k_fdc.cpp
+++ b/src/mame/machine/victor9k_fdc.cpp
@@ -216,7 +216,7 @@ victor_9000_fdc_device::victor_9000_fdc_device(const machine_config &mconfig, co
m_floppy0(*this, I8048_TAG":0"),
m_floppy1(*this, I8048_TAG":1"),
m_gcr_rom(*this, "gcr"),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_da(0),
m_da0(0),
m_da1(0),
@@ -261,7 +261,7 @@ victor_9000_fdc_device::victor_9000_fdc_device(const machine_config &mconfig, co
void victor_9000_fdc_device::device_start()
{
- m_led.resolve();
+ m_leds.resolve();
// resolve callbacks
m_irq_cb.resolve_safe();
@@ -895,10 +895,10 @@ WRITE8_MEMBER( victor_9000_fdc_device::via6_pa_w )
*/
// LED, drive A
- m_led[LED_A] = BIT(data, 0);
+ m_leds[LED_A] = BIT(data, 0);
// LED, drive B
- m_led[LED_B] = BIT(data, 2);
+ m_leds[LED_B] = BIT(data, 2);
bool sync = false;
diff --git a/src/mame/machine/victor9k_fdc.h b/src/mame/machine/victor9k_fdc.h
index 942c8038ac4..649598af50c 100644
--- a/src/mame/machine/victor9k_fdc.h
+++ b/src/mame/machine/victor9k_fdc.h
@@ -132,7 +132,7 @@ private:
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_memory_region m_gcr_rom;
- output_finder<2> m_led;
+ output_finder<2> m_leds;
void update_stepper_motor(floppy_image_device *floppy, int stp, int old_st, int st);
void update_spindle_motor(floppy_image_device *floppy, emu_timer *t_tach, bool start, bool stop, bool sel, uint8_t &da);
diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp
index ea4daf5fcb3..add912f2b74 100644
--- a/src/mame/machine/wangpckb.cpp
+++ b/src/mame/machine/wangpckb.cpp
@@ -371,7 +371,7 @@ wangpc_keyboard_device::wangpc_keyboard_device(const machine_config &mconfig, co
m_maincpu(*this, I8051_TAG),
m_y(*this, "Y%u", 0),
m_txd_handler(*this),
- m_led(*this, "led%u", 0U),
+ m_leds(*this, "led%u", 0U),
m_keylatch(0),
m_rxd(1)
{
@@ -385,7 +385,7 @@ wangpc_keyboard_device::wangpc_keyboard_device(const machine_config &mconfig, co
void wangpc_keyboard_device::device_start()
{
m_txd_handler.resolve_safe();
- m_led.resolve();
+ m_leds.resolve();
set_data_frame(1, 8, PARITY_NONE, STOP_BITS_2);
@@ -535,7 +535,7 @@ WRITE8_MEMBER( wangpc_keyboard_device::kb_p1_w )
for (int i = 0; i < 6; i++)
{
- m_led[i] = BIT(~data, i);
+ m_leds[i] = BIT(~data, i);
}
//if (LOG) logerror("P1 %02x\n", data);
diff --git a/src/mame/machine/wangpckb.h b/src/mame/machine/wangpckb.h
index d22fb31e08d..c5b3d59a92f 100644
--- a/src/mame/machine/wangpckb.h
+++ b/src/mame/machine/wangpckb.h
@@ -81,7 +81,7 @@ private:
required_device<i8051_device> m_maincpu;
required_ioport_array<16> m_y;
devcb_write_line m_txd_handler;
- output_finder<6> m_led;
+ output_finder<6> m_leds;
uint8_t m_keylatch;
int m_rxd;
diff --git a/src/mame/machine/xevious.cpp b/src/mame/machine/xevious.cpp
index 1bd65aa5937..385dc424191 100644
--- a/src/mame/machine/xevious.cpp
+++ b/src/mame/machine/xevious.cpp
@@ -138,8 +138,8 @@ WRITE8_MEMBER( xevious_state::battles_customio_data3_w )
WRITE8_MEMBER( xevious_state::battles_CPU4_coin_w )
{
- m_led[0] = BIT(data, 1); // Start 1
- m_led[1] = BIT(data, 0); // Start 2
+ m_leds[0] = BIT(data, 1); // Start 1
+ m_leds[1] = BIT(data, 0); // Start 2
machine().bookkeeping().coin_counter_w(0,data & 0x20);
machine().bookkeeping().coin_counter_w(1,data & 0x10);
diff --git a/src/mame/video/cischeat.cpp b/src/mame/video/cischeat.cpp
index de2267328e5..80942c6f944 100644
--- a/src/mame/video/cischeat.cpp
+++ b/src/mame/video/cischeat.cpp
@@ -132,8 +132,8 @@ WRITE16_MEMBER(cischeat_state::leds_out_w)
{
machine().bookkeeping().coin_counter_w(0, data & 0x01);
machine().bookkeeping().coin_counter_w(1, data & 0x02);
- m_led[0] = BIT(data, 4); // start button
- m_led[1] = BIT(data, 5); // ?
+ m_leds[0] = BIT(data, 4); // start button
+ m_leds[1] = BIT(data, 5); // ?
}
}
@@ -148,7 +148,7 @@ WRITE16_MEMBER(cischeat_state::motor_out_w)
{
// motor (seat?)
if (ACCESSING_BITS_0_7)
- m_led[2] = (data & 0xff) != m_motor_value ? 1 : 0;
+ m_leds[2] = (data & 0xff) != m_motor_value ? 1 : 0;
m_motor_value = data & 0xff;
}
@@ -249,10 +249,10 @@ WRITE16_MEMBER(cischeat_state::f1gpstar_motor_w)
{
machine().bookkeeping().coin_counter_w(0, data & 0x01);
machine().bookkeeping().coin_counter_w(1, data & 0x02);
- m_led[0] = BIT(data, 2); // start button
- m_led[1] = BIT(data, 5); // ?
+ m_leds[0] = BIT(data, 2); // start button
+ m_leds[1] = BIT(data, 5); // ?
// wheel | seat motor
- m_led[2] = BIT(data, 3) | BIT(data, 4);
+ m_leds[2] = BIT(data, 3) | BIT(data, 4);
}
}
diff --git a/src/mame/video/epos.cpp b/src/mame/video/epos.cpp
index b722033d4b9..a73baff8ea3 100644
--- a/src/mame/video/epos.cpp
+++ b/src/mame/video/epos.cpp
@@ -70,8 +70,8 @@ WRITE8_MEMBER(epos_state::port_1_w)
D4-D7 - unused
*/
- m_led[0] = BIT(data, 0);
- m_led[1] = BIT(data, 1);
+ m_leds[0] = BIT(data, 0);
+ m_leds[1] = BIT(data, 1);
machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01);