From 8950b00a0aa2c90d2cef31a461db52a5ce60869d Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 23 Aug 2021 19:47:00 +0200 Subject: cv1k: small cleanup --- src/mame/drivers/cv1k.cpp | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index abae51143b1..ef7ccf2f450 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -184,7 +184,7 @@ Common game codes: #include "screen.h" #include "speaker.h" - +namespace { class cv1k_state : public driver_device { @@ -203,6 +203,21 @@ public: m_idlepc(0) { } + void cv1k(machine_config &config); + void cv1k_d(machine_config &config); + + void init_mushisam(); + void init_ibara(); + void init_espgal2(); + void init_mushitam(); + void init_pinkswts(); + void init_deathsml(); + void init_dpddfk(); + +protected: + virtual void machine_reset() override; + +private: required_device m_maincpu; required_device m_blitter; required_device m_serflash; @@ -219,26 +234,15 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - virtual void machine_reset() override; - - /* game specific */ - uint64_t speedup_r(); - void init_mushisam(); - void init_ibara(); - void init_espgal2(); - void init_mushitam(); - void init_pinkswts(); - void init_deathsml(); - void init_dpddfk(); - required_ioport m_blitrate; required_ioport m_eepromout; uint32_t m_idleramoffs; uint32_t m_idlepc; + + uint64_t speedup_r(); void install_speedups(uint32_t idleramoff, uint32_t idlepc, bool is_typed); - void cv1k_d(machine_config &config); - void cv1k(machine_config &config); + void cv1k_d_map(address_map &map); void cv1k_map(address_map &map); void cv1k_port(address_map &map); @@ -276,8 +280,7 @@ uint8_t cv1k_state::flash_io_r(offs_t offset) case 0x05: case 0x06: case 0x07: - - // logerror("flash_io_r offset %04x\n", offset); + // logerror("flash_io_r offset %04x\n", offset); return 0xff; case 0x00: @@ -958,6 +961,9 @@ void cv1k_state::init_dpddfk() } +} // anonymous namespace + + // The black label versions are intentionally not set as clones, they were re-releases with different game codes, not bugfixes. // CA011 Mushihime-Sama @@ -1010,10 +1016,10 @@ GAME( 2008, ddpdfk, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT27 GAME( 2008, ddpdfk10, ddpdfk, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT270, "Cave (AMI license)", "DoDonPachi Dai-Fukkatsu Ver 1.0 (2008/05/16 MASTER VER)", MACHINE_IMPERFECT_TIMING ) // CA019B Do-Don-Pachi Dai-Fukkatsu Black Label -GAME( 2010, dfkbl, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT270, "Cave (AMI license)", "DoDonPachi Dai-Fukkatsu Black Label (2010/1/18 BLACK LABEL)", MACHINE_IMPERFECT_TIMING ) +GAME( 2010, dfkbl, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT270, "Cave", "DoDonPachi Dai-Fukkatsu Black Label (2010/1/18 BLACK LABEL)", MACHINE_IMPERFECT_TIMING ) // CA021 Akai Katana -GAME( 2010, akatana, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT0, "Cave (AMI license)", "Akai Katana (2010/ 8/13 MASTER VER.)", MACHINE_IMPERFECT_TIMING ) +GAME( 2010, akatana, 0, cv1k_d, cv1k, cv1k_state, init_dpddfk, ROT0, "Cave", "Akai Katana (2010/ 8/13 MASTER VER.)", MACHINE_IMPERFECT_TIMING ) // CMDL01 Medal Mahjong Moukari Bancho GAME( 2007, mmmbanc, 0, cv1k, cv1k, cv1k_state, init_pinkswts, ROT0, "Cave (AMI license)", "Medal Mahjong Moukari Bancho (2007/06/05 MASTER VER.)", MACHINE_NOT_WORKING ) -- cgit v1.2.3