diff options
Diffstat (limited to 'src/mame/includes')
59 files changed, 146 insertions, 146 deletions
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 |