diff options
author | Vas Crabb <vas@vastheman.com> | 2018-02-19 20:34:33 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-02-19 20:34:33 +1100 |
commit | 8b1bc128e5568a713bc280d78623fcb3f7805b2a (patch) | |
tree | bc20f49cedae1f436469e6442cb3240b3882f37f /src/mame/drivers/sfkick.cpp | |
parent | 1d31c19472f4c63955dcfba1f7e393bbe553afda (diff) |
backport lots of cleanup from WIP branch (nw)
Diffstat (limited to 'src/mame/drivers/sfkick.cpp')
-rw-r--r-- | src/mame/drivers/sfkick.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/mame/drivers/sfkick.cpp b/src/mame/drivers/sfkick.cpp index 1c795b255fc..547162c9e88 100644 --- a/src/mame/drivers/sfkick.cpp +++ b/src/mame/drivers/sfkick.cpp @@ -189,11 +189,10 @@ public: m_dsw2(*this, "DSW2") { } - std::unique_ptr<uint8_t[]> m_main_mem; - int m_bank_cfg; - int m_bank[8]; - int m_input_mux; - required_device<v9938_device> m_v9938; + DECLARE_DRIVER_INIT(sfkick); + void sfkick(machine_config &config); + +protected: DECLARE_WRITE8_MEMBER(page0_w); DECLARE_WRITE8_MEMBER(page1_w); DECLARE_WRITE8_MEMBER(page2_w); @@ -201,11 +200,22 @@ public: DECLARE_READ8_MEMBER(ppi_port_b_r); DECLARE_WRITE8_MEMBER(ppi_port_a_w); DECLARE_WRITE8_MEMBER(ppi_port_c_w); - DECLARE_DRIVER_INIT(sfkick); virtual void machine_reset() override; void sfkick_remap_banks(); void sfkick_bank_set(int num, int data); DECLARE_WRITE_LINE_MEMBER(irqhandler); + void sfkick_io_map(address_map &map); + void sfkick_map(address_map &map); + void sfkick_sound_io_map(address_map &map); + void sfkick_sound_map(address_map &map); + +private: + std::unique_ptr<uint8_t[]> m_main_mem; + int m_bank_cfg; + int m_bank[8]; + int m_input_mux; + + required_device<v9938_device> m_v9938; required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_memory_region m_region_bios; @@ -225,11 +235,6 @@ public: required_ioport m_dial; required_ioport m_dsw1; required_ioport m_dsw2; - void sfkick(machine_config &config); - void sfkick_io_map(address_map &map); - void sfkick_map(address_map &map); - void sfkick_sound_io_map(address_map &map); - void sfkick_sound_map(address_map &map); }; |