From b4b6b96e2b93b9623e4ec62d765e28ec0479cf10 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Sat, 17 Feb 2024 09:18:02 +0100 Subject: [PATCH] various drivers: removed some unneeded flipscreen related trampolines --- src/mame/dataeast/kchamp.cpp | 4 ++-- src/mame/dataeast/kchamp.h | 1 - src/mame/dataeast/kchamp_v.cpp | 5 ----- src/mame/gaelco/wrally.cpp | 8 +------- src/mame/jaleco/pturn.cpp | 8 +------- src/mame/konami/hyperspt.cpp | 9 +-------- src/mame/konami/mikie.cpp | 9 +-------- src/mame/konami/sbasketb.cpp | 9 +-------- src/mame/konami/trackfld.cpp | 4 ++-- src/mame/konami/trackfld.h | 1 - src/mame/konami/trackfld_v.cpp | 6 ------ src/mame/namco/galaga.cpp | 11 +++-------- src/mame/namco/galaga.h | 1 - src/mame/namco/mappy.cpp | 7 +------ src/mame/namco/mappy.h | 1 - src/mame/namco/rallyx.cpp | 10 ++-------- src/mame/namco/rallyx.h | 1 - src/mame/namco/warpwarp.cpp | 9 ++------- src/mame/namco/warpwarp.h | 1 - src/mame/omori/popper.cpp | 8 +------- src/mame/orca/kyugo.cpp | 2 +- src/mame/orca/kyugo.h | 1 - src/mame/orca/kyugo_v.cpp | 6 ------ src/mame/taito/gladiatr.cpp | 9 ++------- src/mame/taito/gladiatr.h | 1 - src/mame/taito/tsamurai.cpp | 9 ++------- src/mame/taito/tsamurai.h | 1 - src/mame/tecfri/ambush.cpp | 8 +------- src/mame/tecfri/sauro.cpp | 10 ++-------- src/mame/toaplan/mjsister.cpp | 8 +------- 30 files changed, 27 insertions(+), 141 deletions(-) diff --git a/src/mame/dataeast/kchamp.cpp b/src/mame/dataeast/kchamp.cpp index e3eefe55517..ea7514edd65 100644 --- a/src/mame/dataeast/kchamp.cpp +++ b/src/mame/dataeast/kchamp.cpp @@ -417,7 +417,7 @@ void kchamp_state::kchampvs(machine_config &config) // NMIs from MSM5205 ls259_device &mainlatch(LS259(config, "mainlatch")); // 8C - mainlatch.q_out_cb<0>().set(FUNC(kchamp_state::flipscreen_w)); + mainlatch.q_out_cb<0>().set(FUNC(kchamp_state::flip_screen_set)); mainlatch.q_out_cb<1>().set(FUNC(kchamp_state::nmi_enable_w)); mainlatch.q_out_cb<2>().set(FUNC(kchamp_state::sound_reset_w)); @@ -473,7 +473,7 @@ void kchamp_state::kchamp(machine_config &config) // NMIs from 125Hz clock ls259_device &mainlatch(LS259(config, "mainlatch")); // IC71 - mainlatch.q_out_cb<0>().set(FUNC(kchamp_state::flipscreen_w)); + mainlatch.q_out_cb<0>().set(FUNC(kchamp_state::flip_screen_set)); mainlatch.q_out_cb<1>().set(FUNC(kchamp_state::nmi_enable_w)); MCFG_MACHINE_START_OVERRIDE(kchamp_state,kchamp) diff --git a/src/mame/dataeast/kchamp.h b/src/mame/dataeast/kchamp.h index 7ddf91a789b..70969b3a544 100644 --- a/src/mame/dataeast/kchamp.h +++ b/src/mame/dataeast/kchamp.h @@ -77,7 +77,6 @@ private: void kc_sound_control_w(offs_t offset, uint8_t data); void kchamp_videoram_w(offs_t offset, uint8_t data); void kchamp_colorram_w(offs_t offset, uint8_t data); - void flipscreen_w(int state); void sound_control_w(u8 data); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void machine_reset() override; diff --git a/src/mame/dataeast/kchamp_v.cpp b/src/mame/dataeast/kchamp_v.cpp index 76532b4459f..38ef03fc38c 100644 --- a/src/mame/dataeast/kchamp_v.cpp +++ b/src/mame/dataeast/kchamp_v.cpp @@ -37,11 +37,6 @@ void kchamp_state::kchamp_colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -void kchamp_state::flipscreen_w(int state) -{ - flip_screen_set(state); -} - TILE_GET_INFO_MEMBER(kchamp_state::get_bg_tile_info) { int code = m_videoram[tile_index] + ((m_colorram[tile_index] & 7) << 8); diff --git a/src/mame/gaelco/wrally.cpp b/src/mame/gaelco/wrally.cpp index 47361db1f05..a71ceaabbf6 100644 --- a/src/mame/gaelco/wrally.cpp +++ b/src/mame/gaelco/wrally.cpp @@ -177,7 +177,6 @@ private: uint8_t shareram_r(offs_t offset); void shareram_w(offs_t offset, uint8_t data); void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - void flipscreen_w(int state); void okim6295_bankswitch_w(uint8_t data); template void coin_counter_w(int state); template void coin_lockout_w(int state); @@ -342,11 +341,6 @@ void wrally_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask) m_tilemap[(offset & 0x1fff) >> 12]->mark_tile_dirty(((offset << 1) & 0x1fff) >> 2); } -void wrally_state::flipscreen_w(int state) -{ - flip_screen_set(state); -} - void wrally_state::okim6295_bankswitch_w(uint8_t data) { m_okibank->set_entry(data & 0x0f); @@ -562,7 +556,7 @@ void wrally_state::wrally(machine_config &config) m_outlatch->q_out_cb<2>().set(FUNC(wrally_state::coin_counter_w<0>)); m_outlatch->q_out_cb<3>().set(FUNC(wrally_state::coin_counter_w<1>)); m_outlatch->q_out_cb<4>().set_nop(); // Sound muting - m_outlatch->q_out_cb<5>().set(FUNC(wrally_state::flipscreen_w)); + m_outlatch->q_out_cb<5>().set(FUNC(wrally_state::flip_screen_set)); m_outlatch->q_out_cb<6>().set(FUNC(wrally_state::adc_en)); // ENA/D, for pot wheel m_outlatch->q_out_cb<7>().set(FUNC(wrally_state::adc_clk)); // CKA/D, " diff --git a/src/mame/jaleco/pturn.cpp b/src/mame/jaleco/pturn.cpp index 981c8f02009..2d3b83421f6 100644 --- a/src/mame/jaleco/pturn.cpp +++ b/src/mame/jaleco/pturn.cpp @@ -144,7 +144,6 @@ private: void bg_scrolly_w(uint8_t data); void fgbank_w(int state); void bgbank_w(int state); - void flip_w(int state); uint8_t custom_r(offs_t offset); TILE_GET_INFO_MEMBER(get_tile_info); @@ -305,11 +304,6 @@ void pturn_state::bgbank_w(int state) m_bgmap->mark_all_dirty(); } -void pturn_state::flip_w(int state) -{ - flip_screen_set(state); -} - uint8_t pturn_state::custom_r(offs_t offset) { @@ -518,7 +512,7 @@ void pturn_state::pturn(machine_config &config) m_audiocpu->set_periodic_int(FUNC(pturn_state::sub_intgen), attotime::from_hz(3*60)); ls259_device &mainlatch(LS259(config, "mainlatch")); - mainlatch.q_out_cb<0>().set(FUNC(pturn_state::flip_w)); + mainlatch.q_out_cb<0>().set(FUNC(pturn_state::flip_screen_set)); mainlatch.q_out_cb<1>().set(FUNC(pturn_state::nmi_main_enable_w)); mainlatch.q_out_cb<2>().set(FUNC(pturn_state::coin_counter_1_w)); mainlatch.q_out_cb<3>().set(FUNC(pturn_state::coin_counter_2_w)); diff --git a/src/mame/konami/hyperspt.cpp b/src/mame/konami/hyperspt.cpp index 649048cd5ba..06ed616b5c0 100644 --- a/src/mame/konami/hyperspt.cpp +++ b/src/mame/konami/hyperspt.cpp @@ -98,7 +98,6 @@ private: void irq_mask_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); - void flipscreen_w(int state); void palette(palette_device &palette) const; @@ -244,12 +243,6 @@ void base_state::colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -void base_state::flipscreen_w(int state) -{ - flip_screen_set(state); - machine().tilemap().mark_all_dirty(); -} - TILE_GET_INFO_MEMBER(base_state::get_bg_tile_info) { int const code = m_videoram[tile_index] + ((m_colorram[tile_index] & 0x80) << 1) + ((m_colorram[tile_index] & 0x40) << 3); @@ -628,7 +621,7 @@ void base_state::base(machine_config &config) Z80(config, m_audiocpu, XTAL(14'318'181) / 4); // verified on PCB ls259_device &mainlatch(LS259(config, "mainlatch")); // F2 - mainlatch.q_out_cb<0>().set(FUNC(base_state::flipscreen_w)); + mainlatch.q_out_cb<0>().set(FUNC(base_state::flip_screen_set)); mainlatch.q_out_cb<1>().set(m_soundbrd, FUNC(trackfld_audio_device::sh_irqtrigger_w)); // SOUND ON mainlatch.q_out_cb<2>().set_nop(); // END mainlatch.q_out_cb<3>().set(FUNC(base_state::coin_counter_w<0>)); // COIN 1 diff --git a/src/mame/konami/mikie.cpp b/src/mame/konami/mikie.cpp index 40f07fd9901..ab8e7286ccb 100644 --- a/src/mame/konami/mikie.cpp +++ b/src/mame/konami/mikie.cpp @@ -106,7 +106,6 @@ private: void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); void palettebank_w(uint8_t data); - void flipscreen_w(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); void palette(palette_device &palette) const; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -211,12 +210,6 @@ void mikie_state::palettebank_w(uint8_t data) } } -void mikie_state::flipscreen_w(int state) -{ - flip_screen_set(state); - machine().tilemap().mark_all_dirty(); -} - TILE_GET_INFO_MEMBER(mikie_state::get_bg_tile_info) { int const code = m_videoram[tile_index] + ((m_colorram[tile_index] & 0x20) << 3); @@ -474,7 +467,7 @@ void mikie_state::mikie(machine_config &config) mainlatch.q_out_cb<1>().set(FUNC(mikie_state::coin_counter_w<1>)); // COIN2 mainlatch.q_out_cb<2>().set(FUNC(mikie_state::sh_irqtrigger_w)); // SOUNDON mainlatch.q_out_cb<3>().set_nop(); // END (not used?) - mainlatch.q_out_cb<6>().set(FUNC(mikie_state::flipscreen_w)); // FLIP + mainlatch.q_out_cb<6>().set(FUNC(mikie_state::flip_screen_set)); // FLIP mainlatch.q_out_cb<7>().set(FUNC(mikie_state::irq_mask_w)); // INT WATCHDOG_TIMER(config, "watchdog"); diff --git a/src/mame/konami/sbasketb.cpp b/src/mame/konami/sbasketb.cpp index 9d5565748e8..e3d4acf8d99 100644 --- a/src/mame/konami/sbasketb.cpp +++ b/src/mame/konami/sbasketb.cpp @@ -119,7 +119,6 @@ private: void irq_mask_w(int state); void videoram_w(offs_t offset, uint8_t data); void colorram_w(offs_t offset, uint8_t data); - void flipscreen_w(int state); void spriteram_select_w(int state); void konami_sn76496_latch_w(uint8_t data) { m_sn76496_latch = data; } void konami_sn76496_w(uint8_t data) { m_sn->write(m_sn76496_latch); } @@ -226,12 +225,6 @@ void sbasketb_state::colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -void sbasketb_state::flipscreen_w(int state) -{ - flip_screen_set(state); - machine().tilemap().mark_all_dirty(); -} - void sbasketb_state::spriteram_select_w(int state) { m_spriteram_select = state; @@ -419,7 +412,7 @@ void sbasketb_state::sbasketb(machine_config &config) m_audiocpu->set_addrmap(AS_PROGRAM, &sbasketb_state::sound_map); ls259_device &mainlatch(LS259(config, "mainlatch")); // B3 - mainlatch.q_out_cb<0>().set(FUNC(sbasketb_state::flipscreen_w)); // FLIP + mainlatch.q_out_cb<0>().set(FUNC(sbasketb_state::flip_screen_set)); // FLIP mainlatch.q_out_cb<1>().set(FUNC(sbasketb_state::irq_mask_w)); // INTST mainlatch.q_out_cb<2>().set_nop(); // MUT - not used? mainlatch.q_out_cb<3>().set(FUNC(sbasketb_state::coin_counter_w<0>)); // COIN 1 diff --git a/src/mame/konami/trackfld.cpp b/src/mame/konami/trackfld.cpp index 1e23d81d81d..1a042066580 100644 --- a/src/mame/konami/trackfld.cpp +++ b/src/mame/konami/trackfld.cpp @@ -896,7 +896,7 @@ void trackfld_state::trackfld(machine_config &config) MCFG_MACHINE_RESET_OVERRIDE(trackfld_state,trackfld) LS259(config, m_mainlatch); // 1D - m_mainlatch->q_out_cb<0>().set(FUNC(trackfld_state::flipscreen_w)); // FLIP + m_mainlatch->q_out_cb<0>().set(FUNC(trackfld_state::flip_screen_set)); // FLIP m_mainlatch->q_out_cb<1>().set("trackfld_audio", FUNC(trackfld_audio_device::sh_irqtrigger_w)); // 26 = SOUND ON m_mainlatch->q_out_cb<2>().set_nop(); // 25 = MUT? m_mainlatch->q_out_cb<3>().set(FUNC(trackfld_state::coin_counter_1_w)); // 24 = OUT1 @@ -968,7 +968,7 @@ void trackfld_state::yieartf(machine_config &config) MCFG_MACHINE_RESET_OVERRIDE(trackfld_state,trackfld) ls259_device &mainlatch(LS259(config, "mainlatch")); // 1D - mainlatch.q_out_cb<0>().set(FUNC(trackfld_state::flipscreen_w)); + mainlatch.q_out_cb<0>().set(FUNC(trackfld_state::flip_screen_set)); mainlatch.q_out_cb<1>().set("trackfld_audio", FUNC(trackfld_audio_device::sh_irqtrigger_w)); mainlatch.q_out_cb<2>().set(FUNC(trackfld_state::nmi_mask_w)); mainlatch.q_out_cb<3>().set(FUNC(trackfld_state::coin_counter_1_w)); diff --git a/src/mame/konami/trackfld.h b/src/mame/konami/trackfld.h index c65f052016b..c83b650f7b2 100644 --- a/src/mame/konami/trackfld.h +++ b/src/mame/konami/trackfld.h @@ -117,7 +117,6 @@ private: void coin_counter_2_w(int state); void irq_mask_w(int state); void nmi_mask_w(int state); - void flipscreen_w(int state); TILE_GET_INFO_MEMBER(get_bg_tile_info); DECLARE_MACHINE_START(trackfld); diff --git a/src/mame/konami/trackfld_v.cpp b/src/mame/konami/trackfld_v.cpp index e5a987a6538..07c629481b7 100644 --- a/src/mame/konami/trackfld_v.cpp +++ b/src/mame/konami/trackfld_v.cpp @@ -99,12 +99,6 @@ void trackfld_state::trackfld_colorram_w(offs_t offset, uint8_t data) m_bg_tilemap->mark_tile_dirty(offset); } -void trackfld_state::flipscreen_w(int state) -{ - flip_screen_set(state); - machine().tilemap().mark_all_dirty(); -} - void trackfld_state::atlantol_gfxbank_w(uint8_t data) { if (data & 1) diff --git a/src/mame/namco/galaga.cpp b/src/mame/namco/galaga.cpp index 45373cefeff..3a3af9d8a2a 100644 --- a/src/mame/namco/galaga.cpp +++ b/src/mame/namco/galaga.cpp @@ -730,11 +730,6 @@ uint8_t galaga_state::bosco_dsw_r(offs_t offset) return bit0 | (bit1 << 1); } -void galaga_state::flip_screen_w(int state) -{ - flip_screen_set(state); -} - void galaga_state::irq1_clear_w(int state) { m_main_irq_mask = state; @@ -1621,7 +1616,7 @@ void bosco_state::bosco(machine_config &config) n06xx_1.chip_select_callback<1>().set("52xx", FUNC(namco_52xx_device::chip_select)); LS259(config, m_videolatch); // 1B on video board - m_videolatch->q_out_cb<0>().set(FUNC(galaga_state::flip_screen_w)).invert(); + m_videolatch->q_out_cb<0>().set(FUNC(bosco_state::flip_screen_set)).invert(); // Q4-Q5 to 05XX for starfield blink m_videolatch->q_out_cb<7>().set("50xx_2", FUNC(namco_50xx_device::reset)); m_videolatch->q_out_cb<7>().append("52xx", FUNC(namco_52xx_device::reset)); @@ -1701,7 +1696,7 @@ void galaga_state::galaga(machine_config &config) LS259(config, m_videolatch); // 5K on video board // Q0-Q5 to 05XX for starfield control - m_videolatch->q_out_cb<7>().set(FUNC(galaga_state::flip_screen_w)); + m_videolatch->q_out_cb<7>().set(FUNC(galaga_state::flip_screen_set)); WATCHDOG_TIMER(config, "watchdog").set_vblank_count(m_screen, 8); @@ -1935,7 +1930,7 @@ void digdug_state::digdug(machine_config &config) m_videolatch->parallel_out_cb().set(FUNC(digdug_state::bg_select_w)).mask(0x33); m_videolatch->q_out_cb<2>().set(FUNC(digdug_state::tx_color_mode_w)); m_videolatch->q_out_cb<3>().set(FUNC(digdug_state::bg_disable_w)); - m_videolatch->q_out_cb<7>().set(FUNC(digdug_state::flip_screen_w)); + m_videolatch->q_out_cb<7>().set(FUNC(digdug_state::flip_screen_set)); ER2055(config, m_earom); diff --git a/src/mame/namco/galaga.h b/src/mame/namco/galaga.h index 9f318b01e1f..1478a0cc9ed 100644 --- a/src/mame/namco/galaga.h +++ b/src/mame/namco/galaga.h @@ -41,7 +41,6 @@ public: { } uint8_t bosco_dsw_r(offs_t offset); - void flip_screen_w(int state); void irq1_clear_w(int state); void irq2_clear_w(int state); void nmion_w(int state); diff --git a/src/mame/namco/mappy.cpp b/src/mame/namco/mappy.cpp index 8989dd0ded2..598435c1b5f 100644 --- a/src/mame/namco/mappy.cpp +++ b/src/mame/namco/mappy.cpp @@ -603,11 +603,6 @@ void mappy_state::int_on_3_w(int state) m_subcpu2->set_input_line(0, CLEAR_LINE); } -void mappy_state::mappy_flip_w(int state) -{ - flip_screen_set(state); -} - template TIMER_CALLBACK_MEMBER(mappy_state::namcoio_run_timer) @@ -1492,7 +1487,7 @@ void mappy_state::mappy_common(machine_config &config) ls259_device &mainlatch(LS259(config, "mainlatch")); // 2M on CPU board mainlatch.q_out_cb<0>().set(FUNC(mappy_state::int_on_2_w)); mainlatch.q_out_cb<1>().set(FUNC(mappy_state::int_on_w)); - mainlatch.q_out_cb<2>().set(FUNC(mappy_state::mappy_flip_w)); + mainlatch.q_out_cb<2>().set(FUNC(mappy_state::flip_screen_set)); mainlatch.q_out_cb<3>().set(m_namco_15xx, FUNC(namco_15xx_device::sound_enable_w)); mainlatch.q_out_cb<4>().set(m_namcoio[0], FUNC(namcoio_device::set_reset_line)).invert(); mainlatch.q_out_cb<4>().append(m_namcoio[1], FUNC(namcoio_device::set_reset_line)).invert(); diff --git a/src/mame/namco/mappy.h b/src/mame/namco/mappy.h index a4001686122..b4c3525540a 100644 --- a/src/mame/namco/mappy.h +++ b/src/mame/namco/mappy.h @@ -73,7 +73,6 @@ private: void int_on_w(int state); void int_on_2_w(int state); void int_on_3_w(int state); - void mappy_flip_w(int state); void superpac_videoram_w(offs_t offset, uint8_t data); void mappy_videoram_w(offs_t offset, uint8_t data); void superpac_flipscreen_w(uint8_t data); diff --git a/src/mame/namco/rallyx.cpp b/src/mame/namco/rallyx.cpp index 827c9489390..0a52503369d 100644 --- a/src/mame/namco/rallyx.cpp +++ b/src/mame/namco/rallyx.cpp @@ -255,12 +255,6 @@ void rallyx_state::sound_on_w(int state) } -void rallyx_state::flip_screen_w(int state) -{ - flip_screen_set(state); -} - - void rallyx_state::coin_lockout_w(int state) { machine().bookkeeping().coin_lockout_w(0, !state); @@ -852,7 +846,7 @@ void rallyx_state::rallyx(machine_config &config) mainlatch.q_out_cb<0>().set(FUNC(rallyx_state::bang_w)); // BANG mainlatch.q_out_cb<1>().set(FUNC(rallyx_state::irq_mask_w)); // INT ON mainlatch.q_out_cb<2>().set(FUNC(rallyx_state::sound_on_w)); // SOUND ON - mainlatch.q_out_cb<3>().set(FUNC(rallyx_state::flip_screen_w)); // FLIP + mainlatch.q_out_cb<3>().set(FUNC(rallyx_state::flip_screen_set)); // FLIP mainlatch.q_out_cb<4>().set_output("led0"); mainlatch.q_out_cb<5>().set_output("led1"); mainlatch.q_out_cb<6>().set(FUNC(rallyx_state::coin_lockout_w)); @@ -897,7 +891,7 @@ void rallyx_state::jungler(machine_config &config) mainlatch.q_out_cb<0>().set("timeplt_audio", FUNC(timeplt_audio_device::sh_irqtrigger_w)); // SOUNDON mainlatch.q_out_cb<1>().set(FUNC(rallyx_state::nmi_mask_w)); // INTST mainlatch.q_out_cb<2>().set("timeplt_audio", FUNC(timeplt_audio_device::mute_w)); // MUT - mainlatch.q_out_cb<3>().set(FUNC(rallyx_state::flip_screen_w)); // FLIP + mainlatch.q_out_cb<3>().set(FUNC(rallyx_state::flip_screen_set)); // FLIP mainlatch.q_out_cb<4>().set(FUNC(rallyx_state::coin_counter_1_w)); // OUT1 mainlatch.q_out_cb<5>().set_nop(); // OUT2 mainlatch.q_out_cb<6>().set(FUNC(rallyx_state::coin_counter_2_w)); // OUT3 diff --git a/src/mame/namco/rallyx.h b/src/mame/namco/rallyx.h index cb36590b223..31bd9ab971a 100644 --- a/src/mame/namco/rallyx.h +++ b/src/mame/namco/rallyx.h @@ -85,7 +85,6 @@ private: void irq_mask_w(int state); void nmi_mask_w(int state); void sound_on_w(int state); - void flip_screen_w(int state); void coin_lockout_w(int state); void coin_counter_1_w(int state); void coin_counter_2_w(int state); diff --git a/src/mame/namco/warpwarp.cpp b/src/mame/namco/warpwarp.cpp index 356ca0ad64a..03db7412a91 100644 --- a/src/mame/namco/warpwarp.cpp +++ b/src/mame/namco/warpwarp.cpp @@ -289,11 +289,6 @@ void warpwarp_state::ball_on_w(int state) m_maincpu->set_input_line(0, CLEAR_LINE); } -void warpwarp_state::inv_w(int state) -{ - flip_screen_set(state); -} - /* Color Games I/O */ @@ -781,7 +776,7 @@ void warpwarp_state::geebee(machine_config &config) m_latch->q_out_cb<4>().set(FUNC(warpwarp_state::lock_out_w)); m_latch->q_out_cb<5>().set(FUNC(warpwarp_state::geebee_bgw_w)); m_latch->q_out_cb<6>().set(FUNC(warpwarp_state::ball_on_w)); - m_latch->q_out_cb<7>().set(FUNC(warpwarp_state::inv_w)); + m_latch->q_out_cb<7>().set(FUNC(warpwarp_state::flip_screen_set)); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -851,7 +846,7 @@ void warpwarp_state::bombbee(machine_config &config) m_latch->q_out_cb<4>().set(FUNC(warpwarp_state::lock_out_w)); m_latch->q_out_cb<5>().set(FUNC(warpwarp_state::counter_w)); m_latch->q_out_cb<6>().set(FUNC(warpwarp_state::ball_on_w)); - m_latch->q_out_cb<7>().set(FUNC(warpwarp_state::inv_w)); + m_latch->q_out_cb<7>().set(FUNC(warpwarp_state::flip_screen_set)); WATCHDOG_TIMER(config, m_watchdog); diff --git a/src/mame/namco/warpwarp.h b/src/mame/namco/warpwarp.h index 855a787566e..1fa656f723f 100644 --- a/src/mame/namco/warpwarp.h +++ b/src/mame/namco/warpwarp.h @@ -95,7 +95,6 @@ private: void lock_out_w(int state); void geebee_bgw_w(int state); void ball_on_w(int state); - void inv_w(int state); void geebee_videoram_w(offs_t offset, uint8_t data); virtual void machine_start() override; diff --git a/src/mame/omori/popper.cpp b/src/mame/omori/popper.cpp index 929dadbdb18..28c0a1dd1b1 100644 --- a/src/mame/omori/popper.cpp +++ b/src/mame/omori/popper.cpp @@ -110,7 +110,6 @@ private: TILE_GET_INFO_MEMBER(layer1_tile_info); void nmi_control_w(int state); - void crt_direction_w(int state); void back_color_select_w(int state); void vram_page_select_w(int state); template void intcycle_w(int state); @@ -304,11 +303,6 @@ TIMER_CALLBACK_MEMBER(popper_state::scanline_tick) m_scanline_timer->adjust(m_screen->time_until_pos(y + 1, 0)); } -void popper_state::crt_direction_w(int state) -{ - flip_screen_set(state); -} - void popper_state::back_color_select_w(int state) { m_back_color = state; @@ -548,7 +542,7 @@ void popper_state::popper(machine_config &config) ls259_device &outlatch(LS259(config, "outlatch")); outlatch.q_out_cb<0>().set(FUNC(popper_state::nmi_control_w)); - outlatch.q_out_cb<1>().set(FUNC(popper_state::crt_direction_w)); + outlatch.q_out_cb<1>().set(FUNC(popper_state::flip_screen_set)); outlatch.q_out_cb<2>().set(FUNC(popper_state::back_color_select_w)); outlatch.q_out_cb<3>().set(FUNC(popper_state::vram_page_select_w)); outlatch.q_out_cb<4>().set(FUNC(popper_state::intcycle_w<0>)); diff --git a/src/mame/orca/kyugo.cpp b/src/mame/orca/kyugo.cpp index a2b4fbd5959..867b9cc5588 100644 --- a/src/mame/orca/kyugo.cpp +++ b/src/mame/orca/kyugo.cpp @@ -643,7 +643,7 @@ void kyugo_state::kyugo_base(machine_config &config) ls259_device &mainlatch(LS259(config, "mainlatch")); mainlatch.q_out_cb<0>().set(FUNC(kyugo_state::nmi_mask_w)); - mainlatch.q_out_cb<1>().set(FUNC(kyugo_state::flipscreen_w)); + mainlatch.q_out_cb<1>().set(FUNC(kyugo_state::flip_screen_set)); mainlatch.q_out_cb<2>().set_inputline(m_subcpu, INPUT_LINE_RESET).invert(); // video hardware diff --git a/src/mame/orca/kyugo.h b/src/mame/orca/kyugo.h index 94eade56bd1..6e6b3f006fa 100644 --- a/src/mame/orca/kyugo.h +++ b/src/mame/orca/kyugo.h @@ -51,7 +51,6 @@ private: void scroll_x_lo_w(uint8_t data); void gfxctrl_w(uint8_t data); void scroll_y_w(uint8_t data); - void flipscreen_w(int state); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); diff --git a/src/mame/orca/kyugo_v.cpp b/src/mame/orca/kyugo_v.cpp index b52b0bfb453..c0b36d192f9 100644 --- a/src/mame/orca/kyugo_v.cpp +++ b/src/mame/orca/kyugo_v.cpp @@ -127,12 +127,6 @@ void kyugo_state::scroll_y_w(uint8_t data) } -void kyugo_state::flipscreen_w(int state) -{ - flip_screen_set(state); -} - - /************************************* * * Video update diff --git a/src/mame/taito/gladiatr.cpp b/src/mame/taito/gladiatr.cpp index b248f1e1dba..ea32c9319c2 100644 --- a/src/mame/taito/gladiatr.cpp +++ b/src/mame/taito/gladiatr.cpp @@ -265,11 +265,6 @@ u8 gladiatr_state_base::adpcm_command_r() return m_soundlatch->read(); } -void gladiatr_state_base::flipscreen_w(int state) -{ - flip_screen_set(state); -} - #if 1 /* !!!!! patch to IRQ timing for 2nd CPU !!!!! */ void gladiatr_state::gladiatr_irq_patch_w(u8 data) @@ -956,7 +951,7 @@ void ppking_state::ppking(machine_config &config) // mainlatch.q_out_cb<3>().set(FUNC(ppking_state::nmi_mask_w)); // mainlatch.q_out_cb<4>().set("sub", INPUT_LINE_RESET); // shadowed by aforementioned hack // Q6 used - mainlatch.q_out_cb<7>().set(FUNC(ppking_state::flipscreen_w)); + mainlatch.q_out_cb<7>().set(FUNC(ppking_state::flip_screen_set)); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); @@ -1013,7 +1008,7 @@ void gladiatr_state::gladiatr(machine_config &config) mainlatch.q_out_cb<1>().set(FUNC(gladiatr_state::spritebank_w)); mainlatch.q_out_cb<2>().set_membank(m_mainbank); mainlatch.q_out_cb<4>().set_inputline("sub", INPUT_LINE_RESET); // shadowed by aforementioned hack - mainlatch.q_out_cb<7>().set(FUNC(gladiatr_state::flipscreen_w)); + mainlatch.q_out_cb<7>().set(FUNC(gladiatr_state::flip_screen_set)); I8741A(config, m_cctl, 12_MHz_XTAL/2); /* verified on pcb */ m_cctl->t0_in_cb().set_ioport("COINS").bit(3); diff --git a/src/mame/taito/gladiatr.h b/src/mame/taito/gladiatr.h index 4ab30ab5a0c..917b7742a33 100644 --- a/src/mame/taito/gladiatr.h +++ b/src/mame/taito/gladiatr.h @@ -74,7 +74,6 @@ protected: void spritebuffer_w(int state); void adpcm_command_w(u8 data); u8 adpcm_command_r(); - void flipscreen_w(int state); void ym_irq(int state); TILE_GET_INFO_MEMBER(bg_get_tile_info); diff --git a/src/mame/taito/tsamurai.cpp b/src/mame/taito/tsamurai.cpp index b0a72b28de4..acbd1751529 100644 --- a/src/mame/taito/tsamurai.cpp +++ b/src/mame/taito/tsamurai.cpp @@ -128,11 +128,6 @@ void m660_state::m660_sound_command3_w(uint8_t data) m_audio3->set_input_line(0, HOLD_LINE ); } -void tsamurai_state::flip_screen_w(int state) -{ - flip_screen_set(state); -} - void tsamurai_state::coin1_counter_w(int state) { machine().bookkeeping().coin_counter_w(0, state); @@ -720,7 +715,7 @@ void tsamurai_state::tsamurai(machine_config &config) ls259_device &mainlatch(LS259(config, "mainlatch")); - mainlatch.q_out_cb<0>().set(FUNC(tsamurai_state::flip_screen_w)); + mainlatch.q_out_cb<0>().set(FUNC(tsamurai_state::flip_screen_set)); mainlatch.q_out_cb<1>().set(FUNC(tsamurai_state::nmi_enable_w)); mainlatch.q_out_cb<2>().set(FUNC(tsamurai_state::textbank1_w)); mainlatch.q_out_cb<3>().set(FUNC(tsamurai_state::coin1_counter_w)); @@ -810,7 +805,7 @@ void m660_state::m660(machine_config &config) ls259_device &mainlatch(LS259(config, "mainlatch")); - mainlatch.q_out_cb<0>().set(FUNC(m660_state::flip_screen_w)); + mainlatch.q_out_cb<0>().set(FUNC(m660_state::flip_screen_set)); mainlatch.q_out_cb<1>().set(FUNC(m660_state::nmi_enable_w)); mainlatch.q_out_cb<2>().set(FUNC(m660_state::textbank1_w)); mainlatch.q_out_cb<3>().set(FUNC(m660_state::coin1_counter_w)); diff --git a/src/mame/taito/tsamurai.h b/src/mame/taito/tsamurai.h index 9346a3ae284..2541a24de0f 100644 --- a/src/mame/taito/tsamurai.h +++ b/src/mame/taito/tsamurai.h @@ -42,7 +42,6 @@ protected: // tsamurai and m660 specific void bg_videoram_w(offs_t offset, uint8_t data); void fg_colorram_w(offs_t offset, uint8_t data); - void flip_screen_w(int state); void scrolly_w(uint8_t data); void scrollx_w(uint8_t data); void bgcolor_w(uint8_t data); diff --git a/src/mame/tecfri/ambush.cpp b/src/mame/tecfri/ambush.cpp index b1a375eecb2..3c50894fd0f 100644 --- a/src/mame/tecfri/ambush.cpp +++ b/src/mame/tecfri/ambush.cpp @@ -92,7 +92,6 @@ private: TILE_GET_INFO_MEMBER(mariobl_char_tile_info); TILE_GET_INFO_MEMBER(dkong3abl_char_tile_info); - void flip_screen_w(int state); void scroll_ram_w(offs_t offset, uint8_t data); void color_bank_1_w(int state); void color_bank_2_w(int state); @@ -557,11 +556,6 @@ uint32_t ambush_state::screen_update_bootleg(screen_device &screen, bitmap_ind16 return 0; } -void ambush_state::flip_screen_w(int state) -{ - flip_screen_set(state); -} - void ambush_state::scroll_ram_w(offs_t offset, uint8_t data) { m_scroll_ram[offset] = data; @@ -764,7 +758,7 @@ void ambush_state::ambush(machine_config &config) // addressable latches at 8B and 8C LS259(config, m_outlatch[0]); - m_outlatch[0]->q_out_cb<4>().set(FUNC(ambush_state::flip_screen_w)); + m_outlatch[0]->q_out_cb<4>().set(FUNC(ambush_state::flip_screen_set)); m_outlatch[0]->q_out_cb<5>().set(FUNC(ambush_state::color_bank_1_w)); m_outlatch[0]->q_out_cb<7>().set(FUNC(ambush_state::coin_counter_1_w)); diff --git a/src/mame/tecfri/sauro.cpp b/src/mame/tecfri/sauro.cpp index ec4b71a278d..a311343b345 100644 --- a/src/mame/tecfri/sauro.cpp +++ b/src/mame/tecfri/sauro.cpp @@ -175,7 +175,6 @@ protected: void vblank_irq(int state); void irq_reset_w(int state); template void coin_w(int state); - void flip_screen_w(int state); void bg_videoram_w(offs_t offset, uint8_t data); void bg_colorram_w(offs_t offset, uint8_t data); void scroll_bg_w(uint8_t data); @@ -505,11 +504,6 @@ void base_state::coin_w(int state) machine().bookkeeping().coin_counter_w(Which, state); } -void base_state::flip_screen_w(int state) -{ - flip_screen_set(state); -} - void sauro_state::main_prg_map(address_map &map) { map(0x0000, 0xdfff).rom(); @@ -807,7 +801,7 @@ void trckydoc_state::trckydoc(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &trckydoc_state::prg_map); - m_mainlatch->q_out_cb<1>().set(FUNC(trckydoc_state::flip_screen_w)); + m_mainlatch->q_out_cb<1>().set(FUNC(trckydoc_state::flip_screen_set)); m_mainlatch->q_out_cb<2>().set(FUNC(trckydoc_state::coin_w<0>)); m_mainlatch->q_out_cb<3>().set(FUNC(trckydoc_state::coin_w<1>)); @@ -824,7 +818,7 @@ void sauro_state::saurobl(machine_config &config) m_maincpu->set_addrmap(AS_IO, &sauro_state::main_io_map); // Z3 - m_mainlatch->q_out_cb<0>().set(FUNC(sauro_state::flip_screen_w)); + m_mainlatch->q_out_cb<0>().set(FUNC(sauro_state::flip_screen_set)); m_mainlatch->q_out_cb<1>().set(FUNC(sauro_state::coin_w<0>)); m_mainlatch->q_out_cb<2>().set(FUNC(sauro_state::coin_w<1>)); m_mainlatch->q_out_cb<3>().set_nop(); // sound IRQ trigger? diff --git a/src/mame/toaplan/mjsister.cpp b/src/mame/toaplan/mjsister.cpp index 30c24975600..4b780a78c76 100644 --- a/src/mame/toaplan/mjsister.cpp +++ b/src/mame/toaplan/mjsister.cpp @@ -74,7 +74,6 @@ private: void dac_adr_s_w(uint8_t data); void dac_adr_e_w(uint8_t data); void rombank_w(int state); - void flip_screen_w(int state); void colorbank_w(int state); void video_enable_w(int state); void irq_enable_w(int state); @@ -189,11 +188,6 @@ void mjsister_state::rombank_w(int state) m_rombank->set_entry((m_mainlatch[0]->q0_r() << 1) | m_mainlatch[1]->q6_r()); } -void mjsister_state::flip_screen_w(int state) -{ - flip_screen_set(state); -} - void mjsister_state::colorbank_w(int state) { m_colorbank = (m_mainlatch[0]->output_state() >> 2) & 7; @@ -436,7 +430,7 @@ void mjsister_state::mjsister(machine_config &config) LS259(config, m_mainlatch[0]); m_mainlatch[0]->q_out_cb<0>().set(FUNC(mjsister_state::rombank_w)); - m_mainlatch[0]->q_out_cb<1>().set(FUNC(mjsister_state::flip_screen_w)); + m_mainlatch[0]->q_out_cb<1>().set(FUNC(mjsister_state::flip_screen_set)); m_mainlatch[0]->q_out_cb<2>().set(FUNC(mjsister_state::colorbank_w)); m_mainlatch[0]->q_out_cb<3>().set(FUNC(mjsister_state::colorbank_w)); m_mainlatch[0]->q_out_cb<4>().set(FUNC(mjsister_state::colorbank_w));