From 98f57733df3005aeb9bca8721c692826abb17d08 Mon Sep 17 00:00:00 2001 From: 0kmg <9137159+0kmg@users.noreply.github.com> Date: Tue, 5 Apr 2022 08:55:44 -0800 Subject: bus/nes: Remove redundant start and reset device overrides. (#9516) --- src/devices/bus/nes/ave.cpp | 24 ----------- src/devices/bus/nes/ave.h | 12 ------ src/devices/bus/nes/bootleg.cpp | 16 -------- src/devices/bus/nes/bootleg.h | 10 ----- src/devices/bus/nes/camerica.cpp | 5 --- src/devices/bus/nes/camerica.h | 4 -- src/devices/bus/nes/cne.cpp | 29 -------------- src/devices/bus/nes/cne.h | 16 -------- src/devices/bus/nes/discrete.cpp | 34 ---------------- src/devices/bus/nes/discrete.h | 20 ---------- src/devices/bus/nes/henggedianzi.cpp | 28 ------------- src/devices/bus/nes/henggedianzi.h | 12 ------ src/devices/bus/nes/irem.cpp | 15 ------- src/devices/bus/nes/irem.h | 12 ------ src/devices/bus/nes/jaleco.cpp | 41 ------------------- src/devices/bus/nes/jaleco.h | 19 --------- src/devices/bus/nes/kaiser.cpp | 27 ------------- src/devices/bus/nes/kaiser.h | 18 --------- src/devices/bus/nes/legacy.cpp | 13 ------ src/devices/bus/nes/legacy.h | 6 --- src/devices/bus/nes/multigame.cpp | 32 --------------- src/devices/bus/nes/multigame.h | 22 ----------- src/devices/bus/nes/nxrom.cpp | 56 -------------------------- src/devices/bus/nes/nxrom.h | 34 ---------------- src/devices/bus/nes/pirate.cpp | 22 ----------- src/devices/bus/nes/pirate.h | 14 ------- src/devices/bus/nes/rcm.cpp | 26 ------------ src/devices/bus/nes/rcm.h | 12 ------ src/devices/bus/nes/sachen.cpp | 77 ------------------------------------ src/devices/bus/nes/sachen.h | 40 ------------------- src/devices/bus/nes/sunsoft.cpp | 10 ----- src/devices/bus/nes/sunsoft.h | 8 ---- src/devices/bus/nes/taito.cpp | 5 --- src/devices/bus/nes/taito.h | 3 -- src/devices/bus/nes/tengen.cpp | 12 ------ src/devices/bus/nes/tengen.h | 6 --- src/devices/bus/nes/txc.cpp | 25 ------------ src/devices/bus/nes/txc.h | 12 ------ src/devices/bus/nes/waixing.cpp | 29 -------------- src/devices/bus/nes/waixing.h | 16 -------- 40 files changed, 822 deletions(-) diff --git a/src/devices/bus/nes/ave.cpp b/src/devices/bus/nes/ave.cpp index f2fc091306b..35ed5628d9d 100644 --- a/src/devices/bus/nes/ave.cpp +++ b/src/devices/bus/nes/ave.cpp @@ -56,30 +56,6 @@ nes_maxi15_device::nes_maxi15_device(const machine_config &mconfig, const char * -void nes_nina001_device::device_start() -{ - common_start(); -} - -void nes_nina001_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_nina006_device::device_start() -{ - common_start(); -} - -void nes_nina006_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - void nes_maxi15_device::device_start() { common_start(); diff --git a/src/devices/bus/nes/ave.h b/src/devices/bus/nes/ave.h index 14a1203678d..1f5f4c6624b 100644 --- a/src/devices/bus/nes/ave.h +++ b/src/devices/bus/nes/ave.h @@ -17,12 +17,6 @@ public: nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_m(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -35,12 +29,6 @@ public: nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_l(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/bootleg.cpp b/src/devices/bus/nes/bootleg.cpp index f7881ada45b..be4f94e2e3e 100644 --- a/src/devices/bus/nes/bootleg.cpp +++ b/src/devices/bus/nes/bootleg.cpp @@ -659,22 +659,6 @@ void nes_ac08_device::pcb_reset() m_latch = 0xff; } -void nes_mmalee_device::device_start() -{ - common_start(); -} - -void nes_mmalee_device::pcb_reset() -{ - chr8(0, CHRROM); - prg32(0); -} - -void nes_rt01_device::device_start() -{ - common_start(); -} - void nes_rt01_device::pcb_reset() { chr2_0(0, CHRROM); diff --git a/src/devices/bus/nes/bootleg.h b/src/devices/bus/nes/bootleg.h index ebc6127b3cb..949899ac634 100644 --- a/src/devices/bus/nes/bootleg.h +++ b/src/devices/bus/nes/bootleg.h @@ -654,12 +654,6 @@ public: virtual uint8_t read_m(offs_t offset) override; virtual void write_m(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -674,10 +668,6 @@ public: virtual uint8_t read_h(offs_t offset) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/camerica.cpp b/src/devices/bus/nes/camerica.cpp index 863467f2e09..831f3cd8a9d 100644 --- a/src/devices/bus/nes/camerica.cpp +++ b/src/devices/bus/nes/camerica.cpp @@ -64,11 +64,6 @@ nes_golden5_device::nes_golden5_device(const machine_config &mconfig, const char -void nes_bf9093_device::device_start() -{ - common_start(); -} - void nes_bf9093_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; diff --git a/src/devices/bus/nes/camerica.h b/src/devices/bus/nes/camerica.h index 7688249a64c..3346628f324 100644 --- a/src/devices/bus/nes/camerica.h +++ b/src/devices/bus/nes/camerica.h @@ -19,10 +19,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/cne.cpp b/src/devices/bus/nes/cne.cpp index c81e7a2bdc8..e7df837f58b 100644 --- a/src/devices/bus/nes/cne.cpp +++ b/src/devices/bus/nes/cne.cpp @@ -54,23 +54,6 @@ nes_cne_shlz_device::nes_cne_shlz_device(const machine_config &mconfig, const ch -void nes_cne_decathl_device::device_start() -{ - common_start(); -} - -void nes_cne_decathl_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_cne_fsb_device::device_start() -{ - common_start(); -} - void nes_cne_fsb_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -78,18 +61,6 @@ void nes_cne_fsb_device::pcb_reset() chr8(0, m_chr_source); } -void nes_cne_shlz_device::device_start() -{ - common_start(); -} - -void nes_cne_shlz_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - diff --git a/src/devices/bus/nes/cne.h b/src/devices/bus/nes/cne.h index da0623cbde3..0c6932a0c86 100644 --- a/src/devices/bus/nes/cne.h +++ b/src/devices/bus/nes/cne.h @@ -17,12 +17,6 @@ public: nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -38,10 +32,6 @@ public: virtual void write_m(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -54,12 +44,6 @@ public: nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_l(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/discrete.cpp b/src/devices/bus/nes/discrete.cpp index 7b415794167..507e6bfd030 100644 --- a/src/devices/bus/nes/discrete.cpp +++ b/src/devices/bus/nes/discrete.cpp @@ -61,11 +61,6 @@ nes_74x161x138_device::nes_74x161x138_device(const machine_config &mconfig, cons -void nes_74x161x161x32_device::device_start() -{ - common_start(); -} - void nes_74x161x161x32_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -74,11 +69,6 @@ void nes_74x161x161x32_device::pcb_reset() chr8(0, m_chr_source); } -void nes_74x139x74_device::device_start() -{ - common_start(); -} - void nes_74x139x74_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -87,30 +77,6 @@ void nes_74x139x74_device::pcb_reset() chr8(0, m_chr_source); } -void nes_74x377_device::device_start() -{ - common_start(); -} - -void nes_74x377_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_74x161x138_device::device_start() -{ - common_start(); -} - -void nes_74x161x138_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - diff --git a/src/devices/bus/nes/discrete.h b/src/devices/bus/nes/discrete.h index 861b8b643bf..0f8f308aa96 100644 --- a/src/devices/bus/nes/discrete.h +++ b/src/devices/bus/nes/discrete.h @@ -19,10 +19,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -37,10 +33,6 @@ public: virtual void write_m(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -53,12 +45,6 @@ public: nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -71,12 +57,6 @@ public: nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_m(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/henggedianzi.cpp b/src/devices/bus/nes/henggedianzi.cpp index 1e1942e5477..a8de6e93783 100644 --- a/src/devices/bus/nes/henggedianzi.cpp +++ b/src/devices/bus/nes/henggedianzi.cpp @@ -52,34 +52,6 @@ nes_hengg_xhzs_device::nes_hengg_xhzs_device(const machine_config &mconfig, cons -void nes_hengg_srich_device::device_start() -{ - common_start(); -} - -void nes_hengg_srich_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_hengg_xhzs_device::device_start() -{ - common_start(); -} - -void nes_hengg_xhzs_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - - - - - /*------------------------------------------------- mapper specific handlers -------------------------------------------------*/ diff --git a/src/devices/bus/nes/henggedianzi.h b/src/devices/bus/nes/henggedianzi.h index 5b61880bf53..fc5922a1c4e 100644 --- a/src/devices/bus/nes/henggedianzi.h +++ b/src/devices/bus/nes/henggedianzi.h @@ -17,12 +17,6 @@ public: nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -36,12 +30,6 @@ public: virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/irem.cpp b/src/devices/bus/nes/irem.cpp index 266266c1ff0..7684850f6b9 100644 --- a/src/devices/bus/nes/irem.cpp +++ b/src/devices/bus/nes/irem.cpp @@ -68,11 +68,6 @@ nes_h3001_device::nes_h3001_device(const machine_config &mconfig, const char *ta -void nes_lrog017_device::device_start() -{ - common_start(); -} - void nes_lrog017_device::pcb_reset() { prg32(0); @@ -82,11 +77,6 @@ void nes_lrog017_device::pcb_reset() chr2_6(2, CHRRAM); } -void nes_holydivr_device::device_start() -{ - common_start(); -} - void nes_holydivr_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -95,11 +85,6 @@ void nes_holydivr_device::pcb_reset() chr8(0, m_chr_source); } -void nes_tam_s1_device::device_start() -{ - common_start(); -} - void nes_tam_s1_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; diff --git a/src/devices/bus/nes/irem.h b/src/devices/bus/nes/irem.h index 9ff4abfb830..4f3cd576e5a 100644 --- a/src/devices/bus/nes/irem.h +++ b/src/devices/bus/nes/irem.h @@ -19,10 +19,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -37,10 +33,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -55,10 +47,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp index 8de9ccacb92..ca8a9c2733e 100644 --- a/src/devices/bus/nes/jaleco.cpp +++ b/src/devices/bus/nes/jaleco.cpp @@ -141,35 +141,6 @@ nes_jf33_device::nes_jf33_device(const machine_config &mconfig, const char *tag, -void nes_jf11_device::device_start() -{ - common_start(); -} - -void nes_jf11_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_jf13_device::device_start() -{ - common_start(); -} - -void nes_jf13_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_jf16_device::device_start() -{ - common_start(); -} - void nes_jf16_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -193,18 +164,6 @@ void nes_jf17_device::pcb_reset() m_latch = 0; } -void nes_jf19_device::device_start() -{ - common_start(); -} - -void nes_jf19_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - void nes_ss88006_device::device_start() { common_start(); diff --git a/src/devices/bus/nes/jaleco.h b/src/devices/bus/nes/jaleco.h index 81f4fbc65d8..5529142ae01 100644 --- a/src/devices/bus/nes/jaleco.h +++ b/src/devices/bus/nes/jaleco.h @@ -18,12 +18,6 @@ public: nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_m(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -37,12 +31,8 @@ public: virtual void write_m(offs_t offset, uint8_t data) override; - virtual void pcb_reset() override; - protected: // device-level overrides - virtual void device_start() override; - virtual void device_add_mconfig(machine_config &config) override; private: @@ -61,10 +51,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -118,13 +104,8 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; - virtual void pcb_reset() override; - protected: nes_jf19_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/kaiser.cpp b/src/devices/bus/nes/kaiser.cpp index 6d68862c360..fa1978dcb08 100644 --- a/src/devices/bus/nes/kaiser.cpp +++ b/src/devices/bus/nes/kaiser.cpp @@ -170,18 +170,6 @@ void nes_ks106c_device::pcb_reset() m_latch = (m_latch + 1) & 0x03; } -void nes_ks7058_device::device_start() -{ - common_start(); -} - -void nes_ks7058_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - void nes_ks7022_device::device_start() { common_start(); @@ -268,11 +256,6 @@ void nes_ks7017_device::pcb_reset() m_irq_status = 0; } -void nes_ks7021a_device::device_start() -{ - common_start(); -} - void nes_ks7021a_device::pcb_reset() { prg16_89ab(0); @@ -296,11 +279,6 @@ void nes_ks7010_device::pcb_reset() m_latch = 0; } -void nes_ks7012_device::device_start() -{ - common_start(); -} - void nes_ks7012_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -308,11 +286,6 @@ void nes_ks7012_device::pcb_reset() chr8(0, m_chr_source); } -void nes_ks7013b_device::device_start() -{ - common_start(); -} - void nes_ks7013b_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; diff --git a/src/devices/bus/nes/kaiser.h b/src/devices/bus/nes/kaiser.h index 5962a77dd13..e0ee325137e 100644 --- a/src/devices/bus/nes/kaiser.h +++ b/src/devices/bus/nes/kaiser.h @@ -36,12 +36,6 @@ public: nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -193,10 +187,6 @@ public: virtual void write_h(offs_t offset, u8 data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -233,10 +223,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -252,10 +238,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/legacy.cpp b/src/devices/bus/nes/legacy.cpp index 1aa5266e764..229a959313c 100644 --- a/src/devices/bus/nes/legacy.cpp +++ b/src/devices/bus/nes/legacy.cpp @@ -59,19 +59,6 @@ nes_ffe8_device::nes_ffe8_device(const machine_config &mconfig, const char *tag, -void nes_ffe3_device::device_start() -{ - common_start(); -} - -void nes_ffe3_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - - void nes_ffe4_device::device_start() { common_start(); diff --git a/src/devices/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h index 271bf338dff..4a47bf63fa6 100644 --- a/src/devices/bus/nes/legacy.h +++ b/src/devices/bus/nes/legacy.h @@ -17,12 +17,6 @@ public: nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/multigame.cpp b/src/devices/bus/nes/multigame.cpp index 15a1d2efb29..33e172a64df 100644 --- a/src/devices/bus/nes/multigame.cpp +++ b/src/devices/bus/nes/multigame.cpp @@ -621,11 +621,6 @@ void nes_kn42_device::pcb_reset() chr8(0, CHRRAM); } -void nes_a65as_device::device_start() -{ - common_start(); -} - void nes_a65as_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -650,18 +645,6 @@ void nes_t262_device::pcb_reset() m_latch = 0; } -void nes_studyngame_device::device_start() -{ - common_start(); -} - -void nes_studyngame_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - void nes_sgun20in1_device::pcb_reset() { prg16_89ab(0); @@ -1023,11 +1006,6 @@ void nes_bmc_12in1_device::pcb_reset() update_banks(); } -void nes_bmc_35in1_device::device_start() -{ - common_start(); -} - void nes_bmc_35in1_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -1036,11 +1014,6 @@ void nes_bmc_35in1_device::pcb_reset() chr8(0, m_chr_source); } -void nes_bmc_36in1_device::device_start() -{ - common_start(); -} - void nes_bmc_36in1_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -1049,11 +1022,6 @@ void nes_bmc_36in1_device::pcb_reset() chr8(0, m_chr_source); } -void nes_bmc_64in1_device::device_start() -{ - common_start(); -} - void nes_bmc_64in1_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; diff --git a/src/devices/bus/nes/multigame.h b/src/devices/bus/nes/multigame.h index 2278a163011..6c9a2c93ca4 100644 --- a/src/devices/bus/nes/multigame.h +++ b/src/devices/bus/nes/multigame.h @@ -163,10 +163,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -200,12 +196,6 @@ public: nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -894,10 +884,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -912,10 +898,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -930,10 +912,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/nxrom.cpp b/src/devices/bus/nes/nxrom.cpp index 1b25cf864f6..da0e9a12e07 100644 --- a/src/devices/bus/nes/nxrom.cpp +++ b/src/devices/bus/nes/nxrom.cpp @@ -154,11 +154,6 @@ void nes_nrom_device::pcb_reset() chr8(0, m_chr_source); } -void nes_axrom_device::device_start() -{ - common_start(); -} - void nes_axrom_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -168,18 +163,6 @@ void nes_axrom_device::pcb_reset() set_nt_mirroring(PPU_MIRROR_LOW); } -void nes_bxrom_device::device_start() -{ - common_start(); -} - -void nes_bxrom_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - void nes_cnrom_device::device_start() { common_start(); @@ -195,11 +178,6 @@ void nes_cnrom_device::pcb_reset() m_chr_open_bus = 0; } -void nes_cprom_device::device_start() -{ - common_start(); -} - void nes_cprom_device::pcb_reset() { m_chr_source = CHRRAM; @@ -208,23 +186,6 @@ void nes_cprom_device::pcb_reset() chr4_4(0, m_chr_source); } -void nes_gxrom_device::device_start() -{ - common_start(); -} - -void nes_gxrom_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_uxrom_device::device_start() -{ - common_start(); -} - void nes_uxrom_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -233,23 +194,6 @@ void nes_uxrom_device::pcb_reset() chr8(0, m_chr_source); } -void nes_uxrom_cc_device::device_start() -{ - common_start(); -} - -void nes_uxrom_cc_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_un1rom_device::device_start() -{ - common_start(); -} - void nes_un1rom_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; diff --git a/src/devices/bus/nes/nxrom.h b/src/devices/bus/nes/nxrom.h index 382abf05390..afe4aeaa274 100644 --- a/src/devices/bus/nes/nxrom.h +++ b/src/devices/bus/nes/nxrom.h @@ -65,10 +65,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -81,12 +77,6 @@ public: nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -125,10 +115,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -141,12 +127,6 @@ public: nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -161,10 +141,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -177,12 +153,6 @@ public: nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -197,10 +167,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/pirate.cpp b/src/devices/bus/nes/pirate.cpp index 2b9bec4b7ee..15db554f7f2 100644 --- a/src/devices/bus/nes/pirate.cpp +++ b/src/devices/bus/nes/pirate.cpp @@ -111,23 +111,6 @@ nes_eh8813a_device::nes_eh8813a_device(const machine_config &mconfig, const char -void nes_agci_device::device_start() -{ - common_start(); -} - -void nes_agci_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_dreamtech_device::device_start() -{ - common_start(); -} - void nes_dreamtech_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -190,11 +173,6 @@ void nes_daou306_device::pcb_reset() memset(m_reg, 0, sizeof(m_reg)); } -void nes_xiaozy_device::device_start() -{ - common_start(); -} - void nes_xiaozy_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; diff --git a/src/devices/bus/nes/pirate.h b/src/devices/bus/nes/pirate.h index a94f541b498..79374a05832 100644 --- a/src/devices/bus/nes/pirate.h +++ b/src/devices/bus/nes/pirate.h @@ -17,12 +17,6 @@ public: nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -37,10 +31,6 @@ public: virtual void write_l(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -148,10 +138,6 @@ public: virtual void write_l(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/rcm.cpp b/src/devices/bus/nes/rcm.cpp index 8f09695a17a..4378d65c4df 100644 --- a/src/devices/bus/nes/rcm.cpp +++ b/src/devices/bus/nes/rcm.cpp @@ -75,32 +75,6 @@ nes_3dblock_device::nes_3dblock_device(const machine_config &mconfig, const char -void nes_gs2015_device::device_start() -{ - common_start(); -} - -void nes_gs2015_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_3dblock_device::device_start() -{ - common_start(); -} - -void nes_3dblock_device::pcb_reset() -{ - prg32(0); - chr8(0, CHRRAM); -} - - - - /*------------------------------------------------- mapper specific handlers -------------------------------------------------*/ diff --git a/src/devices/bus/nes/rcm.h b/src/devices/bus/nes/rcm.h index 83a91f50d6b..2f60fafef42 100644 --- a/src/devices/bus/nes/rcm.h +++ b/src/devices/bus/nes/rcm.h @@ -19,12 +19,6 @@ public: virtual uint8_t read_l(offs_t offset) override { return read_m(offset); } virtual uint8_t read_m(offs_t offset) override; virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -77,12 +71,6 @@ class nes_3dblock_device : public nes_nrom_device public: // construction/destruction nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/sachen.cpp b/src/devices/bus/nes/sachen.cpp index c72dab79d5f..568e3f0f85d 100644 --- a/src/devices/bus/nes/sachen.cpp +++ b/src/devices/bus/nes/sachen.cpp @@ -157,71 +157,6 @@ nes_sachen_8259d_device::nes_sachen_8259d_device(const machine_config &mconfig, -void nes_sachen_sa009_device::device_start() -{ - common_start(); -} - -void nes_sachen_sa009_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_sachen_sa0036_device::device_start() -{ - common_start(); -} - -void nes_sachen_sa0036_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_sachen_sa0037_device::device_start() -{ - common_start(); -} - -void nes_sachen_sa0037_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_sachen_sa72007_device::device_start() -{ - common_start(); -} - -void nes_sachen_sa72007_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_sachen_sa72008_device::device_start() -{ - common_start(); -} - -void nes_sachen_sa72008_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_sachen_tca01_device::device_start() -{ - common_start(); -} - void nes_sachen_tca01_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -230,18 +165,6 @@ void nes_sachen_tca01_device::pcb_reset() chr8(0, m_chr_source); } -void nes_sachen_tcu01_device::device_start() -{ - common_start(); -} - -void nes_sachen_tcu01_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - void nes_sachen_tcu02_device::device_start() { common_start(); diff --git a/src/devices/bus/nes/sachen.h b/src/devices/bus/nes/sachen.h index eefe9c07ce0..a5ba8c6d7b0 100644 --- a/src/devices/bus/nes/sachen.h +++ b/src/devices/bus/nes/sachen.h @@ -17,12 +17,6 @@ public: nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_l(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -35,12 +29,6 @@ public: nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -53,12 +41,6 @@ public: nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -71,12 +53,6 @@ public: nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_l(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -89,12 +65,6 @@ public: nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_l(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -109,10 +79,6 @@ public: virtual uint8_t read_l(offs_t offset) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -127,12 +93,6 @@ public: virtual void write_l(offs_t offset, uint8_t data) override; virtual void write_m(offs_t offset, uint8_t data) override { write_l((offset + 0x100) & 0xfff, data); } virtual void write_h(offs_t offset, uint8_t data) override { write_l((offset + 0x100) & 0xfff, data); } - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index 809364bbe44..95959cc235a 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -91,11 +91,6 @@ nes_sunsoft_5_device::nes_sunsoft_5_device(const machine_config &mconfig, const } -void nes_sunsoft_1_device::device_start() -{ - common_start(); -} - void nes_sunsoft_1_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; @@ -104,11 +99,6 @@ void nes_sunsoft_1_device::pcb_reset() chr8(0, m_chr_source); } -void nes_sunsoft_2_device::device_start() -{ - common_start(); -} - void nes_sunsoft_2_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; diff --git a/src/devices/bus/nes/sunsoft.h b/src/devices/bus/nes/sunsoft.h index 23d486d7562..9c93a987d0f 100644 --- a/src/devices/bus/nes/sunsoft.h +++ b/src/devices/bus/nes/sunsoft.h @@ -20,10 +20,6 @@ public: virtual void write_m(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -38,10 +34,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/taito.cpp b/src/devices/bus/nes/taito.cpp index b30f1196449..997ab9d2be8 100644 --- a/src/devices/bus/nes/taito.cpp +++ b/src/devices/bus/nes/taito.cpp @@ -73,11 +73,6 @@ nes_x1_017_device::nes_x1_017_device(const machine_config &mconfig, const char * -void nes_tc0190fmc_device::device_start() -{ - common_start(); -} - void nes_tc0190fmc_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; diff --git a/src/devices/bus/nes/taito.h b/src/devices/bus/nes/taito.h index b4efa553c86..dc2e282a8fd 100644 --- a/src/devices/bus/nes/taito.h +++ b/src/devices/bus/nes/taito.h @@ -23,9 +23,6 @@ public: protected: nes_tc0190fmc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/tengen.cpp b/src/devices/bus/nes/tengen.cpp index 4f43cb8d010..264bdbf4870 100644 --- a/src/devices/bus/nes/tengen.cpp +++ b/src/devices/bus/nes/tengen.cpp @@ -65,18 +65,6 @@ nes_tengen037_device::nes_tengen037_device(const machine_config &mconfig, const -void nes_tengen008_device::device_start() -{ - common_start(); -} - -void nes_tengen008_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - void nes_tengen032_device::device_start() { common_start(); diff --git a/src/devices/bus/nes/tengen.h b/src/devices/bus/nes/tengen.h index a8e21ce9966..765b2273cb7 100644 --- a/src/devices/bus/nes/tengen.h +++ b/src/devices/bus/nes/tengen.h @@ -15,12 +15,6 @@ public: nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/txc.cpp b/src/devices/bus/nes/txc.cpp index 605e431fe53..ace3afdef5a 100644 --- a/src/devices/bus/nes/txc.cpp +++ b/src/devices/bus/nes/txc.cpp @@ -91,31 +91,6 @@ void nes_txc_22211_device::pcb_reset() m_reg[0] = m_reg[1] = m_reg[2] = m_reg[3] = 0; } -void nes_txc_strikew_device::device_start() -{ - common_start(); -} - -void nes_txc_strikew_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_txc_commandos_device::device_start() -{ - common_start(); -} - -void nes_txc_commandos_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - - diff --git a/src/devices/bus/nes/txc.h b/src/devices/bus/nes/txc.h index 9ad5e2807dc..2cf64caa902 100644 --- a/src/devices/bus/nes/txc.h +++ b/src/devices/bus/nes/txc.h @@ -67,12 +67,6 @@ public: nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -86,12 +80,6 @@ public: virtual uint8_t read_l(offs_t offset) override; virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; diff --git a/src/devices/bus/nes/waixing.cpp b/src/devices/bus/nes/waixing.cpp index 9270c92ca8a..2120fca3941 100644 --- a/src/devices/bus/nes/waixing.cpp +++ b/src/devices/bus/nes/waixing.cpp @@ -290,35 +290,6 @@ void nes_waixing_ffv_device::pcb_reset() m_reg[0] = m_reg[1] = 0; } -void nes_waixing_wxzs_device::device_start() -{ - common_start(); -} - -void nes_waixing_wxzs_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_waixing_dq8_device::device_start() -{ - common_start(); -} - -void nes_waixing_dq8_device::pcb_reset() -{ - m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; - prg32(0); - chr8(0, m_chr_source); -} - -void nes_waixing_wxzs2_device::device_start() -{ - common_start(); -} - void nes_waixing_wxzs2_device::pcb_reset() { m_chr_source = m_vrom_chunks ? CHRROM : CHRRAM; diff --git a/src/devices/bus/nes/waixing.h b/src/devices/bus/nes/waixing.h index b438605eb09..c3e99e3f23c 100644 --- a/src/devices/bus/nes/waixing.h +++ b/src/devices/bus/nes/waixing.h @@ -298,12 +298,6 @@ public: nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -316,12 +310,6 @@ public: nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void write_h(offs_t offset, uint8_t data) override; - - virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; @@ -336,10 +324,6 @@ public: virtual void write_h(offs_t offset, uint8_t data) override; virtual void pcb_reset() override; - -protected: - // device-level overrides - virtual void device_start() override; }; -- cgit v1.2.3