diff options
author | David Haywood <hazemamewip@hotmail.com> | 2018-06-27 14:32:24 +0100 |
---|---|---|
committer | hap <happppp@users.noreply.github.com> | 2018-06-27 15:32:24 +0200 |
commit | 6d6b562ffd0168791e9d8d363a07063e7090c0c6 (patch) | |
tree | 934c34bdc531c611fbf26d94bf58974510eeea2d /src/mame/drivers | |
parent | 8aa76c10113d44ab20e242ebdc4f2f69bc77b719 (diff) |
more private member use in 'D, E, F, G' drivers (nw) (#3704)
* more private member use in 'D' drivers (nw)
* same for 'E' drivers (nw)
* and 'F' (nw)
* 'G' (nw)
(left galaxian/galaxold alone because I know somebody is looking at them)
Diffstat (limited to 'src/mame/drivers')
164 files changed, 951 insertions, 652 deletions
diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp index 2f2d9d15e03..31a79b35608 100644 --- a/src/mame/drivers/d6800.cpp +++ b/src/mame/drivers/d6800.cpp @@ -72,6 +72,10 @@ public: , m_io_shift(*this, "SHIFT") { } + + void d6800(machine_config &config); + +private: DECLARE_READ8_MEMBER( d6800_cassette_r ); DECLARE_WRITE8_MEMBER( d6800_cassette_w ); DECLARE_READ8_MEMBER( d6800_keyboard_r ); @@ -82,9 +86,8 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(d6800_p); DECLARE_QUICKLOAD_LOAD_MEMBER( d6800 ); - void d6800(machine_config &config); void d6800_map(address_map &map); -private: + uint8_t m_rtc; bool m_cb2; bool m_cassold; diff --git a/src/mame/drivers/d6809.cpp b/src/mame/drivers/d6809.cpp index fa7a84d6019..c0b839ab88b 100644 --- a/src/mame/drivers/d6809.cpp +++ b/src/mame/drivers/d6809.cpp @@ -97,13 +97,15 @@ public: , m_terminal(*this, "terminal") { } + void d6809(machine_config &config); + +private: DECLARE_READ8_MEMBER( term_r ); DECLARE_WRITE8_MEMBER( term_w ); void kbd_put(u8 data); - void d6809(machine_config &config); void mem_map(address_map &map); -private: + uint8_t m_term_data; virtual void machine_reset() override; required_device<cpu_device> m_maincpu; diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp index 9a777f0f016..e0d063fb1e7 100644 --- a/src/mame/drivers/d9final.cpp +++ b/src/mame/drivers/d9final.cpp @@ -45,6 +45,9 @@ public: m_hi_vram(*this, "hi_vram"), m_cram(*this, "cram") { } + void d9final(machine_config &config); + +private: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; @@ -66,7 +69,6 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void d9final(machine_config &config); void d9final_io(address_map &map); void d9final_map(address_map &map); }; diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp index e1cb3ba5039..05644afb300 100644 --- a/src/mame/drivers/dacholer.cpp +++ b/src/mame/drivers/dacholer.cpp @@ -59,6 +59,12 @@ public: , m_leds(*this, "led%u", 0U) { } + void itaten(machine_config &config); + void dacholer(machine_config &config); + + DECLARE_CUSTOM_INPUT_MEMBER(snd_ack_r); + +private: DECLARE_WRITE8_MEMBER(bg_scroll_x_w); DECLARE_WRITE8_MEMBER(bg_scroll_y_w); DECLARE_WRITE8_MEMBER(background_w); @@ -70,7 +76,6 @@ public: DECLARE_WRITE8_MEMBER(snd_ack_w); DECLARE_WRITE8_MEMBER(snd_irq_w); DECLARE_WRITE8_MEMBER(music_irq_w); - DECLARE_CUSTOM_INPUT_MEMBER(snd_ack_r); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); DECLARE_PALETTE_INIT(dacholer); @@ -78,8 +83,6 @@ public: INTERRUPT_GEN_MEMBER(sound_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(adpcm_int); - void itaten(machine_config &config); - void dacholer(machine_config &config); void itaten_main_map(address_map &map); void itaten_snd_io_map(address_map &map); void itaten_snd_map(address_map &map); @@ -88,12 +91,10 @@ public: void snd_io_map(address_map &map); void snd_map(address_map &map); -protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; -private: /* devices */ required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp index d828af52548..a8dde4929d1 100644 --- a/src/mame/drivers/dai3wksi.cpp +++ b/src/mame/drivers/dai3wksi.cpp @@ -67,6 +67,9 @@ public: m_dai3wksi_videoram(*this, "videoram"), m_in2(*this, "IN2") { } + void dai3wksi(machine_config &config); + +private: /* devices */ required_device<cpu_device> m_maincpu; required_device<samples_device> m_samples; @@ -98,7 +101,6 @@ public: virtual void machine_start() override; virtual void machine_reset() override; - void dai3wksi(machine_config &config); void main_map(address_map &map); }; diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp index 2b370a7abe9..47950c45c5d 100644 --- a/src/mame/drivers/dambustr.cpp +++ b/src/mame/drivers/dambustr.cpp @@ -66,12 +66,15 @@ public: : galaxold_state(mconfig, type, tag), m_custom(*this, "cust") { } + void dambustr(machine_config &config); + + void init_dambustr(); + +private: required_device<galaxian_sound_device> m_custom; int m_noise_data; DECLARE_WRITE8_MEMBER(dambustr_noise_enable_w); - void init_dambustr(); - void dambustr(machine_config &config); void dambustr_map(address_map &map); }; diff --git a/src/mame/drivers/daruma.cpp b/src/mame/drivers/daruma.cpp index 68a7798770b..de4087a8c62 100644 --- a/src/mame/drivers/daruma.cpp +++ b/src/mame/drivers/daruma.cpp @@ -29,13 +29,15 @@ public: m_maincpu(*this, "maincpu"), m_speaker(*this, "speaker") { } + void daruma(machine_config &config); + +private: DECLARE_READ8_MEMBER(dev0_r); DECLARE_WRITE8_MEMBER(dev1_w); DECLARE_WRITE8_MEMBER(dev2_w); DECLARE_READ8_MEMBER(dev4_r); required_device<cpu_device> m_maincpu; required_device<speaker_sound_device> m_speaker; - void daruma(machine_config &config); void mem_io(address_map &map); void mem_prg(address_map &map); }; diff --git a/src/mame/drivers/datum.cpp b/src/mame/drivers/datum.cpp index a3de0df354f..fecf35f477d 100644 --- a/src/mame/drivers/datum.cpp +++ b/src/mame/drivers/datum.cpp @@ -66,14 +66,15 @@ public: , m_digits(*this, "digit%u", 0U) { } + void datum(machine_config &config); + DECLARE_INPUT_CHANGED_MEMBER(trigger_reset); + DECLARE_INPUT_CHANGED_MEMBER(trigger_nmi); + +private: DECLARE_READ8_MEMBER(pa_r); DECLARE_WRITE8_MEMBER(pa_w); DECLARE_WRITE8_MEMBER(pb_w); - DECLARE_INPUT_CHANGED_MEMBER(trigger_reset); - DECLARE_INPUT_CHANGED_MEMBER(trigger_nmi); - void datum(machine_config &config); void datum_mem(address_map &map); -private: uint8_t m_keydata; virtual void machine_reset() override; virtual void machine_start() override { m_digits.resolve(); } diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp index 4c1f547f54f..35396d74199 100644 --- a/src/mame/drivers/dblcrown.cpp +++ b/src/mame/drivers/dblcrown.cpp @@ -73,14 +73,13 @@ public: void dblcrown(machine_config &config); -protected: +private: // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; -private: // screen updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp index e07d0b9303a..f1503af323c 100644 --- a/src/mame/drivers/dblewing.cpp +++ b/src/mame/drivers/dblewing.cpp @@ -100,6 +100,11 @@ public: m_soundlatch_pending(false) { } + void dblewing(machine_config &config); + + void init_dblewing(); + +private: /* memory pointers */ required_shared_ptr<uint16_t> m_pf1_rowscroll; required_shared_ptr<uint16_t> m_pf2_rowscroll; @@ -115,7 +120,6 @@ public: DECLARE_READ8_MEMBER(irq_latch_r); DECLARE_WRITE_LINE_MEMBER(soundlatch_irq_w); - void init_dblewing(); uint32_t screen_update_dblewing(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECO16IC_BANK_CB_MEMBER(bank_callback); @@ -124,12 +128,10 @@ public: READ16_MEMBER( wf_protection_region_0_104_r ); WRITE16_MEMBER( wf_protection_region_0_104_w ); - void dblewing(machine_config &config); void dblewing_map(address_map &map); void decrypted_opcodes_map(address_map &map); void sound_io(address_map &map); void sound_map(address_map &map); -private: bool m_soundlatch_pending; }; diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp index 07255123c96..71dc04335d6 100644 --- a/src/mame/drivers/dbox.cpp +++ b/src/mame/drivers/dbox.cpp @@ -435,32 +435,36 @@ class dbox_state : public driver_device { - public: - dbox_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) - , m_maincpu(*this, "maincpu") - , m_display(*this, "display") - , m_ip16_74259(*this, "hct259.ip16") - { } +public: + dbox_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_display(*this, "display") + , m_ip16_74259(*this, "hct259.ip16") + { } + + void dbox(machine_config &config); + + void init_dbox(); + +private: required_device<m68340_cpu_device> m_maincpu; required_device<sda5708_device> m_display; required_device<latch8_device> m_ip16_74259; virtual void machine_reset() override; - virtual void machine_start () override; - void init_dbox(); + virtual void machine_start() override; DECLARE_WRITE8_MEMBER(sda5708_reset); DECLARE_WRITE8_MEMBER(sda5708_clk); DECLARE_WRITE8_MEMBER(write_pa); - void dbox(machine_config &config); void dbox_map(address_map &map); #if LOCALFLASH - DECLARE_READ16_MEMBER (sysflash_r); - DECLARE_WRITE16_MEMBER (sysflash_w); + DECLARE_READ16_MEMBER(sysflash_r); + DECLARE_WRITE16_MEMBER(sysflash_w); private: - uint16_t *m_sysflash; + uint16_t * m_sysflash; uint32_t m_sf_mode; uint32_t m_sf_state; #endif diff --git a/src/mame/drivers/dct11em.cpp b/src/mame/drivers/dct11em.cpp index 529ed9c8c96..42ca84a4083 100644 --- a/src/mame/drivers/dct11em.cpp +++ b/src/mame/drivers/dct11em.cpp @@ -20,11 +20,14 @@ public: dct11em_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } + + void dct11em(machine_config &config); + +private: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_dct11em(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; - void dct11em(machine_config &config); void dct11em_mem(address_map &map); }; diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp index 57888258262..21966bd0be7 100644 --- a/src/mame/drivers/ddayjlc.cpp +++ b/src/mame/drivers/ddayjlc.cpp @@ -84,6 +84,13 @@ public: m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch") { } + void ddayjlc(machine_config &config); + + void init_ddayjlc(); + DECLARE_CUSTOM_INPUT_MEMBER(prot_r); + +private: + DECLARE_WRITE8_MEMBER(prot_w); DECLARE_WRITE8_MEMBER(char_bank_w); DECLARE_WRITE8_MEMBER(bgvram_w); @@ -97,23 +104,18 @@ public: DECLARE_WRITE8_MEMBER(flip_screen_w); DECLARE_WRITE8_MEMBER(i8257_CH0_w); DECLARE_WRITE8_MEMBER(i8257_LMSR_w); - DECLARE_CUSTOM_INPUT_MEMBER(prot_r); - void init_ddayjlc(); TILE_GET_INFO_MEMBER(get_tile_info_bg); TILE_GET_INFO_MEMBER(get_tile_info_fg); DECLARE_PALETTE_INIT(ddayjlc); uint32_t screen_update_ddayjlc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_irq); - void ddayjlc(machine_config &config); void main_map(address_map &map); void sound_map(address_map &map); -protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; -private: /* memory pointers */ required_shared_ptr<uint8_t> m_mainram; required_shared_ptr<uint8_t> m_spriteram; diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp index 1f13e420831..8e2d8b5df65 100644 --- a/src/mame/drivers/ddealer.cpp +++ b/src/mame/drivers/ddealer.cpp @@ -138,6 +138,11 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void ddealer(machine_config &config); + + void init_ddealer(); + +private: DECLARE_WRITE16_MEMBER(flipscreen_w); DECLARE_WRITE16_MEMBER(back_vram_w); DECLARE_WRITE16_MEMBER(mcu_shared_w); @@ -149,16 +154,12 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(mcu_sim); - void ddealer(machine_config &config); void ddealer_map(address_map &map); - void init_ddealer(); -protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; -private: // memory pointers required_shared_ptr<uint16_t> m_vregs; required_shared_ptr<uint16_t> m_left_fg_vram_top; diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index 3667bc3c2ac..04187ea3bd7 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -175,6 +175,51 @@ public: , m_leds(*this, "led%u", 0U) { } + void mjmywrld(machine_config &config); + void mjmyster(machine_config &config); + void mmpanic(machine_config &config); + void nettoqc(machine_config &config); + void mjmyornt(machine_config &config); + void kotbinsp(machine_config &config); + void mjgnight(machine_config &config); + void ddenlovrk(machine_config &config); + void quizchq(machine_config &config); + void mjmyuniv(machine_config &config); + void dtoyoken(machine_config &config); + void hgokou(machine_config &config); + void seljan2(machine_config &config); + void janshinp(machine_config &config); + void hkagerou(machine_config &config); + void ultrchmp(machine_config &config); + void rongrong(machine_config &config); + void mjflove(machine_config &config); + void hanakanz(machine_config &config); + void jongtei(machine_config &config); + void akamaru(machine_config &config); + void mjchuuka(machine_config &config); + void hparadis(machine_config &config); + void mjreach1(machine_config &config); + void ddenlovr(machine_config &config); + void funkyfig(machine_config &config); + void hginga(machine_config &config); + void daimyojn(machine_config &config); + void htengoku(machine_config &config); + void sryudens(machine_config &config); + void hgokbang(machine_config &config); + void quiz365(machine_config &config); + void kotbinyo(machine_config &config); + void mjschuka(machine_config &config); + void ddenlovj(machine_config &config); + + void init_rongrong(); + void init_momotaro(); + + DECLARE_CUSTOM_INPUT_MEMBER(ddenlovr_blitter_irq_r); + DECLARE_CUSTOM_INPUT_MEMBER(ddenlovj_blitter_r); + DECLARE_CUSTOM_INPUT_MEMBER(nettoqc_special_r); + DECLARE_CUSTOM_INPUT_MEMBER(mjflove_blitter_r); + +private: void set_blitter_irq(write_line_delegate &&handler) { m_blitter_irq_handler = std::move(handler); } DECLARE_MACHINE_START(ddenlovr); @@ -204,10 +249,6 @@ public: DECLARE_WRITE_LINE_MEMBER(hanakanz_rtc_irq); DECLARE_WRITE_LINE_MEMBER(mjflove_rtc_irq); - DECLARE_CUSTOM_INPUT_MEMBER(ddenlovr_blitter_irq_r); - DECLARE_CUSTOM_INPUT_MEMBER(ddenlovj_blitter_r); - DECLARE_CUSTOM_INPUT_MEMBER(nettoqc_special_r); - DECLARE_CUSTOM_INPUT_MEMBER(mjflove_blitter_r); DECLARE_WRITE8_MEMBER(ddenlovr_bgcolor_w); DECLARE_WRITE8_MEMBER(ddenlovr_bgcolor2_w); DECLARE_WRITE8_MEMBER(ddenlovr_priority_w); @@ -348,8 +389,6 @@ public: DECLARE_WRITE8_MEMBER(seljan2_rombank_w); DECLARE_WRITE8_MEMBER(seljan2_palette_enab_w); DECLARE_WRITE8_MEMBER(seljan2_palette_w); - void init_rongrong(); - void init_momotaro(); DECLARE_WRITE8_MEMBER(htengoku_select_w); DECLARE_WRITE8_MEMBER(htengoku_coin_w); DECLARE_READ8_MEMBER(htengoku_input_r); @@ -391,41 +430,6 @@ public: void mmpanic_update_leds(); void mjchuuka_get_romdata(); uint8_t hgokou_player_r( int player ); - void mjmywrld(machine_config &config); - void mjmyster(machine_config &config); - void mmpanic(machine_config &config); - void nettoqc(machine_config &config); - void mjmyornt(machine_config &config); - void kotbinsp(machine_config &config); - void mjgnight(machine_config &config); - void ddenlovrk(machine_config &config); - void quizchq(machine_config &config); - void mjmyuniv(machine_config &config); - void dtoyoken(machine_config &config); - void hgokou(machine_config &config); - void seljan2(machine_config &config); - void janshinp(machine_config &config); - void hkagerou(machine_config &config); - void ultrchmp(machine_config &config); - void rongrong(machine_config &config); - void mjflove(machine_config &config); - void hanakanz(machine_config &config); - void jongtei(machine_config &config); - void akamaru(machine_config &config); - void mjchuuka(machine_config &config); - void hparadis(machine_config &config); - void mjreach1(machine_config &config); - void ddenlovr(machine_config &config); - void funkyfig(machine_config &config); - void hginga(machine_config &config); - void daimyojn(machine_config &config); - void htengoku(machine_config &config); - void sryudens(machine_config &config); - void hgokbang(machine_config &config); - void quiz365(machine_config &config); - void kotbinyo(machine_config &config); - void mjschuka(machine_config &config); - void ddenlovj(machine_config &config); void akamaru_map(address_map &map); void daimyojn_portmap(address_map &map); void ddenlovj_map(address_map &map); @@ -475,7 +479,6 @@ public: void sryudens_portmap(address_map &map); void ultrchmp_map(address_map &map); -protected: write_line_delegate m_blitter_irq_handler; optional_shared_ptr<uint16_t> m_protection1; diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp index 1c845825bbb..6a1d34a2027 100644 --- a/src/mame/drivers/de_2.cpp +++ b/src/mame/drivers/de_2.cpp @@ -50,7 +50,7 @@ public: void de_type2_alpha3(machine_config &config); void de_type3(machine_config &config); -protected: +private: virtual void machine_start() override; virtual void machine_reset() override; @@ -104,7 +104,6 @@ protected: bool m_more_data; bool m_nmi_enable; -private: uint32_t m_segment1; uint32_t m_segment2; uint8_t m_strobe; diff --git a/src/mame/drivers/de_3.cpp b/src/mame/drivers/de_3.cpp index 17dcc5b6d5c..447fcd17517 100644 --- a/src/mame/drivers/de_3.cpp +++ b/src/mame/drivers/de_3.cpp @@ -37,7 +37,7 @@ public: void de_3_dmd1(machine_config &config); void de_3_dmd2(machine_config &config); -protected: +private: // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; @@ -84,7 +84,6 @@ protected: bool m_nmi_enable; -private: // uint32_t m_segment1; // uint32_t m_segment2; uint8_t m_strobe; diff --git a/src/mame/drivers/de_3b.cpp b/src/mame/drivers/de_3b.cpp index b707b032cf6..65acd0dd0e3 100644 --- a/src/mame/drivers/de_3b.cpp +++ b/src/mame/drivers/de_3b.cpp @@ -22,6 +22,12 @@ public: m_dmdtype3(*this, "decodmd") { } + void detest(machine_config &config); + void de_3b(machine_config &config); + + void init_de_3b(); + +private: // devices optional_device<decobsmt_device> m_decobsmt; optional_device<decodmd_type3_device> m_dmdtype3; @@ -41,14 +47,8 @@ public: DECLARE_WRITE8_MEMBER(display_w); DECLARE_WRITE8_MEMBER(lamps_w); - void detest(machine_config &config); - void de_3b(machine_config &config); -protected: - // driver_device overrides virtual void machine_reset() override; -public: - void init_de_3b(); uint8_t m_strobe; uint8_t m_kbdrow; diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp index 878c21d1285..1d0b3aa47f2 100644 --- a/src/mame/drivers/deco156.cpp +++ b/src/mame/drivers/deco156.cpp @@ -45,7 +45,7 @@ public: void hvysmsh(machine_config &config); void wcvol95(machine_config &config); -protected: +private: DECLARE_WRITE32_MEMBER(hvysmsh_eeprom_w); DECLARE_READ32_MEMBER(pf1_rowscroll_r); DECLARE_READ32_MEMBER(pf2_rowscroll_r); @@ -64,7 +64,6 @@ protected: void hvysmsh_map(address_map &map); void wcvol95_map(address_map &map); -private: /* devices */ required_device<arm_cpu_device> m_maincpu; required_device<deco16ic_device> m_deco_tilegen1; diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp index 57887adcbba..f3bf870141f 100644 --- a/src/mame/drivers/deco_ld.cpp +++ b/src/mame/drivers/deco_ld.cpp @@ -136,9 +136,15 @@ public: m_attr0(*this, "attr0"), m_vram1(*this, "vram1"), m_attr1(*this, "attr1") - { } + void rblaster(machine_config &config); + + DECLARE_CUSTOM_INPUT_MEMBER(begas_vblank_r); + DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + +private: + required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; required_device<sony_ldp1000_device> m_laserdisc; @@ -158,13 +164,10 @@ public: DECLARE_READ8_MEMBER(acia_status_hack_r); DECLARE_READ8_MEMBER(sound_status_r); DECLARE_WRITE8_MEMBER(decold_sound_cmd_w); - DECLARE_CUSTOM_INPUT_MEMBER(begas_vblank_r); - DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); virtual void machine_start() override; uint32_t screen_update_rblaster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(sound_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t *spriteram, uint16_t tile_bank ); - void rblaster(machine_config &config); void rblaster_map(address_map &map); void rblaster_sound_map(address_map &map); }; diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp index 22e02895ec9..9995ff8ac25 100644 --- a/src/mame/drivers/dectalk.cpp +++ b/src/mame/drivers/dectalk.cpp @@ -252,11 +252,6 @@ dgc (dg(no!spam)cx@mac.com) class dectalk_state : public driver_device { public: - enum - { - TIMER_OUTFIFO_READ - }; - dectalk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), @@ -267,6 +262,14 @@ public: { } + void dectalk(machine_config &config); + +private: + enum + { + TIMER_OUTFIFO_READ + }; + // input fifo, between m68k and tms32010 uint16_t m_infifo[32]; // technically eight 74LS224 4bit*16stage FIFO chips, arranged as a 32 stage, 16-bit wide fifo uint8_t m_infifo_count; @@ -321,11 +324,10 @@ public: uint16_t dsp_outfifo_r(); DECLARE_WRITE_LINE_MEMBER(dectalk_reset); - void dectalk(machine_config &config); void m68k_mem(address_map &map); void tms32010_io(address_map &map); void tms32010_mem(address_map &map); -protected: + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp index f38997aa7cf..0948abf8f49 100644 --- a/src/mame/drivers/deshoros.cpp +++ b/src/mame/drivers/deshoros.cpp @@ -46,6 +46,11 @@ public: m_beeper(*this, "beeper") { } + void destiny(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + +private: required_device<cpu_device> m_maincpu; required_device<beep_device> m_beeper; @@ -60,9 +65,6 @@ public: DECLARE_WRITE8_MEMBER(bank_select_w); DECLARE_WRITE8_MEMBER(sound_w); - DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); - - void destiny(machine_config &config); void main_map(address_map &map); protected: // driver_device overrides diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp index a31396c288a..07fdbad8d54 100644 --- a/src/mame/drivers/destroyr.cpp +++ b/src/mame/drivers/destroyr.cpp @@ -25,12 +25,6 @@ TODO: class destroyr_state : public driver_device { public: - enum - { - TIMER_DESTROYR_DIAL, - TIMER_DESTROYR_FRAME - }; - destroyr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), @@ -45,7 +39,14 @@ public: void destroyr(machine_config &config); -protected: +private: + + enum + { + TIMER_DESTROYR_DIAL, + TIMER_DESTROYR_FRAME + }; + DECLARE_WRITE8_MEMBER(misc_w); DECLARE_WRITE8_MEMBER(cursor_load_w); DECLARE_WRITE8_MEMBER(interrupt_ack_w); @@ -64,7 +65,6 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void destroyr_map(address_map &map); -private: /* devices */ required_device<cpu_device> m_maincpu; required_device<watchdog_timer_device> m_watchdog; diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp index 348abafbfc0..1608a03b732 100644 --- a/src/mame/drivers/dfruit.cpp +++ b/src/mame/drivers/dfruit.cpp @@ -36,6 +36,9 @@ public: m_vdp(*this, "tc0091lvc") { } + void dfruit(machine_config &config); + +private: required_device<cpu_device> m_maincpu; required_device<tc0091lvc_device> m_vdp; @@ -71,7 +74,6 @@ public: uint8_t ram_bank_r(uint16_t offset, uint8_t bank_num); void ram_bank_w(uint16_t offset, uint8_t data, uint8_t bank_num); TIMER_DEVICE_CALLBACK_MEMBER(dfruit_irq_scanline); - void dfruit(machine_config &config); void dfruit_map(address_map &map); void tc0091lvc_map(address_map &map); }; diff --git a/src/mame/drivers/dgpix.cpp b/src/mame/drivers/dgpix.cpp index dbd18df8213..3ccaf4bdc0c 100644 --- a/src/mame/drivers/dgpix.cpp +++ b/src/mame/drivers/dgpix.cpp @@ -166,6 +166,16 @@ public: m_maincpu(*this, "maincpu"), m_vblank(*this, "VBLANK") { } + void dgpix(machine_config &config); + + void init_elfin(); + void init_jumpjump(); + void init_xfiles(); + void init_xfilesk(); + void init_kdynastg(); + void init_fmaniac3(); + +private: required_device<cpu_device> m_maincpu; required_ioport m_vblank; @@ -184,19 +194,11 @@ public: DECLARE_WRITE32_MEMBER(coin_w); DECLARE_READ32_MEMBER(vblank_r); - void init_elfin(); - void init_jumpjump(); - void init_xfiles(); - void init_xfilesk(); - void init_kdynastg(); - void init_fmaniac3(); - virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_dgpix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void dgpix(machine_config &config); void cpu_map(address_map &map); void io_map(address_map &map); }; diff --git a/src/mame/drivers/diablo1300.cpp b/src/mame/drivers/diablo1300.cpp index 72c8b812258..de029270cd4 100644 --- a/src/mame/drivers/diablo1300.cpp +++ b/src/mame/drivers/diablo1300.cpp @@ -144,12 +144,13 @@ public: , m_maincpu(*this, "maincpu") { } + void diablo1300(machine_config &config); + private: virtual void machine_start() override; virtual void machine_reset() override; required_device<cpu_device> m_maincpu; -public: - void diablo1300(machine_config &config); + void diablo1300_map(address_map &map); void diablo1300_data_map(address_map &map); }; diff --git a/src/mame/drivers/digijet.cpp b/src/mame/drivers/digijet.cpp index bf74473feea..21da2bc0113 100644 --- a/src/mame/drivers/digijet.cpp +++ b/src/mame/drivers/digijet.cpp @@ -33,11 +33,13 @@ public: { } + void digijet(machine_config &config); + +private: required_device<cpu_device> m_maincpu; virtual void machine_start() override { } virtual void machine_reset() override { } - void digijet(machine_config &config); void io_map(address_map &map); }; diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp index da718ee0677..77e7952dac6 100644 --- a/src/mame/drivers/dim68k.cpp +++ b/src/mame/drivers/dim68k.cpp @@ -57,6 +57,9 @@ public: , m_p_chargen(*this, "chargen") { } + void dim68k(machine_config &config); + +private: DECLARE_READ16_MEMBER( dim68k_duart_r ); DECLARE_READ16_MEMBER( dim68k_fdc_r ); DECLARE_READ16_MEMBER( dim68k_game_switches_r ); @@ -73,9 +76,8 @@ public: void kbd_put(u8 data); MC6845_UPDATE_ROW(crtc_update_row); - void dim68k(machine_config &config); void dim68k_mem(address_map &map); -private: + bool m_speaker_bit; u8 m_video_control; u8 m_term_data; diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp index 3319eaef11a..7a1d5db0bf0 100644 --- a/src/mame/drivers/discoboy.cpp +++ b/src/mame/drivers/discoboy.cpp @@ -70,6 +70,11 @@ public: m_ram_1(*this, "ram_1"), m_ram_2(*this, "ram_2") { } + void discoboy(machine_config &config); + + void init_discoboy(); + +private: /* video-related */ uint8_t m_gfxbank; uint8_t m_port_00; @@ -102,13 +107,11 @@ public: DECLARE_WRITE8_MEMBER(rambank2_w); DECLARE_READ8_MEMBER(port_06_r); DECLARE_WRITE8_MEMBER(yunsung8_sound_bankswitch_w); - void init_discoboy(); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(yunsung8_adpcm_int); - void discoboy(machine_config &config); void discoboy_map(address_map &map); void io_map(address_map &map); void rambank1_map(address_map &map); diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp index 504a75d817c..90bd9101888 100644 --- a/src/mame/drivers/diverboy.cpp +++ b/src/mame/drivers/diverboy.cpp @@ -73,6 +73,9 @@ public: m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch") { } + void diverboy(machine_config &config); + +private: /* memory pointers */ required_shared_ptr<uint16_t> m_spriteram; @@ -91,7 +94,6 @@ public: virtual void video_start() override; uint32_t screen_update_diverboy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void diverboy(machine_config &config); void diverboy_map(address_map &map); void snd_map(address_map &map); }; diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp index b08e306c05d..9a93bc9c2c7 100644 --- a/src/mame/drivers/dlair.cpp +++ b/src/mame/drivers/dlair.cpp @@ -79,7 +79,7 @@ public: void dleuro(machine_config &config); void dlair_ldv1000(machine_config &config); -protected: +private: void laserdisc_data_w(uint8_t data) { if (m_ldv1000 != nullptr) m_ldv1000->data_w(data); @@ -135,7 +135,6 @@ protected: void dleuro_map(address_map &map); void dlus_map(address_map &map); -private: required_device<cpu_device> m_maincpu; optional_device<speaker_sound_device> m_speaker; optional_device<gfxdecode_device> m_gfxdecode; diff --git a/src/mame/drivers/dlair2.cpp b/src/mame/drivers/dlair2.cpp index 13fb70751a6..f04abf592b5 100644 --- a/src/mame/drivers/dlair2.cpp +++ b/src/mame/drivers/dlair2.cpp @@ -47,6 +47,9 @@ public: { } + void dlair2(machine_config &config); + +private: // devices required_device<cpu_device> m_maincpu; @@ -56,10 +59,9 @@ public: INTERRUPT_GEN_MEMBER(dlair2_timer_irq); DECLARE_PALETTE_INIT(dlair2); - void dlair2(machine_config &config); void dlair2_io(address_map &map); void dlair2_map(address_map &map); -protected: + // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp index 52deda2488a..ae667a9ae28 100644 --- a/src/mame/drivers/dmax8000.cpp +++ b/src/mame/drivers/dmax8000.cpp @@ -46,7 +46,11 @@ public: , m_floppy0(*this, "fdc:0") { } + void dmax8000(machine_config &config); + void init_dmax8000(); + +private: DECLARE_MACHINE_RESET(dmax8000); DECLARE_WRITE8_MEMBER(port0c_w); DECLARE_WRITE8_MEMBER(port0d_w); @@ -54,10 +58,9 @@ public: DECLARE_WRITE8_MEMBER(port40_w); DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - void dmax8000(machine_config &config); void dmax8000_io(address_map &map); void dmax8000_mem(address_map &map); -private: + required_device<cpu_device> m_maincpu; required_device<fd1793_device> m_fdc; required_device<floppy_connector> m_floppy0; diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp index eaa9bc71ca8..eaae8fae413 100644 --- a/src/mame/drivers/dmndrby.cpp +++ b/src/mame/drivers/dmndrby.cpp @@ -77,6 +77,9 @@ public: m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch") { } + void dderby(machine_config &config); + +private: required_shared_ptr<uint8_t> m_scroll_ram; required_shared_ptr<uint8_t> m_sprite_ram; required_shared_ptr<uint8_t> m_dderby_vidchars; @@ -99,7 +102,6 @@ public: required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; required_device<generic_latch_8_device> m_soundlatch; - void dderby(machine_config &config); void dderby_sound_map(address_map &map); void memmap(address_map &map); }; diff --git a/src/mame/drivers/dms86.cpp b/src/mame/drivers/dms86.cpp index d119417148d..40cff98c1d7 100644 --- a/src/mame/drivers/dms86.cpp +++ b/src/mame/drivers/dms86.cpp @@ -48,17 +48,20 @@ public: , m_ctc(*this, "ctc") { } + void dms86(machine_config &config); + DECLARE_WRITE_LINE_MEMBER(nmi_w); + +private: DECLARE_WRITE8_MEMBER(m1_ack_w); DECLARE_READ16_MEMBER(port9a_r); DECLARE_READ16_MEMBER(port9c_r); void kbd_put(u8 data); - void dms86(machine_config &config); void io_map(address_map &map); void mem_map(address_map &map); -private: + u8 m_term_data; virtual void machine_reset() override; required_device<cpu_device> m_maincpu; diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp index 4291ea8d735..01466c1edf4 100644 --- a/src/mame/drivers/dmv.cpp +++ b/src/mame/drivers/dmv.cpp @@ -73,6 +73,9 @@ public: , m_leds(*this, "led%u", 1U) { } + void dmv(machine_config &config); + +private: void update_halt_line(); DECLARE_WRITE8_MEMBER(leds_w); @@ -142,16 +145,13 @@ public: UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); - void dmv(machine_config &config); void dmv_io(address_map &map); void dmv_mem(address_map &map); void upd7220_map(address_map &map); -protected: virtual void machine_start() override; virtual void machine_reset() override; -private: required_device<cpu_device> m_maincpu; required_device<screen_device> m_screen; required_device<upd7220_device> m_hgdc; diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp index a123f8510e2..3a2a950c8b2 100644 --- a/src/mame/drivers/dolphunk.cpp +++ b/src/mame/drivers/dolphunk.cpp @@ -102,16 +102,18 @@ public: , m_digits(*this, "digit%u", 0U) { } + void dauphin(machine_config &config); + +private: DECLARE_READ_LINE_MEMBER(cass_r); DECLARE_WRITE_LINE_MEMBER(cass_w); DECLARE_READ8_MEMBER(port07_r); DECLARE_WRITE8_MEMBER(port00_w); DECLARE_WRITE8_MEMBER(port06_w); TIMER_DEVICE_CALLBACK_MEMBER(dauphin_c); - void dauphin(machine_config &config); void dauphin_io(address_map &map); void dauphin_mem(address_map &map); -private: + uint8_t m_cass_data; uint8_t m_last_key; bool m_cass_state; diff --git a/src/mame/drivers/dominob.cpp b/src/mame/drivers/dominob.cpp index b21062d5740..67e9431691f 100644 --- a/src/mame/drivers/dominob.cpp +++ b/src/mame/drivers/dominob.cpp @@ -81,6 +81,9 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void dominob(machine_config &config); + +private: /* memory pointers */ required_shared_ptr<uint8_t> m_videoram; required_shared_ptr<uint8_t> m_spriteram; @@ -97,7 +100,6 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - void dominob(machine_config &config); void memmap(address_map &map); void portmap(address_map &map); }; diff --git a/src/mame/drivers/dorachan.cpp b/src/mame/drivers/dorachan.cpp index 50f02c42234..71856caf1f3 100644 --- a/src/mame/drivers/dorachan.cpp +++ b/src/mame/drivers/dorachan.cpp @@ -35,16 +35,17 @@ public: , m_colors(*this, "colors") { } + void dorachan(machine_config &config); + +private: DECLARE_WRITE8_MEMBER(control_w); DECLARE_WRITE8_MEMBER(protection_w); DECLARE_READ8_MEMBER(protection_r); DECLARE_READ8_MEMBER(v128_r); uint32_t screen_update_dorachan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - void dorachan(machine_config &config); void dorachan_io_map(address_map &map); void dorachan_map(address_map &map); -private: // internal state uint8_t m_flip_screen; uint16_t m_prot_value; diff --git a/src/mame/drivers/dotrikun.cpp b/src/mame/drivers/dotrikun.cpp index 29c20e9f3ee..ba8cf50e81a 100644 --- a/src/mame/drivers/dotrikun.cpp +++ b/src/mame/drivers/dotrikun.cpp @@ -49,6 +49,10 @@ public: m_scanline_off_timer(*this, "scanline_off") { } + void dotrikun(machine_config &config); + +private: + required_device<cpu_device> m_maincpu; required_device<screen_device> m_screen; required_shared_ptr<uint8_t> m_vram; @@ -67,7 +71,6 @@ public: virtual void machine_start() override; virtual void machine_reset() override; - void dotrikun(machine_config &config); void dotrikun_map(address_map &map); void io_map(address_map &map); }; diff --git a/src/mame/drivers/dps1.cpp b/src/mame/drivers/dps1.cpp index a68c7338d6b..271d72014c9 100644 --- a/src/mame/drivers/dps1.cpp +++ b/src/mame/drivers/dps1.cpp @@ -33,6 +33,11 @@ public: //, m_floppy1(*this, "fdc:1") { } + void dps1(machine_config &config); + + void init_dps1(); + +private: DECLARE_WRITE8_MEMBER(portb2_w); DECLARE_WRITE8_MEMBER(portb4_w); DECLARE_WRITE8_MEMBER(portb6_w); @@ -43,13 +48,10 @@ public: DECLARE_READ8_MEMBER(portff_r); DECLARE_WRITE8_MEMBER(portff_w); DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - void init_dps1(); DECLARE_MACHINE_RESET(dps1); - void dps1(machine_config &config); void io_map(address_map &map); void mem_map(address_map &map); -private: bool m_dma_dir; uint16_t m_dma_adr; required_device<cpu_device> m_maincpu; diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp index b6b57462c19..1d5898dd323 100644 --- a/src/mame/drivers/dreambal.cpp +++ b/src/mame/drivers/dreambal.cpp @@ -43,13 +43,17 @@ public: m_eeprom(*this, "eeprom") { } + void dreambal(machine_config &config); + + void init_dreambal(); + +private: /* devices */ required_device<cpu_device> m_maincpu; optional_device<deco104_device> m_deco104; required_device<deco16ic_device> m_deco_tilegen1; required_device<eeprom_serial_93cxx_device> m_eeprom; - void init_dreambal(); virtual void machine_start() override; virtual void machine_reset() override; @@ -73,7 +77,6 @@ public: m_eeprom->cs_write(data&0x4 ? ASSERT_LINE : CLEAR_LINE); } } - void dreambal(machine_config &config); void dreambal_map(address_map &map); }; diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp index c9d1689802f..da1deb99172 100644 --- a/src/mame/drivers/dreamwld.cpp +++ b/src/mame/drivers/dreamwld.cpp @@ -125,6 +125,10 @@ public: std::fill(std::begin(m_old_linescroll), std::end(m_old_linescroll), 0); } + void baryon(machine_config &config); + void dreamwld(machine_config &config); + +private: /* memory pointers */ required_shared_ptr<uint32_t> m_spriteram; required_shared_ptr_array<uint32_t, 2> m_vram; @@ -163,8 +167,6 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - void baryon(machine_config &config); - void dreamwld(machine_config &config); void baryon_map(address_map &map); void dreamwld_map(address_map &map); void oki1_map(address_map &map); diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp index 43513230752..7af1b14ef50 100644 --- a/src/mame/drivers/drtomy.cpp +++ b/src/mame/drivers/drtomy.cpp @@ -29,6 +29,9 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void drtomy(machine_config &config); + +private: /* memory pointers */ required_shared_ptr<uint16_t> m_videoram_fg; required_shared_ptr<uint16_t> m_videoram_bg; @@ -54,7 +57,6 @@ public: required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - void drtomy(machine_config &config); void drtomy_map(address_map &map); }; diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp index 656e87272a4..9c1bdfb8b05 100644 --- a/src/mame/drivers/dsb46.cpp +++ b/src/mame/drivers/dsb46.cpp @@ -45,14 +45,15 @@ public: , m_maincpu(*this, "maincpu") { } - DECLARE_WRITE8_MEMBER(port1a_w); + void dsb46(machine_config &config); + void init_dsb46(); - DECLARE_MACHINE_RESET(dsb46); - void dsb46(machine_config &config); +private: + DECLARE_WRITE8_MEMBER(port1a_w); + DECLARE_MACHINE_RESET(dsb46); void dsb46_io(address_map &map); void dsb46_mem(address_map &map); -private: required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/dual68.cpp b/src/mame/drivers/dual68.cpp index bce136276e5..6c26462299e 100644 --- a/src/mame/drivers/dual68.cpp +++ b/src/mame/drivers/dual68.cpp @@ -26,14 +26,15 @@ public: , m_p_ram(*this, "ram") { } + void dual68(machine_config &config); + +private: void kbd_put(u8 data); DECLARE_WRITE16_MEMBER(terminal_w); - void dual68(machine_config &config); void dual68_mem(address_map &map); void sio4_io(address_map &map); void sio4_mem(address_map &map); -private: virtual void machine_reset() override; required_device<cpu_device> m_maincpu; required_device<generic_terminal_device> m_terminal; diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp index 9cdb7753ec1..d576dfe2f78 100644 --- a/src/mame/drivers/dunhuang.cpp +++ b/src/mame/drivers/dunhuang.cpp @@ -80,6 +80,9 @@ public: m_dsw(*this, {"DSW1", "DSW2", "DSW3", "DSW4", "DSW5"}), m_service(*this, "SERVICE") { } + void dunhuang(machine_config &config); + +private: DECLARE_WRITE8_MEMBER(pos_x_w); DECLARE_WRITE8_MEMBER(pos_y_w); DECLARE_WRITE8_MEMBER(tile_w); @@ -103,17 +106,14 @@ public: DECLARE_READ8_MEMBER(dsw_r); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void dunhuang(machine_config &config); void dunhuang_io_map(address_map &map); void dunhuang_map(address_map &map); void ramdac_map(address_map &map); -protected: + virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; -private: - /* video-related */ tilemap_t *m_tmap; tilemap_t *m_tmap2; diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp index 0d372fc877a..b146bede198 100644 --- a/src/mame/drivers/dvk_kcgd.cpp +++ b/src/mame/drivers/dvk_kcgd.cpp @@ -68,6 +68,9 @@ public: m_screen(*this, "screen") { } + void kcgd(machine_config &config); + +private: virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -99,9 +102,8 @@ public: emu_timer *m_vsync_off_timer; emu_timer *m_500hz_timer; - void kcgd(machine_config &config); void kcgd_mem(address_map &map); -private: + void draw_scanline(uint16_t *p, uint16_t offset); rectangle m_tmpclip; bitmap_ind16 m_tmpbmp; @@ -114,7 +116,6 @@ private: } m_video; std::unique_ptr<uint32_t[]> m_videoram; -protected: required_device<cpu_device> m_maincpu; // required_device<ms7004_device> m_ms7004; required_device<palette_device> m_palette; diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp index 614eed6a312..9d0d30c5f88 100644 --- a/src/mame/drivers/dvk_ksm.cpp +++ b/src/mame/drivers/dvk_ksm.cpp @@ -107,6 +107,9 @@ public: , m_p_chargen(*this, "chargen") { } + void ksm(machine_config &config); + +private: TIMER_DEVICE_CALLBACK_MEMBER( scanline_callback ); virtual void machine_reset() override; @@ -124,10 +127,9 @@ public: DECLARE_WRITE8_MEMBER(ksm_ppi_porta_w); DECLARE_WRITE8_MEMBER(ksm_ppi_portc_w); - void ksm(machine_config &config); void ksm_io(address_map &map); void ksm_mem(address_map &map); -private: + uint32_t draw_scanline(uint16_t *p, uint16_t offset, uint8_t scanline); rectangle m_tmpclip; bitmap_ind16 m_tmpbmp; diff --git a/src/mame/drivers/dwarfd.cpp b/src/mame/drivers/dwarfd.cpp index 896183d4491..c8abf018049 100644 --- a/src/mame/drivers/dwarfd.cpp +++ b/src/mame/drivers/dwarfd.cpp @@ -317,6 +317,14 @@ public: m_dsw2(*this, "DSW2") { } + void dwarfd(machine_config &config); + void pokeresp(machine_config &config); + void qc(machine_config &config); + + void init_qc(); + void init_dwarfd(); + +private: /* video-related */ int m_crt_access; bool m_back_color; @@ -337,17 +345,12 @@ public: DECLARE_READ8_MEMBER(qc_b8_r); DECLARE_WRITE_LINE_MEMBER(dwarfd_sod_callback); DECLARE_WRITE_LINE_MEMBER(drq_w); - void init_qc(); - void init_dwarfd(); virtual void machine_start() override; virtual void machine_reset() override; DECLARE_PALETTE_INIT(dwarfd); I8275_DRAW_CHARACTER_MEMBER(display_pixels); I8275_DRAW_CHARACTER_MEMBER(pesp_display_pixels); I8275_DRAW_CHARACTER_MEMBER(qc_display_pixels); - void dwarfd(machine_config &config); - void pokeresp(machine_config &config); - void qc(machine_config &config); void io_map(address_map &map); void mem_map(address_map &map); void pokeresp_map(address_map &map); diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp index 1f333e45a09..b63d9d9102e 100644 --- a/src/mame/drivers/dynadice.cpp +++ b/src/mame/drivers/dynadice.cpp @@ -54,9 +54,9 @@ public: m_gfxdecode(*this, "gfxdecode"), m_ay8910(*this, "ay8910") { } -void init_dynadice(); + void dynadice(machine_config &config); -void dynadice(machine_config &config); + void init_dynadice(); protected: virtual void machine_start() override; diff --git a/src/mame/drivers/e100.cpp b/src/mame/drivers/e100.cpp index 7b6229de096..b8c98e8083e 100644 --- a/src/mame/drivers/e100.cpp +++ b/src/mame/drivers/e100.cpp @@ -158,6 +158,10 @@ public: ,m_pia1_B(0) ,m_50hz(0) { } + + void e100(machine_config &config); + +private: required_device<m6802_cpu_device> m_maincpu; required_device<ttl74145_device> m_kbd_74145; required_shared_ptr<uint8_t> m_videoram; @@ -179,9 +183,8 @@ public: DECLARE_WRITE_LINE_MEMBER( pia1_ca2_w); DECLARE_WRITE_LINE_MEMBER( pia1_cb2_w); TIMER_DEVICE_CALLBACK_MEMBER(rtc_w); - void e100(machine_config &config); void e100_map(address_map &map); -protected: + required_ioport m_io_line0; required_ioport m_io_line1; required_ioport m_io_line2; diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp index 1fe4b602144..898f51e2c4b 100644 --- a/src/mame/drivers/eacc.cpp +++ b/src/mame/drivers/eacc.cpp @@ -66,6 +66,9 @@ public: , m_digits(*this, "digit%u", 0U) { } + void eacc(machine_config &config); + +private: DECLARE_READ_LINE_MEMBER( eacc_cb1_r ); DECLARE_READ_LINE_MEMBER( eacc_distance_r ); DECLARE_READ_LINE_MEMBER( eacc_fuel_sensor_r ); @@ -75,9 +78,7 @@ public: DECLARE_WRITE8_MEMBER( eacc_segment_w ); TIMER_DEVICE_CALLBACK_MEMBER(eacc_cb1); TIMER_DEVICE_CALLBACK_MEMBER(eacc_nmi); - void eacc(machine_config &config); void eacc_mem(address_map &map); -private: uint8_t m_digit; bool m_cb1; bool m_cb2; diff --git a/src/mame/drivers/ec184x.cpp b/src/mame/drivers/ec184x.cpp index 59eb98941ac..c279d9f4670 100644 --- a/src/mame/drivers/ec184x.cpp +++ b/src/mame/drivers/ec184x.cpp @@ -48,7 +48,7 @@ public: void init_ec1841(); -protected: +private: DECLARE_MACHINE_RESET(ec1841); DECLARE_READ8_MEMBER(memboard_r); DECLARE_WRITE8_MEMBER(memboard_w); diff --git a/src/mame/drivers/ecoinf1.cpp b/src/mame/drivers/ecoinf1.cpp index 2177021e6b1..39df2f05dab 100644 --- a/src/mame/drivers/ecoinf1.cpp +++ b/src/mame/drivers/ecoinf1.cpp @@ -21,11 +21,10 @@ public: void ecoinf1_older(machine_config &config); -protected: +private: void older_memmap(address_map &map); void older_portmap(address_map &map); -private: required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ecoinf2.cpp b/src/mame/drivers/ecoinf2.cpp index 468db89c37c..c5061925d5e 100644 --- a/src/mame/drivers/ecoinf2.cpp +++ b/src/mame/drivers/ecoinf2.cpp @@ -37,7 +37,7 @@ public: void ecoinf2_oxo(machine_config &config); -protected: +private: template <unsigned N> DECLARE_WRITE_LINE_MEMBER(reel_optic_cb) { if (state) m_optic_pattern |= (1 << N); else m_optic_pattern &= ~(1 << N); } DECLARE_WRITE8_MEMBER(ox_port5c_out_w); @@ -204,7 +204,6 @@ protected: void oxo_memmap(address_map &map); void oxo_portmap(address_map &map); -private: required_device<cpu_device> m_maincpu; required_device_array<stepper_device, 4> m_reels; required_device<meters_device> m_meters; diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp index 6b12003086d..090230279a4 100644 --- a/src/mame/drivers/ecoinf3.cpp +++ b/src/mame/drivers/ecoinf3.cpp @@ -42,7 +42,7 @@ public: void init_ecoinf3_swap(); void ecoinf3_pyramid(machine_config &config); -protected: +private: virtual void machine_start() override { m_lamp_outputs.resolve(); @@ -268,7 +268,6 @@ protected: void pyramid_memmap(address_map &map); void pyramid_portmap(address_map &map); -private: required_device<z180_device> m_maincpu; required_device_array<stepper_device, 4> m_reels; output_finder<16 * 16> m_lamp_outputs; diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp index 62423b80aa0..c96675a1740 100644 --- a/src/mame/drivers/ecoinfr.cpp +++ b/src/mame/drivers/ecoinfr.cpp @@ -64,6 +64,17 @@ public: m_digits(*this, "digit%u", 0U) { } + void ecoinfr(machine_config &config); + + void init_ecoinfrbr(); + void init_ecoinfr(); + void init_ecoinfrmab(); + + DECLARE_CUSTOM_INPUT_MEMBER(ecoinfr_reel1_opto_r); + DECLARE_CUSTOM_INPUT_MEMBER(ecoinfr_reel2_opto_r); + DECLARE_CUSTOM_INPUT_MEMBER(ecoinfr_reel3_opto_r); + +private: int irq_toggle; int m_optic_pattern; DECLARE_WRITE_LINE_MEMBER(reel0_optic_cb) { if (state) m_optic_pattern |= 0x01; else m_optic_pattern &= ~0x01; } @@ -106,13 +117,7 @@ public: DECLARE_WRITE8_MEMBER(ec_port16_out_w); DECLARE_WRITE8_MEMBER(ec_port17_out_w); DECLARE_WRITE8_MEMBER(ec_port18_out_w); - DECLARE_CUSTOM_INPUT_MEMBER(ecoinfr_reel1_opto_r); - DECLARE_CUSTOM_INPUT_MEMBER(ecoinfr_reel2_opto_r); - DECLARE_CUSTOM_INPUT_MEMBER(ecoinfr_reel3_opto_r); - void init_ecoinfrbr(); - void init_ecoinfr(); - void init_ecoinfrmab(); virtual void machine_reset() override; virtual void machine_start() override { m_digits.resolve(); } TIMER_DEVICE_CALLBACK_MEMBER(ecoinfr_irq_timer); @@ -126,7 +131,6 @@ public: required_device<stepper_device> m_reel2; required_device<stepper_device> m_reel3; output_finder<16> m_digits; - void ecoinfr(machine_config &config); void memmap(address_map &map); void portmap(address_map &map); }; diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp index 512e94d87c3..6b23e6b51de 100644 --- a/src/mame/drivers/egghunt.cpp +++ b/src/mame/drivers/egghunt.cpp @@ -64,6 +64,9 @@ public: m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch") { } + void egghunt(machine_config &config); + +private: /* video-related */ tilemap_t *m_bg_tilemap; uint8_t m_vidram_bank; @@ -98,7 +101,6 @@ public: required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; required_device<generic_latch_8_device> m_soundlatch; - void egghunt(machine_config &config); void egghunt_map(address_map &map); void io_map(address_map &map); void sound_map(address_map &map); diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp index 683dba89b66..8c002b3b8d9 100644 --- a/src/mame/drivers/einstein.cpp +++ b/src/mame/drivers/einstein.cpp @@ -87,7 +87,11 @@ public: m_int(0) {} + void einstein(machine_config &config); + DECLARE_INPUT_CHANGED_MEMBER(joystick_button); + +private: TIMER_DEVICE_CALLBACK_MEMBER(keyboard_timer_callback); DECLARE_WRITE8_MEMBER(keyboard_line_write); DECLARE_READ8_MEMBER(keyboard_data_read); @@ -107,14 +111,12 @@ public: DECLARE_WRITE_LINE_MEMBER(ardy_w); TIMER_DEVICE_CALLBACK_MEMBER(strobe_callback); - void einstein(machine_config &config); void einstein_io(address_map &map); void einstein_mem(address_map &map); -protected: + virtual void machine_start() override; virtual void machine_reset() override; -private: void einstein_scan_keyboard(); required_device<cpu_device> m_maincpu; diff --git a/src/mame/drivers/electra.cpp b/src/mame/drivers/electra.cpp index de5452e030d..59dca302ffa 100644 --- a/src/mame/drivers/electra.cpp +++ b/src/mame/drivers/electra.cpp @@ -50,21 +50,18 @@ public: { } + void electra(machine_config &config); + +private: // devices required_device<netlist_mame_device> m_maincpu; required_device<fixedfreq_device> m_video; - void electra(machine_config &config); -protected: - // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - -private: - }; diff --git a/src/mame/drivers/elekscmp.cpp b/src/mame/drivers/elekscmp.cpp index dc31e2fe446..fb18bd2aeaa 100644 --- a/src/mame/drivers/elekscmp.cpp +++ b/src/mame/drivers/elekscmp.cpp @@ -40,7 +40,7 @@ public: void elekscmp(machine_config &config); -protected: +private: virtual void machine_start() override; DECLARE_READ8_MEMBER(keyboard_r); @@ -49,7 +49,6 @@ protected: void mem_map(address_map &map); -private: required_device<cpu_device> m_maincpu; required_ioport_array<4> m_x; output_finder<8> m_digit; diff --git a/src/mame/drivers/elektronmono.cpp b/src/mame/drivers/elektronmono.cpp index 3e53bbdc7e2..92fbd07775d 100644 --- a/src/mame/drivers/elektronmono.cpp +++ b/src/mame/drivers/elektronmono.cpp @@ -125,13 +125,12 @@ public: void elektron(machine_config &config); -protected: +private: virtual void machine_start() override; virtual void machine_reset() override; void elektron_map(address_map &map); -private: required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp index 46046860ea4..5fea91d80ba 100644 --- a/src/mame/drivers/elwro800.cpp +++ b/src/mame/drivers/elwro800.cpp @@ -50,6 +50,9 @@ public: { } + void elwro800(machine_config &config); + +private: /* for elwro800 */ /* RAM mapped at 0 */ uint8_t m_ram_at_0000; @@ -67,13 +70,12 @@ public: DECLARE_WRITE8_MEMBER(i8255_port_c_w); DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); - void elwro800(machine_config &config); void elwro800_bank1(address_map &map); void elwro800_bank2(address_map &map); void elwro800_io(address_map &map); void elwro800_m1(address_map &map); void elwro800_mem(address_map &map); -protected: + required_device<i8251_device> m_i8251; required_device<i8255_device> m_i8255; required_device<centronics_device> m_centronics; diff --git a/src/mame/drivers/embargo.cpp b/src/mame/drivers/embargo.cpp index 8bea4cc0d81..2468e88e6b5 100644 --- a/src/mame/drivers/embargo.cpp +++ b/src/mame/drivers/embargo.cpp @@ -19,6 +19,9 @@ public: m_videoram(*this, "videoram"), m_maincpu(*this, "maincpu") { } + void embargo(machine_config &config); + +private: /* memory pointers */ required_shared_ptr<uint8_t> m_videoram; @@ -35,7 +38,6 @@ public: virtual void machine_reset() override; uint32_t screen_update_embargo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; - void embargo(machine_config &config); void main_data_map(address_map &map); void main_io_map(address_map &map); void main_map(address_map &map); diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp index 2469476458b..083abf1c038 100644 --- a/src/mame/drivers/enigma2.cpp +++ b/src/mame/drivers/enigma2.cpp @@ -71,6 +71,15 @@ public: m_colors(*this, "colors"), m_stars(*this, "stars"){ } + void enigma2(machine_config &config); + void enigma2a(machine_config &config); + + void init_enigma2(); + + DECLARE_CUSTOM_INPUT_MEMBER(p1_controls_r); + DECLARE_CUSTOM_INPUT_MEMBER(p2_controls_r); + +private: /* memory pointers */ required_shared_ptr<uint8_t> m_videoram; @@ -95,11 +104,8 @@ public: DECLARE_READ8_MEMBER(dip_switch_r); DECLARE_WRITE8_MEMBER(sound_data_w); DECLARE_WRITE8_MEMBER(enigma2_flip_screen_w); - DECLARE_CUSTOM_INPUT_MEMBER(p1_controls_r); - DECLARE_CUSTOM_INPUT_MEMBER(p2_controls_r); DECLARE_READ8_MEMBER(sound_latch_r); DECLARE_WRITE8_MEMBER(protection_data_w); - void init_enigma2(); virtual void machine_start() override; virtual void machine_reset() override; uint32_t screen_update_enigma2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -110,8 +116,6 @@ public: inline int vysnc_chain_counter_to_vpos( uint16_t counter ); void create_interrupt_timers( ); void start_interrupt_timers( ); - void enigma2(machine_config &config); - void enigma2a(machine_config &config); void enigma2_audio_cpu_map(address_map &map); void enigma2_main_cpu_map(address_map &map); void enigma2a_main_cpu_io_map(address_map &map); diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp index ba646de66b0..4c1bd9d4873 100644 --- a/src/mame/drivers/enmirage.cpp +++ b/src/mame/drivers/enmirage.cpp @@ -67,19 +67,22 @@ public: { } - DECLARE_FLOPPY_FORMATS( floppy_formats ); + void mirage(machine_config &config); void init_mirage(); + +private: + + DECLARE_FLOPPY_FORMATS( floppy_formats ); + uint32_t screen_update_mirage(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(mirage_via_write_porta); DECLARE_WRITE8_MEMBER(mirage_via_write_portb); DECLARE_WRITE_LINE_MEMBER(mirage_doc_irq); DECLARE_READ8_MEMBER(mirage_adc_read); - void mirage(machine_config &config); void mirage_map(address_map &map); -protected: virtual void machine_reset() override; virtual void machine_start() override { m_digits.resolve(); } virtual void video_start() override; diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp index e0af1e6c5f3..e4d5ecb0ff0 100644 --- a/src/mame/drivers/ep64.cpp +++ b/src/mame/drivers/ep64.cpp @@ -193,6 +193,10 @@ public: m_y(*this, "Y%u", 0) { } + void ep128(machine_config &config); + void ep64(machine_config &config); + +private: required_device<cpu_device> m_maincpu; required_device<dave_device> m_dave; required_device<nick_device> m_nick; @@ -217,8 +221,6 @@ public: DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); int m_centronics_busy; - void ep128(machine_config &config); - void ep64(machine_config &config); void dave_128k_mem(address_map &map); void dave_64k_mem(address_map &map); void dave_io(address_map &map); diff --git a/src/mame/drivers/ertictac.cpp b/src/mame/drivers/ertictac.cpp index 5d7532698ca..428d7c8d16b 100644 --- a/src/mame/drivers/ertictac.cpp +++ b/src/mame/drivers/ertictac.cpp @@ -36,12 +36,15 @@ public: ertictac_state(const machine_config &mconfig, device_type type, const char *tag) : archimedes_state(mconfig, type, tag) { } - DECLARE_READ32_MEMBER(ertictac_podule_r); + void ertictac(machine_config &config); + void init_ertictac(); + +private: + DECLARE_READ32_MEMBER(ertictac_podule_r); virtual void machine_start() override; virtual void machine_reset() override; INTERRUPT_GEN_MEMBER(ertictac_podule_irq); - void ertictac(machine_config &config); void ertictac_map(address_map &map); }; diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp index 648bd14178c..a56b7911209 100644 --- a/src/mame/drivers/esh.cpp +++ b/src/mame/drivers/esh.cpp @@ -48,6 +48,12 @@ public: m_beep(*this, "beeper"), m_palette(*this, "palette") { } + + void esh(machine_config &config); + + void init_esh(); + +private: required_device<pioneer_ldv1000_device> m_laserdisc; required_device<screen_device> m_screen; required_shared_ptr<uint8_t> m_tile_ram; @@ -58,7 +64,6 @@ public: DECLARE_WRITE8_MEMBER(misc_write); DECLARE_WRITE8_MEMBER(led_writes); DECLARE_WRITE8_MEMBER(nmi_line_w); - void init_esh(); bool m_nmi_enable; virtual void machine_start() override; DECLARE_PALETTE_INIT(esh); @@ -70,7 +75,6 @@ public: required_device<beep_device> m_beep; required_device<palette_device> m_palette; - void esh(machine_config &config); void z80_0_io(address_map &map); void z80_0_mem(address_map &map); protected: diff --git a/src/mame/drivers/esprit.cpp b/src/mame/drivers/esprit.cpp index 3255255302b..723ba2c5795 100644 --- a/src/mame/drivers/esprit.cpp +++ b/src/mame/drivers/esprit.cpp @@ -30,14 +30,17 @@ public: , m_palette(*this, "palette") { } - MC6845_UPDATE_ROW(crtc_update_row); - void init_init(); - void esprit(machine_config &config); void esprit3(machine_config &config); + + void init_init(); + +private: + MC6845_UPDATE_ROW(crtc_update_row); + void mem3_map(address_map &map); void mem_map(address_map &map); -private: + required_device<cpu_device> m_maincpu; required_region_ptr<u8> m_p_chargen; required_shared_ptr<u8> m_p_videoram; diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp index 1f748a7989f..eeef45211c2 100644 --- a/src/mame/drivers/esq1.cpp +++ b/src/mame/drivers/esq1.cpp @@ -396,6 +396,13 @@ public: m_mdout(*this, "mdout") { } + void sq80(machine_config &config); + + void esq1(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(key_stroke); + +private: required_device<cpu_device> m_maincpu; required_device<scn2681_device> m_duart; required_device<esq1_filters> m_filters; @@ -422,11 +429,8 @@ public: uint8_t m_seqram[0x10000]; uint8_t m_dosram[0x2000]; virtual void machine_reset() override; - DECLARE_INPUT_CHANGED_MEMBER(key_stroke); void send_through_panel(uint8_t data); - void esq1(machine_config &config); - void sq80(machine_config &config); void esq1_map(address_map &map); void sq80_map(address_map &map); }; diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp index b4740d4abc6..a78a52eecb2 100644 --- a/src/mame/drivers/esq5505.cpp +++ b/src/mame/drivers/esq5505.cpp @@ -182,6 +182,21 @@ public: , m_mdout(*this, "mdout") { } + void sq1(machine_config &config); + void vfx(machine_config &config); + void vfxsd(machine_config &config); + void eps(machine_config &config); + void vfx32(machine_config &config); + + void init_eps(); + void init_common(); + void init_sq1(); + void init_denib(); + DECLARE_INPUT_CHANGED_MEMBER(key_stroke); + IRQ_CALLBACK_MEMBER(maincpu_irq_acknowledge_callback); + DECLARE_WRITE_LINE_MEMBER(esq5505_otis_irq); + +private: required_device<m68000_device> m_maincpu; required_device<mc68681_device> m_duart; required_device<es5510_device> m_esp; @@ -218,28 +233,14 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); - void sq1(machine_config &config); - void vfx(machine_config &config); - void vfxsd(machine_config &config); - void eps(machine_config &config); - void vfx32(machine_config &config); void eps_map(address_map &map); void sq1_map(address_map &map); void vfx_map(address_map &map); void vfxsd_map(address_map &map); -private: + uint16_t *m_rom, *m_ram; uint16_t m_analog_values[8]; -public: - void init_eps(); - void init_common(); - void init_sq1(); - void init_denib(); - DECLARE_INPUT_CHANGED_MEMBER(key_stroke); - IRQ_CALLBACK_MEMBER(maincpu_irq_acknowledge_callback); - DECLARE_WRITE_LINE_MEMBER(esq5505_otis_irq); - //dmac DECLARE_WRITE8_MEMBER(dma_end); DECLARE_WRITE8_MEMBER(dma_error); diff --git a/src/mame/drivers/esqasr.cpp b/src/mame/drivers/esqasr.cpp index 8887d703443..787fec516a3 100644 --- a/src/mame/drivers/esqasr.cpp +++ b/src/mame/drivers/esqasr.cpp @@ -60,6 +60,12 @@ public: , m_sq1vfd(*this, "sq1vfd") { } + void asrx(machine_config &config); + void asr(machine_config &config); + + void init_asr(); + +private: required_device<cpu_device> m_maincpu; optional_device<es5510_device> m_esp; optional_device<esq_5505_5510_pump_device> m_pump; @@ -68,11 +74,8 @@ public: virtual void machine_start() override; virtual void machine_reset() override; - void init_asr(); DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); DECLARE_READ16_MEMBER(esq5506_read_adc); - void asrx(machine_config &config); - void asr(machine_config &config); void asr_map(address_map &map); void asrx_map(address_map &map); }; diff --git a/src/mame/drivers/esqkt.cpp b/src/mame/drivers/esqkt.cpp index ddce73c5c93..89ee7e4d7af 100644 --- a/src/mame/drivers/esqkt.cpp +++ b/src/mame/drivers/esqkt.cpp @@ -114,6 +114,11 @@ public: , m_mdout(*this, "mdout") { } + void kt(machine_config &config); + + void init_kt(); + +private: required_device<m68ec020_device> m_maincpu; required_device<es5510_device> m_esp; required_device<esq_5505_5510_pump_device> m_pump; @@ -132,11 +137,8 @@ public: uint8_t m_duart_io; bool m_bCalibSecondByte; -public: - void init_kt(); DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); DECLARE_READ16_MEMBER(esq5506_read_adc); - void kt(machine_config &config); void kt_map(address_map &map); }; diff --git a/src/mame/drivers/esqmr.cpp b/src/mame/drivers/esqmr.cpp index 800c8cf4947..5f1f387b7d8 100644 --- a/src/mame/drivers/esqmr.cpp +++ b/src/mame/drivers/esqmr.cpp @@ -217,16 +217,18 @@ public: , m_sq1vfd(*this, "sq1vfd") { } + void mr(machine_config &config); + + void init_mr(); + +private: required_device<m68340_cpu_device> m_maincpu; required_device<esq2x40_sq1_device> m_sq1vfd; virtual void machine_reset() override; -public: - void init_mr(); DECLARE_WRITE_LINE_MEMBER(esq5506_otto_irq); DECLARE_READ16_MEMBER(esq5506_read_adc); - void mr(machine_config &config); void mr_map(address_map &map); }; diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp index 537cabe4378..e408b0a0d99 100644 --- a/src/mame/drivers/et3400.cpp +++ b/src/mame/drivers/et3400.cpp @@ -49,11 +49,13 @@ public: , m_digit(*this, "digit%u", 1U) { } + void et3400(machine_config &config); + DECLARE_WRITE_LINE_MEMBER(reset_key_w); DECLARE_WRITE_LINE_MEMBER(segment_test_w); - void et3400(machine_config &config); -protected: +private: + virtual void machine_start() override; DECLARE_READ8_MEMBER(keypad_r); @@ -66,7 +68,6 @@ protected: void mem_map(address_map &map); -private: required_device<cpu_device> m_maincpu; required_device<pia6821_device> m_pia; required_device_array<ls259_device, 6> m_displatch; diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp index bfc700855b1..38a778da095 100644 --- a/src/mame/drivers/ettrivia.cpp +++ b/src/mame/drivers/ettrivia.cpp @@ -49,6 +49,9 @@ public: { } + void ettrivia(machine_config &config); + +private: int m_palreg; int m_gfx_bank; int m_question_bank; @@ -76,7 +79,6 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device_array<ay8912_device, 3> m_ay; - void ettrivia(machine_config &config); void cpu_map(address_map &map); void io_map(address_map &map); }; diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp index 24591707333..e4e5fa9a0ac 100644 --- a/src/mame/drivers/europc.cpp +++ b/src/mame/drivers/europc.cpp @@ -50,6 +50,13 @@ public: m_port61(0) { } + void europc(machine_config &config); + void europc2(machine_config &config); + void euroxt(machine_config &config); + + void init_europc(); + +private: required_device<cpu_device> m_maincpu; required_device<pc_noppi_mb_device> m_mb; required_device<pc_keyboard_device> m_keyboard; @@ -64,8 +71,6 @@ public: DECLARE_READ8_MEMBER( europc_rtc_r ); DECLARE_WRITE8_MEMBER( europc_rtc_w ); - void init_europc(); - void europc_rtc_set_time(); uint8_t m_jim_data[16]; @@ -84,9 +89,6 @@ public: TIMER_RTC }; static void cfg_builtin_720K(device_t *device); - void europc(machine_config &config); - void europc2(machine_config &config); - void euroxt(machine_config &config); void europc_io(address_map &map); void europc_map(address_map &map); }; diff --git a/src/mame/drivers/eva.cpp b/src/mame/drivers/eva.cpp index 9d8b35ca746..f60feaba058 100644 --- a/src/mame/drivers/eva.cpp +++ b/src/mame/drivers/eva.cpp @@ -39,6 +39,11 @@ public: m_tms6100(*this, "tms6100") { } + void tms5110_route(machine_config &config); + void eva11(machine_config &config); + void eva24(machine_config &config); + +private: // devices required_device<cpu_device> m_maincpu; required_device<tms5110_device> m_tms5100; @@ -56,11 +61,6 @@ public: DECLARE_WRITE16_MEMBER(eva11_write_o); DECLARE_WRITE16_MEMBER(eva11_write_r); - void tms5110_route(machine_config &config); - void eva11(machine_config &config); - void eva24(machine_config &config); - -protected: virtual void machine_start() override; virtual void machine_reset() override; }; diff --git a/src/mame/drivers/evmbug.cpp b/src/mame/drivers/evmbug.cpp index 497b3a105bb..d2f91e1c182 100644 --- a/src/mame/drivers/evmbug.cpp +++ b/src/mame/drivers/evmbug.cpp @@ -31,14 +31,16 @@ public: , m_terminal(*this, "terminal") { } + void evmbug(machine_config &config); + +private: DECLARE_READ8_MEMBER(rs232_r); DECLARE_WRITE8_MEMBER(rs232_w); void kbd_put(u8 data); - void evmbug(machine_config &config); void io_map(address_map &map); void mem_map(address_map &map); -private: + virtual void machine_reset() override; uint8_t m_term_data; uint8_t m_term_out; diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp index ce5f1a7acd0..dd0cca56e8a 100644 --- a/src/mame/drivers/excali64.cpp +++ b/src/mame/drivers/excali64.cpp @@ -72,6 +72,9 @@ public: , m_floppy1(*this, "fdc:1") { } + void excali64(machine_config &config); + +private: DECLARE_PALETTE_INIT(excali64); DECLARE_WRITE8_MEMBER(ppib_w); DECLARE_READ8_MEMBER(ppic_r); @@ -96,10 +99,9 @@ public: DECLARE_MACHINE_RESET(excali64); required_device<palette_device> m_palette; - void excali64(machine_config &config); void io_map(address_map &map); void mem_map(address_map &map); -private: + uint8_t *m_p_videoram; uint8_t *m_p_hiresram; uint8_t m_sys_status; diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp index 51fb2d18819..a8a4ebc061c 100644 --- a/src/mame/drivers/exelv.cpp +++ b/src/mame/drivers/exelv.cpp @@ -81,6 +81,10 @@ public: m_cart(*this, "cartslot") { } + void exeltel(machine_config &config); + void exl100(machine_config &config); + +private: required_device<cpu_device> m_maincpu; required_device<tms3556_device> m_tms3556; required_device<tms5220c_device> m_tms5220c; @@ -116,8 +120,6 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(exelv_hblank_interrupt); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( exelvision_cartridge ); - void exeltel(machine_config &config); - void exl100(machine_config &config); void tms7020_mem(address_map &map); void tms7040_mem(address_map &map); }; diff --git a/src/mame/drivers/exidyttl.cpp b/src/mame/drivers/exidyttl.cpp index 39dd60d4dab..55e9650b4a1 100644 --- a/src/mame/drivers/exidyttl.cpp +++ b/src/mame/drivers/exidyttl.cpp @@ -51,22 +51,20 @@ public: { } + void attack(machine_config &config); + void deathrac(machine_config &config); + +private: // devices required_device<netlist_mame_device> m_maincpu; required_device<fixedfreq_device> m_video; - void attack(machine_config &config); - void deathrac(machine_config &config); -protected: - // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; -private: - }; diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp index 25fed233d8a..8248bba7e71 100644 --- a/src/mame/drivers/expro02.cpp +++ b/src/mame/drivers/expro02.cpp @@ -235,6 +235,19 @@ public: m_spriteram(*this, "spriteram") { } + void supmodel(machine_config &config); + void zipzap(machine_config &config); + void fantasia(machine_config &config); + void fantsia2(machine_config &config); + void comad(machine_config &config); + void comad_noview2(machine_config &config); + void smissw(machine_config &config); + void galhustl(machine_config &config); + void expro02(machine_config &config); + + void init_expro02(); + +private: required_device<cpu_device> m_maincpu; required_device<palette_device> m_palette; required_device<screen_device> m_screen; @@ -248,7 +261,6 @@ public: DECLARE_WRITE8_MEMBER(expro02_6295_bankswitch_w); - void init_expro02(); virtual void machine_start() override; DECLARE_PALETTE_INIT(expro02); @@ -260,15 +272,6 @@ public: // comad READ16_MEMBER(comad_timer_r); READ8_MEMBER(comad_okim6295_r); - void supmodel(machine_config &config); - void zipzap(machine_config &config); - void fantasia(machine_config &config); - void fantsia2(machine_config &config); - void comad(machine_config &config); - void comad_noview2(machine_config &config); - void smissw(machine_config &config); - void galhustl(machine_config &config); - void expro02(machine_config &config); void comad_map(address_map &map); void expro02_map(address_map &map); void expro02_video_base_map(address_map &map); diff --git a/src/mame/drivers/extrema.cpp b/src/mame/drivers/extrema.cpp index e60b9751585..b1cd04802f9 100644 --- a/src/mame/drivers/extrema.cpp +++ b/src/mame/drivers/extrema.cpp @@ -23,8 +23,10 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - required_device<cpu_device> m_maincpu; void extrema(machine_config &config); + +private: + required_device<cpu_device> m_maincpu; void extrema_map(address_map &map); void extrema_portmap(address_map &map); }; diff --git a/src/mame/drivers/ez2d.cpp b/src/mame/drivers/ez2d.cpp index 3cfefe829f2..23a73cf93ab 100644 --- a/src/mame/drivers/ez2d.cpp +++ b/src/mame/drivers/ez2d.cpp @@ -50,13 +50,15 @@ public: m_maincpu(*this, "maincpu") { } + void ez2d(machine_config &config); + +private: required_device<cpu_device> m_maincpu; virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - void ez2d(machine_config &config); void ez2d_map(address_map &map); }; diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp index 1b13cafb36d..d8d328b591e 100644 --- a/src/mame/drivers/f-32.cpp +++ b/src/mame/drivers/f-32.cpp @@ -45,6 +45,10 @@ public: m_maincpu(*this, "maincpu") , m_videoram(*this, "videoram"){ } + void mosaicf2(machine_config &config); + void royalpk2(machine_config &config); + +private: /* devices */ required_device<hyperstone_device> m_maincpu; @@ -53,8 +57,6 @@ public: DECLARE_READ32_MEMBER(f32_input_port_1_r); uint32_t screen_update_mosaicf2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void mosaicf2(machine_config &config); - void royalpk2(machine_config &config); void common_map(address_map &map); void mosaicf2_io(address_map &map); void royalpk2_io(address_map &map); diff --git a/src/mame/drivers/famibox.cpp b/src/mame/drivers/famibox.cpp index 8e4e2cafb67..21eab88fc63 100644 --- a/src/mame/drivers/famibox.cpp +++ b/src/mame/drivers/famibox.cpp @@ -75,7 +75,13 @@ public: m_maincpu(*this, "maincpu"), m_ppu(*this, "ppu") { } + void famibox(machine_config &config); + + DECLARE_CUSTOM_INPUT_MEMBER(famibox_coin_r); + DECLARE_INPUT_CHANGED_MEMBER(famibox_keyswitch_changed); + DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); +private: required_device<cpu_device> m_maincpu; required_device<ppu2c0x_device> m_ppu; @@ -106,9 +112,6 @@ public: DECLARE_READ8_MEMBER(famibox_IN1_r); DECLARE_READ8_MEMBER(famibox_system_r); DECLARE_WRITE8_MEMBER(famibox_system_w); - DECLARE_CUSTOM_INPUT_MEMBER(famibox_coin_r); - DECLARE_INPUT_CHANGED_MEMBER(famibox_keyswitch_changed); - DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; @@ -116,7 +119,6 @@ public: TIMER_CALLBACK_MEMBER(famicombox_gameplay_timer_callback); void famicombox_bankswitch(uint8_t bank); void famicombox_reset(); - void famibox(machine_config &config); void famibox_map(address_map &map); }; diff --git a/src/mame/drivers/fanucs15.cpp b/src/mame/drivers/fanucs15.cpp index 2d782a1c978..211abbef1a6 100644 --- a/src/mame/drivers/fanucs15.cpp +++ b/src/mame/drivers/fanucs15.cpp @@ -319,17 +319,19 @@ public: , m_convcpu(*this, "convcpu") // conversational 80286-8 { } + void fanucs15(machine_config &config); + +private: required_device<m68020_device> m_maincpu; required_device<m68000_device> m_pmccpu; required_device<m68000_device> m_gfxcpu; required_device<i80286_cpu_device> m_convcpu; - void fanucs15(machine_config &config); void convcpu_mem(address_map &map); void gfxcpu_mem(address_map &map); void maincpu_mem(address_map &map); void pmccpu_mem(address_map &map); -private: + virtual void machine_reset() override; }; diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp index a245cf167c8..2d8e59ba8d7 100644 --- a/src/mame/drivers/fanucspmg.cpp +++ b/src/mame/drivers/fanucspmg.cpp @@ -585,6 +585,12 @@ public: , m_chargen(*this, CHARGEN_TAG) { } + void fanucspmgm(machine_config &config); + void fanucspmg(machine_config &config); + + void init_fanucspmg(); + +private: required_device<i8086_cpu_device> m_maincpu; required_device<i8085a_cpu_device> m_subcpu; required_device<i8251_device> m_usart0; @@ -631,17 +637,13 @@ public: MC6845_UPDATE_ROW(crtc_update_row); MC6845_UPDATE_ROW(crtc_update_row_mono); - void init_fanucspmg(); - uint8_t m_vram[24576]; uint8_t m_video_ctrl; - void fanucspmgm(machine_config &config); - void fanucspmg(machine_config &config); void maincpu_io(address_map &map); void maincpu_mem(address_map &map); void subcpu_mem(address_map &map); -private: + virtual void machine_reset() override; int32_t m_vram_bank; uint8_t m_vbl_ctrl; diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp index ed1db1c39a7..f5694ef95aa 100644 --- a/src/mame/drivers/fastinvaders.cpp +++ b/src/mame/drivers/fastinvaders.cpp @@ -54,7 +54,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(in5); DECLARE_INPUT_CHANGED_MEMBER(in6); -protected: +private: DECLARE_WRITE8_MEMBER(io_40_w); DECLARE_READ8_MEMBER(io_60_r); @@ -67,7 +67,6 @@ protected: DECLARE_WRITE8_MEMBER(io_e0_w); DECLARE_WRITE8_MEMBER(io_f0_w); - DECLARE_READ_LINE_MEMBER(sid_read); virtual void video_start() override; @@ -87,7 +86,6 @@ protected: void fastinvaders_6845_io(address_map &map); void fastinvaders_8275_io(address_map &map); -private: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_shared_ptr<uint8_t> m_videoram; diff --git a/src/mame/drivers/fb01.cpp b/src/mame/drivers/fb01.cpp index a4b9cdbda68..8926ec0f7c2 100644 --- a/src/mame/drivers/fb01.cpp +++ b/src/mame/drivers/fb01.cpp @@ -38,6 +38,9 @@ public: { } + void fb01(machine_config &config); + +private: DECLARE_WRITE_LINE_MEMBER(write_usart_clock); DECLARE_WRITE_LINE_MEMBER(midi_in); DECLARE_WRITE_LINE_MEMBER(ym2164_irq_w); @@ -50,10 +53,9 @@ public: DECLARE_PALETTE_INIT(fb01); HD44780_PIXEL_UPDATE(fb01_pixel_update); - void fb01(machine_config &config); void fb01_io(address_map &map); void fb01_mem(address_map &map); -private: + required_device<z80_device> m_maincpu; required_device<i8251_device> m_upd71051; required_device<midi_port_device> m_midi_thru; diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp index ef225404654..9fe28d2645d 100644 --- a/src/mame/drivers/fc100.cpp +++ b/src/mame/drivers/fc100.cpp @@ -68,6 +68,11 @@ public: , m_keyboard(*this, "KEY.%u", 0) { } + void fc100(machine_config &config); + + void init_fc100(); + +private: DECLARE_READ8_MEMBER(mc6847_videoram_r); DECLARE_READ8_MEMBER(port00_r); DECLARE_WRITE8_MEMBER(port31_w); @@ -76,7 +81,6 @@ public: DECLARE_WRITE8_MEMBER(port60_w); DECLARE_WRITE8_MEMBER(port70_w); DECLARE_WRITE_LINE_MEMBER(txdata_callback); - void init_fc100(); TIMER_DEVICE_CALLBACK_MEMBER(timer_c); TIMER_DEVICE_CALLBACK_MEMBER(timer_p); TIMER_DEVICE_CALLBACK_MEMBER(timer_k); @@ -85,10 +89,9 @@ public: { return m_p_chargen[(ch * 16 + line) & 0xfff]; } - void fc100(machine_config &config); void fc100_io(address_map &map); void fc100_mem(address_map &map); -private: + virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp index e0dcb408d73..848b0ed0de5 100644 --- a/src/mame/drivers/fccpu30.cpp +++ b/src/mame/drivers/fccpu30.cpp @@ -249,6 +249,28 @@ cpu30_state(const machine_config &mconfig, device_type type, const char *tag) { } + void cpu30(machine_config &config); + void cpu30x(machine_config &config); + void cpu30zbe(machine_config &config); + void cpu30be8(machine_config &config); + void cpu30za(machine_config &config); + void cpu30lite4(machine_config &config); + void cpu30xa(machine_config &config); + void cpu33(machine_config &config); + void cpu30lite8(machine_config &config); + void cpu30be16(machine_config &config); + + void init_cpu30x(); + void init_cpu30xa(); + void init_cpu30za(); + void init_cpu30zbe(); + void init_cpu30be8(); + void init_cpu30be16(); + void init_cpu30lite4(); + void init_cpu30lite8(); + void init_cpu33(); + +private: DECLARE_WRITE8_MEMBER (fdc_w); DECLARE_READ8_MEMBER (fdc_r); DECLARE_WRITE8_MEMBER (scsi_w); @@ -283,29 +305,9 @@ cpu30_state(const machine_config &mconfig, device_type type, const char *tag) //DECLARE_WRITE16_MEMBER (vme_a16_w); virtual void machine_start () override; virtual void machine_reset () override; - void init_cpu30x(); - void init_cpu30xa(); - void init_cpu30za(); - void init_cpu30zbe(); - void init_cpu30be8(); - void init_cpu30be16(); - void init_cpu30lite4(); - void init_cpu30lite8(); - void init_cpu33(); - void cpu30(machine_config &config); - void cpu30x(machine_config &config); - void cpu30zbe(machine_config &config); - void cpu30be8(machine_config &config); - void cpu30za(machine_config &config); - void cpu30lite4(machine_config &config); - void cpu30xa(machine_config &config); - void cpu33(machine_config &config); - void cpu30lite8(machine_config &config); - void cpu30be16(machine_config &config); + void cpu30_mem(address_map &map); -protected: -private: required_device<m68000_base_device> m_maincpu; required_device<ram_device> m_ram; diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index fae3c8dfc9e..661eecca85e 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -477,6 +477,51 @@ public: m_div_config(*this, "div_config") { } + void csc(machine_config &config); + void su9(machine_config &config); + void rsc(machine_config &config); + DECLARE_INPUT_CHANGED_MEMBER(su9_cpu_freq); + + void eas(machine_config &config); + void eag(machine_config &config); + void pc(machine_config &config); + void init_eag(); + + void sc9b(machine_config &config); + void sc9c(machine_config &config); + void sc9d(machine_config &config); + void playmatic(machine_config &config); + DECLARE_INPUT_CHANGED_MEMBER(sc9c_cpu_freq); + + void sc12_map(address_map &map); + void sc12(machine_config &config); + void sc12b(machine_config &config); + + void as12(machine_config &config); + + void fexcel(machine_config &config); + void fexcelb(machine_config &config); + void fexcel4(machine_config &config); + void fexceld(machine_config &config); + void fexcelv(machine_config &config); + void fexcelp(machine_config &config); + void granits(machine_config &config); + void fdes2100(machine_config &config); + void fdes2000(machine_config &config); + DECLARE_INPUT_CHANGED_MEMBER(fexcelv_bankswitch); + + void fdes2000d(machine_config &config); + void fdes2100d(machine_config &config); + void init_fdesdis(); + + void fphantom(machine_config &config); + void init_fphantom(); + + void chesster(machine_config &config); + void kishon(machine_config &config); + void init_chesster(); + +private: // devices/pointers optional_device<i8255_device> m_ppi8255; optional_memory_bank m_rombank; @@ -508,14 +553,10 @@ public: DECLARE_READ_LINE_MEMBER(csc_pia1_ca1_r); DECLARE_READ_LINE_MEMBER(csc_pia1_cb1_r); DECLARE_MACHINE_RESET(su9); - DECLARE_INPUT_CHANGED_MEMBER(su9_cpu_freq); void su9_set_cpu_freq(); void csc_map(address_map &map); void su9_map(address_map &map); void rsc_map(address_map &map); - void csc(machine_config &config); - void su9(machine_config &config); - void rsc(machine_config &config); // EAS, EAG, PC void eas_prepare_display(); @@ -525,13 +566,9 @@ public: DECLARE_WRITE8_MEMBER(eas_ppi_porta_w); DECLARE_READ8_MEMBER(eas_ppi_portb_r); DECLARE_WRITE8_MEMBER(eas_ppi_portc_w); - void init_eag(); void eas_map(address_map &map); void eag_map(address_map &map); void pc_map(address_map &map); - void eas(machine_config &config); - void eag(machine_config &config); - void pc(machine_config &config); // SC9 void sc9_prepare_display(); @@ -540,21 +577,13 @@ public: DECLARE_READ8_MEMBER(sc9_input_r); DECLARE_READ8_MEMBER(sc9d_input_r); DECLARE_MACHINE_RESET(sc9c); - DECLARE_INPUT_CHANGED_MEMBER(sc9c_cpu_freq); void sc9c_set_cpu_freq(); void sc9_map(address_map &map); void sc9d_map(address_map &map); - void sc9b(machine_config &config); - void sc9c(machine_config &config); - void sc9d(machine_config &config); - void playmatic(machine_config &config); // SC12 DECLARE_WRITE8_MEMBER(sc12_control_w); DECLARE_READ8_MEMBER(sc12_input_r); - void sc12_map(address_map &map); - void sc12(machine_config &config); - void sc12b(machine_config &config); // AS12 void as12_prepare_display(); @@ -562,10 +591,8 @@ public: DECLARE_WRITE8_MEMBER(as12_led_w); DECLARE_READ8_MEMBER(as12_input_r); void as12_map(address_map &map); - void as12(machine_config &config); // Excellence - DECLARE_INPUT_CHANGED_MEMBER(fexcelv_bankswitch); DECLARE_READ8_MEMBER(fexcelv_speech_r); DECLARE_WRITE8_MEMBER(fexcel_ttl_w); DECLARE_READ8_MEMBER(fexcelb_ttl_r); @@ -573,39 +600,22 @@ public: void fexcel_map(address_map &map); void fexcelb_map(address_map &map); void fexcelp_map(address_map &map); - void fexcel(machine_config &config); - void fexcelb(machine_config &config); - void fexcel4(machine_config &config); - void fexceld(machine_config &config); - void fexcelv(machine_config &config); - void fexcelp(machine_config &config); - void granits(machine_config &config); - void fdes2100(machine_config &config); - void fdes2000(machine_config &config); // Designer Display DECLARE_WRITE8_MEMBER(fdesdis_control_w); DECLARE_WRITE8_MEMBER(fdesdis_lcd_w); DECLARE_READ8_MEMBER(fdesdis_input_r); - void init_fdesdis(); void fdesdis_map(address_map &map); - void fdes2000d(machine_config &config); - void fdes2100d(machine_config &config); // Phantom DECLARE_MACHINE_RESET(fphantom); - void init_fphantom(); void fphantom_map(address_map &map); - void fphantom(machine_config &config); // Chesster DECLARE_WRITE8_MEMBER(chesster_control_w); DECLARE_WRITE8_MEMBER(kishon_control_w); - void init_chesster(); void chesster_map(address_map &map); void kishon_map(address_map &map); - void chesster(machine_config &config); - void kishon(machine_config &config); }; diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp index 86cbd6a1429..5e9f18893ac 100644 --- a/src/mame/drivers/fidel68k.cpp +++ b/src/mame/drivers/fidel68k.cpp @@ -202,6 +202,22 @@ public: m_ram(*this, "ram") { } + void fex68k(machine_config &config); + void fex68km2(machine_config &config); + void fex68km3(machine_config &config); + + void fdes2265(machine_config &config); + void fdes2325(machine_config &config); + void init_fdes2265(); + + void eag(machine_config &config); + void eagv7(machine_config &config); + void eagv9(machine_config &config); + void eagv10(machine_config &config); + void eagv11(machine_config &config); + void init_eag(); + +private: optional_device<ram_device> m_ram; TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(M68K_IRQ_2, ASSERT_LINE); } @@ -212,22 +228,15 @@ public: void fex68k_map(address_map &map); void fex68km2_map(address_map &map); void fex68km3_map(address_map &map); - void fex68k(machine_config &config); - void fex68km2(machine_config &config); - void fex68km3(machine_config &config); // Designer Master DECLARE_WRITE8_MEMBER(fdes68k_control_w); DECLARE_READ8_MEMBER(fdes68k_input_r); DECLARE_WRITE8_MEMBER(fdes68k_lcd_w); - void init_fdes2265(); void fdes2265_map(address_map &map); void fdes2325_map(address_map &map); - void fdes2265(machine_config &config); - void fdes2325(machine_config &config); // EAG(6114/6117) - void init_eag(); void eag_prepare_display(); DECLARE_READ8_MEMBER(eag_input1_r); DECLARE_WRITE8_MEMBER(eag_leds_w); @@ -237,11 +246,6 @@ public: void eag_map(address_map &map); void eagv7_map(address_map &map); void eagv11_map(address_map &map); - void eag(machine_config &config); - void eagv7(machine_config &config); - void eagv9(machine_config &config); - void eagv10(machine_config &config); - void eagv11(machine_config &config); }; diff --git a/src/mame/drivers/fidelmcs48.cpp b/src/mame/drivers/fidelmcs48.cpp index 4b141e00c7f..78cdeb4b104 100644 --- a/src/mame/drivers/fidelmcs48.cpp +++ b/src/mame/drivers/fidelmcs48.cpp @@ -41,6 +41,9 @@ public: : fidelbase_state(mconfig, type, tag) { } + void sc6(machine_config &config); + +private: // SC6 void sc6_prepare_display(); DECLARE_WRITE8_MEMBER(sc6_mux_w); @@ -49,7 +52,6 @@ public: DECLARE_READ_LINE_MEMBER(sc6_input6_r); DECLARE_READ_LINE_MEMBER(sc6_input7_r); void sc6_map(address_map &map); - void sc6(machine_config &config); }; diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index f031de3f5fb..08d930583ae 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -523,6 +523,22 @@ public: m_beeper(*this, "beeper") { } + void cc10(machine_config &config); + void vcc(machine_config &config); + + void bcc(machine_config &config); + + void scc(machine_config &config); + + void vsc(machine_config &config); + + void vbrc(machine_config &config); + + void dsc(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(reset_button); + +private: // devices/pointers optional_device<i8041_device> m_mcu; optional_device<z80pio_device> m_z80pio; @@ -534,8 +550,6 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE); } TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE); } - DECLARE_INPUT_CHANGED_MEMBER(reset_button); - // CC10 and VCC/UVC void vcc_prepare_display(); DECLARE_READ8_MEMBER(vcc_speech_r); @@ -550,22 +564,18 @@ public: void cc10_map(address_map &map); void vcc_io(address_map &map); void vcc_map(address_map &map); - void cc10(machine_config &config); - void vcc(machine_config &config); // BCC DECLARE_READ8_MEMBER(bcc_input_r); DECLARE_WRITE8_MEMBER(bcc_control_w); void bcc_io(address_map &map); void bcc_map(address_map &map); - void bcc(machine_config &config); // SCC DECLARE_READ8_MEMBER(scc_input_r); DECLARE_WRITE8_MEMBER(scc_control_w); void scc_io(address_map &map); void scc_map(address_map &map); - void scc(machine_config &config); // VSC void vsc_prepare_display(); @@ -579,7 +589,6 @@ public: DECLARE_WRITE8_MEMBER(vsc_pio_portb_w); void vsc_io(address_map &map); void vsc_map(address_map &map); - void vsc(machine_config &config); // VBRC void vbrc_prepare_display(); @@ -591,14 +600,12 @@ public: DECLARE_WRITE8_MEMBER(vbrc_ioexp_port_w); void vbrc_main_io(address_map &map); void vbrc_main_map(address_map &map); - void vbrc(machine_config &config); // DSC void dsc_prepare_display(); DECLARE_WRITE8_MEMBER(dsc_control_w); DECLARE_WRITE8_MEMBER(dsc_select_w); DECLARE_READ8_MEMBER(dsc_input_r); - void dsc(machine_config &config); void dsc_map(address_map &map); }; diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp index 3358d417568..9e238bac175 100644 --- a/src/mame/drivers/fireball.cpp +++ b/src/mame/drivers/fireball.cpp @@ -55,6 +55,9 @@ public: , m_digits(*this, "digit%u", 0U) { } + void fireball(machine_config &config); + +private: DECLARE_WRITE8_MEMBER(io_00_w); DECLARE_READ8_MEMBER(io_00_r); DECLARE_WRITE8_MEMBER(io_02_w); @@ -69,11 +72,9 @@ public: DECLARE_WRITE8_MEMBER(p3_w); TIMER_DEVICE_CALLBACK_MEMBER(int_0); - void fireball(machine_config &config); void fireball_io_map(address_map &map); void fireball_map(address_map &map); -private: uint8_t m_p1_data; uint8_t m_p3_data; uint8_t int_timing; diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp index 96985da6e33..bca86c59078 100644 --- a/src/mame/drivers/firebeat.cpp +++ b/src/mame/drivers/firebeat.cpp @@ -190,6 +190,15 @@ public: m_spuata(*this, "spu_ata") { } + void firebeat2(machine_config &config); + void firebeat(machine_config &config); + void firebeat_spu(machine_config &config); + + void init_ppd(); + void init_kbm(); + void init_ppp(); + +private: required_device<ppc4xx_device> m_maincpu; optional_device<m68000_device> m_audiocpu; required_shared_ptr<uint32_t> m_work_ram; @@ -214,9 +223,6 @@ public: int m_ibutton_read_subkey_ptr; uint8_t m_ibutton_subkey_data[0x40]; - void init_ppd(); - void init_kbm(); - void init_ppp(); DECLARE_MACHINE_START(firebeat); DECLARE_MACHINE_RESET(firebeat); DECLARE_VIDEO_START(firebeat); @@ -268,9 +274,6 @@ public: DECLARE_WRITE_LINE_MEMBER(gcu0_interrupt); DECLARE_WRITE_LINE_MEMBER(gcu1_interrupt); static void cdrom_config(device_t *device); - void firebeat2(machine_config &config); - void firebeat(machine_config &config); - void firebeat_spu(machine_config &config); void firebeat_map(address_map &map); void firebeat2_map(address_map &map); void spu_map(address_map &map); diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp index 48f9133c52d..ed6e52dedcd 100644 --- a/src/mame/drivers/firefox.cpp +++ b/src/mame/drivers/firefox.cpp @@ -72,7 +72,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(soundflag_r); void firefox(machine_config &config); -protected: +private: DECLARE_READ8_MEMBER(firefox_disc_status_r); DECLARE_READ8_MEMBER(firefox_disc_data_r); DECLARE_WRITE8_MEMBER(firefox_disc_read_w); @@ -110,7 +110,6 @@ protected: void audio_map(address_map &map); void main_map(address_map &map); -private: required_device<phillips_22vp931_device> m_laserdisc; required_shared_ptr<unsigned char> m_tileram; required_shared_ptr<uint8_t> m_spriteram; diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp index 4c18a77768a..c164f149125 100644 --- a/src/mame/drivers/fk1.cpp +++ b/src/mame/drivers/fk1.cpp @@ -28,6 +28,9 @@ public: m_ram(*this, RAM_TAG) { } + void fk1(machine_config &config); + +private: required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; @@ -63,7 +66,6 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback); TIMER_DEVICE_CALLBACK_MEMBER(vsync_callback); IRQ_CALLBACK_MEMBER(fk1_irq_callback); - void fk1(machine_config &config); void fk1_io(address_map &map); void fk1_mem(address_map &map); }; diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp index 9b25f7e335c..d7fb27cbe58 100644 --- a/src/mame/drivers/flicker.cpp +++ b/src/mame/drivers/flicker.cpp @@ -64,7 +64,7 @@ public: void flicker(machine_config &config); -protected: +private: virtual void driver_start() override; DECLARE_WRITE8_MEMBER(ram0_out) { m_ram0_output = data; } @@ -81,7 +81,6 @@ protected: void flicker_rom_ports(address_map &map); void flicker_status(address_map &map); -private: required_device<i4004_cpu_device> m_maincpu; required_ioport m_testport; required_ioport m_coinport; diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp index be6f8f72cc2..0e492642d8e 100644 --- a/src/mame/drivers/flipjack.cpp +++ b/src/mame/drivers/flipjack.cpp @@ -109,6 +109,11 @@ public: m_layer = 0; } + void flipjack(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(flipjack_coin); + +private: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<hd6845_device> m_crtc; @@ -128,13 +133,11 @@ public: DECLARE_WRITE8_MEMBER(flipjack_soundlatch_w); DECLARE_WRITE8_MEMBER(flipjack_bank_w); DECLARE_WRITE8_MEMBER(flipjack_layer_w); - DECLARE_INPUT_CHANGED_MEMBER(flipjack_coin); DECLARE_READ8_MEMBER(flipjack_soundlatch_r); DECLARE_WRITE8_MEMBER(flipjack_portc_w); virtual void machine_start() override; DECLARE_PALETTE_INIT(flipjack); uint32_t screen_update_flipjack(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - void flipjack(machine_config &config); void flipjack_main_io_map(address_map &map); void flipjack_main_map(address_map &map); void flipjack_sound_io_map(address_map &map); diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp index 28883514234..31e1e357cb1 100644 --- a/src/mame/drivers/flower.cpp +++ b/src/mame/drivers/flower.cpp @@ -108,30 +108,32 @@ public: m_soundlatch(*this, "soundlatch") { } + void flower(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + +private: DECLARE_WRITE8_MEMBER(flipscreen_w); DECLARE_WRITE8_MEMBER(coin_counter_w); DECLARE_WRITE8_MEMBER(sound_command_w); DECLARE_WRITE8_MEMBER(audio_nmi_mask_w); DECLARE_WRITE8_MEMBER(bgvram_w); DECLARE_WRITE8_MEMBER(fgvram_w); - DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); INTERRUPT_GEN_MEMBER(master_vblank_irq); INTERRUPT_GEN_MEMBER(slave_vblank_irq); TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void flower(machine_config &config); void audio_map(address_map &map); void shared_map(address_map &map); -protected: + // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; -private: required_device<cpu_device> m_mastercpu; required_device<cpu_device> m_slavecpu; required_device<cpu_device> m_audiocpu; diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp index 93b3a1dbf92..326d78a6b50 100644 --- a/src/mame/drivers/flyball.cpp +++ b/src/mame/drivers/flyball.cpp @@ -31,13 +31,6 @@ static constexpr XTAL PIXEL_CLOCK = MASTER_CLOCK / 2; class flyball_state : public driver_device { public: - enum - { - TIMER_POT_ASSERT, - TIMER_POT_CLEAR, - TIMER_QUARTER - }; - flyball_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), @@ -51,7 +44,14 @@ public: void flyball(machine_config &config); -protected: +private: + enum + { + TIMER_POT_ASSERT, + TIMER_POT_CLEAR, + TIMER_QUARTER + }; + DECLARE_READ8_MEMBER(input_r); DECLARE_READ8_MEMBER(scanline_r); DECLARE_READ8_MEMBER(potsense_r); @@ -80,7 +80,6 @@ protected: void flyball_map(address_map &map); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; -private: /* devices */ required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; diff --git a/src/mame/drivers/fontwriter.cpp b/src/mame/drivers/fontwriter.cpp index 25de2f3b850..ff07676d05a 100644 --- a/src/mame/drivers/fontwriter.cpp +++ b/src/mame/drivers/fontwriter.cpp @@ -33,6 +33,9 @@ public: m_maincpu(*this, "maincpu") { } + void fontwriter(machine_config &config); + +private: virtual void machine_reset() override; virtual void machine_start() override; @@ -43,10 +46,8 @@ public: m_vbl ^= 0xff; return m_vbl; } - void fontwriter(machine_config &config); void io_map(address_map &map); void main_map(address_map &map); -protected: // devices required_device<m37720s1_device> m_maincpu; diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp index d1708dbe89c..7975d77d33f 100644 --- a/src/mame/drivers/force68k.cpp +++ b/src/mame/drivers/force68k.cpp @@ -171,6 +171,10 @@ public: { } + void fccpu1_eprom_sockets(machine_config &config); + void fccpu1(machine_config &config); + +private: DECLARE_READ16_MEMBER (bootvect_r); DECLARE_READ16_MEMBER (vme_a24_r); DECLARE_WRITE16_MEMBER (vme_a24_w); @@ -202,10 +206,8 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER (exp1_load) { return force68k_load_cart(image, m_cart); } DECLARE_READ16_MEMBER (read16_rom); - void fccpu1_eprom_sockets(machine_config &config); - void fccpu1(machine_config &config); void force68k_mem(address_map &map); -private: + required_device<cpu_device> m_maincpu; required_device<mm58167_device> m_rtc; required_device<pit68230_device> m_pit; diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp index d279a2b1626..fc2db887852 100644 --- a/src/mame/drivers/forte2.cpp +++ b/src/mame/drivers/forte2.cpp @@ -55,7 +55,7 @@ public: void init_pesadelo(); void pesadelo(machine_config &config); -protected: +private: virtual void machine_start() override; virtual void machine_reset() override; void io_mem(address_map &map); @@ -64,7 +64,6 @@ protected: DECLARE_READ8_MEMBER(forte2_ay8910_read_input); DECLARE_WRITE8_MEMBER(forte2_ay8910_set_input_mask); -private: required_device<cpu_device> m_maincpu; uint8_t m_input_mask; diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp index 99f71e6294e..ddd5c879292 100644 --- a/src/mame/drivers/fp1100.cpp +++ b/src/mame/drivers/fp1100.cpp @@ -70,6 +70,11 @@ public: , m_cass(*this, "cassette") { } + void fp1100(machine_config &config); + + void init_fp1100(); + +private: DECLARE_WRITE8_MEMBER(main_bank_w); DECLARE_WRITE8_MEMBER(irq_mask_w); DECLARE_WRITE8_MEMBER(main_to_sub_w); @@ -87,16 +92,14 @@ public: DECLARE_WRITE_LINE_MEMBER(centronics_busy_w); DECLARE_WRITE_LINE_MEMBER(cass_w); INTERRUPT_GEN_MEMBER(vblank_irq); - void init_fp1100(); DECLARE_MACHINE_RESET(fp1100); MC6845_UPDATE_ROW(crtc_update_row); TIMER_DEVICE_CALLBACK_MEMBER(timer_c); required_device<palette_device> m_palette; - void fp1100(machine_config &config); void io_map(address_map &map); void main_map(address_map &map); void sub_map(address_map &map); -private: + uint8_t m_irq_mask; uint8_t m_main_latch; uint8_t m_sub_latch; diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp index 261279d98d0..478ac7c536a 100644 --- a/src/mame/drivers/fp200.cpp +++ b/src/mame/drivers/fp200.cpp @@ -36,6 +36,11 @@ public: m_maincpu(*this, "maincpu") { } + void fp200(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(keyb_irq); + +private: // devices required_device<cpu_device> m_maincpu; uint8_t m_io_type; @@ -63,16 +68,14 @@ public: DECLARE_WRITE8_MEMBER(fp200_lcd_w); DECLARE_READ8_MEMBER(fp200_keyb_r); DECLARE_WRITE8_MEMBER(fp200_keyb_w); - DECLARE_INPUT_CHANGED_MEMBER(keyb_irq); DECLARE_WRITE_LINE_MEMBER(sod_w); DECLARE_READ_LINE_MEMBER(sid_r); DECLARE_PALETTE_INIT(fp200); - void fp200(machine_config &config); void fp200_io(address_map &map); void fp200_map(address_map &map); -protected: + // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/fp6000.cpp b/src/mame/drivers/fp6000.cpp index 322385eb671..d5a9af2d406 100644 --- a/src/mame/drivers/fp6000.cpp +++ b/src/mame/drivers/fp6000.cpp @@ -38,6 +38,9 @@ public: m_palette(*this, "palette") { } + void fp6000(machine_config &config); + +private: uint8_t *m_char_rom; required_shared_ptr<uint16_t> m_gvram; required_shared_ptr<uint16_t> m_vram; @@ -63,7 +66,6 @@ public: required_device<mc6845_device>m_crtc; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - void fp6000(machine_config &config); void fp6000_io(address_map &map); void fp6000_map(address_map &map); }; diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp index 71e19bf5fe6..469fad4bcc1 100644 --- a/src/mame/drivers/fresh.cpp +++ b/src/mame/drivers/fresh.cpp @@ -44,6 +44,9 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void fresh(machine_config &config); + +private: tilemap_t *m_bg_tilemap; tilemap_t *m_bg_2_tilemap; @@ -52,7 +55,6 @@ public: required_shared_ptr<uint16_t> m_attr_videoram; required_shared_ptr<uint16_t> m_attr_2_videoram; - DECLARE_WRITE16_MEMBER(fresh_bg_videoram_w); DECLARE_WRITE16_MEMBER(fresh_attr_videoram_w); TILE_GET_INFO_MEMBER(get_fresh_bg_tile_info); @@ -60,7 +62,6 @@ public: DECLARE_WRITE16_MEMBER(fresh_attr_2_videoram_w); TILE_GET_INFO_MEMBER(get_fresh_bg_2_tile_info); - uint16_t m_d30000_value; DECLARE_WRITE16_MEMBER( d30000_write ) @@ -102,7 +103,6 @@ public: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - void fresh(machine_config &config); void fresh_map(address_map &map); }; diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp index a1dfa49a7a3..db9b0ab1be7 100644 --- a/src/mame/drivers/fruitpc.cpp +++ b/src/mame/drivers/fruitpc.cpp @@ -35,6 +35,9 @@ public: , m_inp4(*this, "INP4") { } + void fruitpc(machine_config &config); + +private: required_device<isa8_device> m_isabus; required_ioport m_inp1; required_ioport m_inp2; @@ -44,7 +47,6 @@ public: DECLARE_READ8_MEMBER(fruit_inp_r); DECLARE_WRITE8_MEMBER(dma8237_1_dack_w); static void fruitpc_sb_conf(device_t *device); - void fruitpc(machine_config &config); void fruitpc_io(address_map &map); void fruitpc_map(address_map &map); }; diff --git a/src/mame/drivers/ft68m.cpp b/src/mame/drivers/ft68m.cpp index d645004ec7d..69517a972a8 100644 --- a/src/mame/drivers/ft68m.cpp +++ b/src/mame/drivers/ft68m.cpp @@ -29,11 +29,13 @@ public: { } + void ft68m(machine_config &config); + +private: DECLARE_READ16_MEMBER(switches_r); - void ft68m(machine_config &config); void mem_map(address_map &map); -private: + virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/fungames.cpp b/src/mame/drivers/fungames.cpp index 3a18f4153d0..481c3ba604d 100644 --- a/src/mame/drivers/fungames.cpp +++ b/src/mame/drivers/fungames.cpp @@ -46,21 +46,18 @@ public: { } + void fungames(machine_config &config); + +private: // devices required_device<netlist_mame_device> m_maincpu; required_device<fixedfreq_device> m_video; - void fungames(machine_config &config); -protected: - // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; - -private: - }; diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp index a53711f3416..69f8d5ccc11 100644 --- a/src/mame/drivers/funkball.cpp +++ b/src/mame/drivers/funkball.cpp @@ -94,6 +94,9 @@ public: , m_inputs(*this, "IN.%u", 0) { } + void funkball(machine_config &config); + +private: uint8_t m_funkball_config_reg_sel; uint8_t m_funkball_config_regs[256]; uint32_t m_cx5510_regs[256/4]; @@ -138,7 +141,6 @@ public: DECLARE_WRITE8_MEMBER(io20_w); virtual void machine_start() override; virtual void machine_reset() override; - void funkball(machine_config &config); void flashbank_map(address_map &map); void funkball_io(address_map &map); void funkball_map(address_map &map); diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp index 582d6c0e10e..1f6f40b23c8 100644 --- a/src/mame/drivers/g627.cpp +++ b/src/mame/drivers/g627.cpp @@ -61,17 +61,19 @@ public: , m_digits(*this, "digit%u", 0U) { } + void g627(machine_config &config); + void init_v115(); void init_v117(); + +private: DECLARE_READ8_MEMBER(porta_r); DECLARE_READ8_MEMBER(portb_r); DECLARE_WRITE8_MEMBER(portc_w); DECLARE_WRITE8_MEMBER(disp_w); DECLARE_WRITE8_MEMBER(lamp_w); - void g627(machine_config &config); void io_map(address_map &map); void mem_map(address_map &map); -private: uint8_t m_seg[6]; uint8_t m_portc; uint8_t m_motor; diff --git a/src/mame/drivers/gaelcopc.cpp b/src/mame/drivers/gaelcopc.cpp index ee16b48b4c0..600feb982a9 100644 --- a/src/mame/drivers/gaelcopc.cpp +++ b/src/mame/drivers/gaelcopc.cpp @@ -38,11 +38,12 @@ public: m_maincpu(*this, "maincpu") { } + void gaelcopc(machine_config &config); + +private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void gaelcopc(machine_config &config); void gaelcopc_map(address_map &map); -protected: // devices required_device<cpu_device> m_maincpu; diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp index 59ee0526f1c..96c2805c8ab 100644 --- a/src/mame/drivers/gal3.cpp +++ b/src/mame/drivers/gal3.cpp @@ -146,6 +146,9 @@ public: m_rso_shared_ram(*this, "rso_shared_ram"), m_generic_paletteram_16(*this, "paletteram") { } + void gal3(machine_config &config); + +private: uint32_t *m_mpSharedRAM0; //uint32_t *m_mpSharedRAM1; uint16_t m_namcos21_video_enable; @@ -166,7 +169,6 @@ public: DECLARE_VIDEO_START(gal3); uint32_t screen_update_gal3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void update_palette( ); - void gal3(machine_config &config); void cpu_mst_map(address_map &map); void cpu_slv_map(address_map &map); void psn_b1_cpu_map(address_map &map); diff --git a/src/mame/drivers/galgame.cpp b/src/mame/drivers/galgame.cpp index 82510c51f62..4d590ee07fe 100644 --- a/src/mame/drivers/galgame.cpp +++ b/src/mame/drivers/galgame.cpp @@ -26,6 +26,11 @@ public: m_maincpu(*this, "maincpu"), m_palette(*this, "palette") { } + void galaxygame(machine_config &config); + + void init_galaxygame(); + +private: uint16_t m_clk; uint16_t m_x; @@ -50,14 +55,12 @@ public: DECLARE_READ16_MEMBER(y_r); DECLARE_WRITE16_MEMBER(y_w); DECLARE_WRITE16_MEMBER(clk_w); - void init_galaxygame(); virtual void machine_reset() override; uint32_t screen_update_galaxygame(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(galaxygame_irq); IRQ_CALLBACK_MEMBER(galaxygame_irq_callback); required_device<cpu_device> m_maincpu; required_device<palette_device> m_palette; - void galaxygame(machine_config &config); void galaxygame_map(address_map &map); }; diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp index eb7057827fb..7c12d616c14 100644 --- a/src/mame/drivers/galpani3.cpp +++ b/src/mame/drivers/galpani3.cpp @@ -90,9 +90,11 @@ public: m_priority_buffer(*this, "priority_buffer"), m_sprregs(*this, "sprregs"), m_sprite_bitmap(1024, 1024) - { } + void galpani3(machine_config &config); + +private: required_device<cpu_device> m_maincpu; required_device_array<kaneko_grap2_device, 3> m_grap2; required_device<palette_device> m_palette; @@ -114,12 +116,10 @@ public: DECLARE_WRITE16_MEMBER(galpani3_priority_buffer_scrollx_w); DECLARE_WRITE16_MEMBER(galpani3_priority_buffer_scrolly_w); - virtual void video_start() override; uint32_t screen_update_galpani3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(galpani3_vblank); - void galpani3(machine_config &config); void galpani3_map(address_map &map); }; diff --git a/src/mame/drivers/gamate.cpp b/src/mame/drivers/gamate.cpp index 17b89218194..0cf3423272d 100644 --- a/src/mame/drivers/gamate.cpp +++ b/src/mame/drivers/gamate.cpp @@ -32,6 +32,11 @@ public: , m_bios(*this, "bios") { } + void gamate(machine_config &config); + + void init_gamate(); + +private: DECLARE_READ8_MEMBER(card_available_check); DECLARE_READ8_MEMBER(card_available_set); DECLARE_WRITE8_MEMBER(card_reset); @@ -42,14 +47,11 @@ public: DECLARE_WRITE8_MEMBER(write_cart); DECLARE_READ8_MEMBER(read_cart); - void init_gamate(); - TIMER_CALLBACK_MEMBER(gamate_timer); TIMER_CALLBACK_MEMBER(gamate_timer2); - void gamate(machine_config &config); void gamate_mem(address_map &map); -private: + virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp index 9b950063e6c..9be11b6f8e0 100644 --- a/src/mame/drivers/gambl186.cpp +++ b/src/mame/drivers/gambl186.cpp @@ -64,6 +64,9 @@ public: m_maincpu(*this, "maincpu"), m_upd7759(*this, "7759") { } + void gambl186(machine_config &config); + +private: required_device<cpu_device> m_maincpu; optional_device<upd7759_device> m_upd7759; int m_comms_state; @@ -79,7 +82,6 @@ public: DECLARE_WRITE16_MEMBER(comms_w); DECLARE_WRITE16_MEMBER(data_bank_w); DECLARE_WRITE16_MEMBER(upd_w); - void gambl186(machine_config &config); void gambl186_io(address_map &map); void gambl186_map(address_map &map); }; diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp index bd94a27b4b5..3f4b5d0473a 100644 --- a/src/mame/drivers/gamecstl.cpp +++ b/src/mame/drivers/gamecstl.cpp @@ -83,6 +83,11 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void gamecstl(machine_config &config); + + void init_gamecstl(); + +private: required_shared_ptr<uint32_t> m_cga_ram; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; @@ -93,14 +98,12 @@ public: DECLARE_WRITE32_MEMBER(pnp_config_w); DECLARE_WRITE32_MEMBER(pnp_data_w); DECLARE_WRITE32_MEMBER(bios_ram_w); - void init_gamecstl(); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_gamecstl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_char(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx, int ch, int att, int x, int y); void intel82439tx_init(); - void gamecstl(machine_config &config); void gamecstl_io(address_map &map); void gamecstl_map(address_map &map); diff --git a/src/mame/drivers/gameking.cpp b/src/mame/drivers/gameking.cpp index c595ac31357..3d171a834e9 100644 --- a/src/mame/drivers/gameking.cpp +++ b/src/mame/drivers/gameking.cpp @@ -46,7 +46,13 @@ public: m_palette(*this, "palette") { } + void gameking(machine_config &config); + void gameking3(machine_config &config); + void gameking1(machine_config &config); + void init_gameking(); + +private: virtual void machine_start() override; virtual void machine_reset() override; DECLARE_PALETTE_INIT(gameking); @@ -70,11 +76,8 @@ public: uint8_t bank8000_cart; //34 bit 7; bits 0,1,.. a15,a16,.. uint8_t res2[0x4c]; }; - void gameking(machine_config &config); - void gameking3(machine_config &config); - void gameking1(machine_config &config); void gameking_mem(address_map &map); -protected: + required_device<cpu_device> m_maincpu; required_device<generic_slot_device> m_cart; required_ioport m_io_joy; diff --git a/src/mame/drivers/gammagic.cpp b/src/mame/drivers/gammagic.cpp index 99e9a2b4aa8..251e97e26e1 100644 --- a/src/mame/drivers/gammagic.cpp +++ b/src/mame/drivers/gammagic.cpp @@ -44,8 +44,10 @@ public: gammagic_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) { } - virtual void machine_start() override; void gammagic(machine_config &config); + +private: + virtual void machine_start() override; void gammagic_io(address_map &map); void gammagic_map(address_map &map); }; diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp index 7e00c6939b6..0e756f2d3f3 100644 --- a/src/mame/drivers/gamtor.cpp +++ b/src/mame/drivers/gamtor.cpp @@ -44,12 +44,11 @@ public: void init_gaminator(); void gaminator(machine_config &config); -protected: +private: void gaminator_map(address_map &map); DECLARE_WRITE32_MEMBER(gamtor_unk_w); -private: required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp index 7e117d14259..d5ff6768dce 100644 --- a/src/mame/drivers/gei.cpp +++ b/src/mame/drivers/gei.cpp @@ -97,6 +97,23 @@ public: , m_lamps(*this, "lamp%u", 0U) { } + void findout(machine_config &config); + void suprpokr(machine_config &config); + void gselect(machine_config &config); + void amuse1(machine_config &config); + void gepoker(machine_config &config); + void jokpokera(machine_config &config); + void quizvid(machine_config &config); + void getrivia(machine_config &config); + void amuse(machine_config &config); + void sprtauth(machine_config &config); + + void init_setbank(); + void init_bank2k(); + void init_bank8k(); + void init_geimulti(); + +private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(gei_drawctrl_w); @@ -114,23 +131,8 @@ public: DECLARE_WRITE8_MEMBER(nmi_w); DECLARE_READ8_MEMBER(portC_r); - void init_setbank(); - void init_bank2k(); - void init_bank8k(); - void init_geimulti(); - INTERRUPT_GEN_MEMBER(vblank_irq); - void findout(machine_config &config); - void suprpokr(machine_config &config); - void gselect(machine_config &config); - void amuse1(machine_config &config); - void gepoker(machine_config &config); - void jokpokera(machine_config &config); - void quizvid(machine_config &config); - void getrivia(machine_config &config); - void amuse(machine_config &config); - void sprtauth(machine_config &config); void amuse1_map(address_map &map); void amuse_map(address_map &map); void findout_map(address_map &map); @@ -140,11 +142,10 @@ public: void quizvid_map(address_map &map); void sprtauth_map(address_map &map); void suprpokr_map(address_map &map); -protected: + virtual void machine_start() override { m_lamps.resolve(); } virtual void video_start() override; -private: bitmap_ind16 m_bitmap; uint8_t m_drawctrl[3]; diff --git a/src/mame/drivers/geneve.cpp b/src/mame/drivers/geneve.cpp index ce0285bdd7c..0913d3a5477 100644 --- a/src/mame/drivers/geneve.cpp +++ b/src/mame/drivers/geneve.cpp @@ -222,6 +222,13 @@ public: { } + void geneve_common(machine_config &config); + void geneve(machine_config &config); + void genmod(machine_config &config); + + void init_geneve(); + +private: // CRU (Communication Register Unit) handling DECLARE_READ8_MEMBER(cruread); DECLARE_WRITE8_MEMBER(cruwrite); @@ -256,7 +263,6 @@ public: DECLARE_WRITE_LINE_MEMBER( ext_ready ); DECLARE_WRITE_LINE_MEMBER( mapper_ready ); - void init_geneve(); virtual void machine_start() override; virtual void machine_reset() override; @@ -270,9 +276,6 @@ public: int m_ready_line; int m_ready_line1; - void geneve_common(machine_config &config); - void geneve(machine_config &config); - void genmod(machine_config &config); void crumap(address_map &map); void memmap(address_map &map); diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp index c02baeb4ecc..972567befd0 100644 --- a/src/mame/drivers/geniusiq.cpp +++ b/src/mame/drivers/geniusiq.cpp @@ -167,14 +167,6 @@ PCB - German Version: class geniusiq_state : public driver_device { public: - enum - { - IQ128_ROM_CART = 0x00, - IQ128_ROMLESS1_CART = 0x01, - IQ128_ROMLESS2_CART = 0x02, - IQ128_NO_CART = 0x03 - }; - geniusiq_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), @@ -185,6 +177,21 @@ public: m_cart_state(IQ128_NO_CART) { } + void iqtv512(machine_config &config); + void iq128(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(send_input); + DECLARE_INPUT_CHANGED_MEMBER(send_mouse_input); + +private: + enum + { + IQ128_ROM_CART = 0x00, + IQ128_ROMLESS1_CART = 0x01, + IQ128_ROMLESS2_CART = 0x02, + IQ128_NO_CART = 0x03 + }; + required_device<cpu_device> m_maincpu; required_device<generic_slot_device> m_cart; required_region_ptr<uint16_t> m_rom; @@ -198,8 +205,6 @@ public: DECLARE_READ16_MEMBER(input_r); DECLARE_WRITE16_MEMBER(mouse_pos_w); - DECLARE_INPUT_CHANGED_MEMBER(send_input); - DECLARE_INPUT_CHANGED_MEMBER(send_mouse_input); DECLARE_WRITE16_MEMBER(gfx_base_w); DECLARE_WRITE16_MEMBER(gfx_dest_w); DECLARE_WRITE16_MEMBER(gfx_color_w); @@ -212,10 +217,8 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER( iq128_cart ); DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( iq128_cart ); - void iqtv512(machine_config &config); - void iq128(machine_config &config); void geniusiq_mem(address_map &map); -private: + uint16_t m_gfx_y; uint16_t m_gfx_x; uint32_t m_gfx_base; diff --git a/src/mame/drivers/genpc.cpp b/src/mame/drivers/genpc.cpp index 326d8060398..ba0e77c2f39 100644 --- a/src/mame/drivers/genpc.cpp +++ b/src/mame/drivers/genpc.cpp @@ -22,7 +22,6 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } - required_device<cpu_device> m_maincpu; void pcega(machine_config &config); void pcvga(machine_config &config); void pccga(machine_config &config); @@ -30,6 +29,9 @@ public: void pcmda(machine_config &config); void pc8_io(address_map &map); void pc8_map(address_map &map); + +private: + required_device<cpu_device> m_maincpu; }; void genpc_state::pc8_map(address_map &map) diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp index 95bed40b3b4..94ddd0f3338 100644 --- a/src/mame/drivers/ggconnie.cpp +++ b/src/mame/drivers/ggconnie.cpp @@ -40,14 +40,14 @@ public: , m_oki(*this, "oki") { } + void ggconnie(machine_config &config); + +private: DECLARE_WRITE8_MEMBER(lamp_w); DECLARE_WRITE8_MEMBER(output_w); DECLARE_WRITE8_MEMBER(oki_bank_w); - void ggconnie(machine_config &config); - void sgx_io(address_map &map); void sgx_mem(address_map &map); -private: required_device <msm6242_device> m_rtc; required_device <okim6295_device> m_oki; }; diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp index e7707d5e60e..f63b608a318 100644 --- a/src/mame/drivers/ghosteo.cpp +++ b/src/mame/drivers/ghosteo.cpp @@ -99,6 +99,14 @@ public: { } + void ghosteo(machine_config &config); + void touryuu(machine_config &config); + void bballoon(machine_config &config); + + void init_touryuu(); + void init_bballoon(); + +private: required_device<cpu_device> m_maincpu; required_device<i2cmem_device> m_i2cmem; required_device<s3c2410_device> m_s3c2410; @@ -117,8 +125,6 @@ public: DECLARE_WRITE8_MEMBER(qs1000_p3_w); int m_rom_pagesize; - void init_touryuu(); - void init_bballoon(); virtual void machine_start() override; virtual void machine_reset() override; DECLARE_READ32_MEMBER(s3c2410_gpio_port_r); @@ -131,9 +137,6 @@ public: DECLARE_WRITE_LINE_MEMBER(s3c2410_i2c_scl_w ); DECLARE_READ_LINE_MEMBER(s3c2410_i2c_sda_r ); DECLARE_WRITE_LINE_MEMBER(s3c2410_i2c_sda_w ); - void ghosteo(machine_config &config); - void touryuu(machine_config &config); - void bballoon(machine_config &config); void bballoon_map(address_map &map); void touryuu_map(address_map &map); }; diff --git a/src/mame/drivers/giclassic.cpp b/src/mame/drivers/giclassic.cpp index 1fc38437f3f..1391bbd5c24 100644 --- a/src/mame/drivers/giclassic.cpp +++ b/src/mame/drivers/giclassic.cpp @@ -64,6 +64,9 @@ public: m_palette(*this, "palette") { } + void giclassic(machine_config &config); + +private: required_device<cpu_device> m_maincpu; required_device<k056832_device> m_k056832; required_device<palette_device> m_palette; @@ -81,9 +84,8 @@ public: DECLARE_WRITE16_MEMBER(control_w); DECLARE_READ16_MEMBER(vrom_r); - void giclassic(machine_config &config); void satellite_main(address_map &map); -private: + uint8_t m_control; }; diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp index d876b075d15..9cb7cf0f043 100644 --- a/src/mame/drivers/gimix.cpp +++ b/src/mame/drivers/gimix.cpp @@ -98,6 +98,11 @@ public: , m_dma_dip(*this, "dma_s2") {} + void gimix(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(drive_size_cb); + +private: DECLARE_WRITE8_MEMBER(system_w); DECLARE_WRITE_LINE_MEMBER(irq_w); DECLARE_WRITE_LINE_MEMBER(fdc_irq_w); @@ -111,14 +116,12 @@ public: DECLARE_READ8_MEMBER(pia_pb_r); DECLARE_WRITE8_MEMBER(pia_pb_w); TIMER_DEVICE_CALLBACK_MEMBER(test_timer_w); - DECLARE_INPUT_CHANGED_MEMBER(drive_size_cb); DECLARE_FLOPPY_FORMATS(floppy_formats); - void gimix(machine_config &config); void gimix_banked_mem(address_map &map); void gimix_mem(address_map &map); -private: + uint8_t m_term_data; uint8_t m_dma_status; uint8_t m_dma_ctrl; diff --git a/src/mame/drivers/gizmondo.cpp b/src/mame/drivers/gizmondo.cpp index d357d8102be..f80098736aa 100644 --- a/src/mame/drivers/gizmondo.cpp +++ b/src/mame/drivers/gizmondo.cpp @@ -53,12 +53,17 @@ public: m_gf4500(*this, "gf4500") { } + void gizmondo(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(port_changed); + + void init_gizmondo(); + +private: uint32_t m_port[9]; required_device<s3c2440_device> m_s3c2440; - void init_gizmondo(); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_INPUT_CHANGED_MEMBER(port_changed); inline void verboselog(int n_level, const char *s_fmt, ...) ATTR_PRINTF(3,4); required_device<cpu_device> m_maincpu; required_device<gf4500_device> m_gf4500; @@ -66,7 +71,6 @@ public: DECLARE_WRITE32_MEMBER(s3c2440_gpio_port_w); bitmap_rgb32 m_bitmap; - void gizmondo(machine_config &config); void gizmondo_map(address_map &map); }; diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp index d47c9322205..052c6e23d89 100644 --- a/src/mame/drivers/gkigt.cpp +++ b/src/mame/drivers/gkigt.cpp @@ -114,7 +114,10 @@ public: m_quart1(*this, "quart1") { } + void igt_gameking(machine_config &config); + void igt_ms72c(machine_config &config); +private: virtual void video_start() override; uint32_t screen_update_igt_gameking(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -138,12 +141,10 @@ public: DECLARE_READ8_MEMBER(timer_r); DECLARE_READ16_MEMBER(version_r); - void igt_gameking(machine_config &config); - void igt_ms72c(machine_config &config); void igt_gameking_map(address_map &map); void igt_ms72c_map(address_map &map); void ramdac_map(address_map &map); -private: + required_device<cpu_device> m_maincpu; required_device<palette_device> m_palette; required_device<screen_device> m_screen; diff --git a/src/mame/drivers/globalfr.cpp b/src/mame/drivers/globalfr.cpp index 82b8feb017e..efe6a2fe754 100644 --- a/src/mame/drivers/globalfr.cpp +++ b/src/mame/drivers/globalfr.cpp @@ -30,6 +30,9 @@ public: m_vfd(*this, "vfd") { } + void globalfr(machine_config &config); + +private: required_device<cpu_device> m_maincpu; optional_device<s16lf01_device> m_vfd; @@ -37,7 +40,6 @@ public: DECLARE_WRITE16_MEMBER(vfd_w); - void globalfr(machine_config &config); void globalfr_map(address_map &map); }; diff --git a/src/mame/drivers/globalvr.cpp b/src/mame/drivers/globalvr.cpp index 69d785f7267..a85b4201d3f 100644 --- a/src/mame/drivers/globalvr.cpp +++ b/src/mame/drivers/globalvr.cpp @@ -69,7 +69,7 @@ public: void globalvr(machine_config &config); void globalvr_map(address_map &map); -protected: +private: // devices required_device<cpu_device> m_maincpu; diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp index 30b96bdf874..aa6f886776e 100644 --- a/src/mame/drivers/gluck2.cpp +++ b/src/mame/drivers/gluck2.cpp @@ -214,6 +214,9 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram") { } + void gluck2(machine_config &config); + +private: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; @@ -230,7 +233,6 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void gluck2(machine_config &config); void gluck2_map(address_map &map); }; diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp index e5bdc0d7875..b99ac40a926 100644 --- a/src/mame/drivers/gmaster.cpp +++ b/src/mame/drivers/gmaster.cpp @@ -29,6 +29,11 @@ public: , m_cart(*this, "cartslot") { } + void gmaster(machine_config &config); + + void init_gmaster() { memset(&m_video, 0, sizeof(m_video)); memset(m_ram, 0, sizeof(m_ram)); } + +private: DECLARE_PALETTE_INIT(gmaster); DECLARE_READ8_MEMBER(gmaster_io_r); DECLARE_WRITE8_MEMBER(gmaster_io_w); @@ -41,12 +46,9 @@ public: DECLARE_WRITE8_MEMBER(gmaster_portc_w); DECLARE_WRITE8_MEMBER(gmaster_portd_w); DECLARE_WRITE8_MEMBER(gmaster_portf_w); - void init_gmaster() { memset(&m_video, 0, sizeof(m_video)); memset(m_ram, 0, sizeof(m_ram)); } uint32_t screen_update_gmaster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void gmaster(machine_config &config); void gmaster_mem(address_map &map); -private: virtual void machine_start() override; struct diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp index e3f90597151..881280d7a13 100644 --- a/src/mame/drivers/go2000.cpp +++ b/src/mame/drivers/go2000.cpp @@ -56,6 +56,9 @@ public: m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch") { } + void go2000(machine_config &config); + +private: /* memory pointers */ required_shared_ptr<uint16_t> m_videoram; required_shared_ptr<uint16_t> m_videoram2; @@ -73,7 +76,6 @@ public: virtual void machine_start() override; virtual void video_start() override; uint32_t screen_update_go2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void go2000(machine_config &config); void go2000_map(address_map &map); void go2000_sound_io(address_map &map); void go2000_sound_map(address_map &map); diff --git a/src/mame/drivers/gokidetor.cpp b/src/mame/drivers/gokidetor.cpp index b82ee741131..0c7d663bbf0 100644 --- a/src/mame/drivers/gokidetor.cpp +++ b/src/mame/drivers/gokidetor.cpp @@ -25,6 +25,9 @@ public: , m_maincpu(*this, "maincpu") { } + void gokidetor(machine_config &config); + +private: DECLARE_WRITE8_MEMBER(out4_w); DECLARE_WRITE8_MEMBER(out5_w); DECLARE_WRITE8_MEMBER(out6_w); @@ -33,13 +36,11 @@ public: DECLARE_WRITE8_MEMBER(out9_w); DECLARE_WRITE8_MEMBER(ym_porta_w); - void gokidetor(machine_config &config); void main_map(address_map &map); void sound_map(address_map &map); -protected: + virtual void machine_start() override; -private: required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/goldngam.cpp b/src/mame/drivers/goldngam.cpp index 9bec3298129..05e13267b3d 100644 --- a/src/mame/drivers/goldngam.cpp +++ b/src/mame/drivers/goldngam.cpp @@ -247,9 +247,6 @@ class goldngam_state : public driver_device { - static constexpr int MOVIECRD_DUART1_IRQ = M68K_IRQ_2; - static constexpr int MOVIECRD_DUART2_IRQ = M68K_IRQ_4; - public: goldngam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), @@ -260,6 +257,9 @@ public: void swisspkr(machine_config &config); void moviecrd(machine_config &config); private: + static constexpr int MOVIECRD_DUART1_IRQ = M68K_IRQ_2; + static constexpr int MOVIECRD_DUART2_IRQ = M68K_IRQ_4; + DECLARE_READ8_MEMBER(unk_r); virtual void video_start() override; DECLARE_PALETTE_INIT(goldngam); diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index 8e3210db770..60e4be4ae95 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -1299,9 +1299,9 @@ class goldnpkr_state : public driver_device public: goldnpkr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_maincpu(*this, "maincpu"), m_discrete(*this, "discrete"), m_ay8910(*this, "ay8910"), m_gfxdecode(*this, "gfxdecode"), @@ -1309,23 +1309,19 @@ public: m_lamps(*this, "lamp%u", 0U) { } - DECLARE_WRITE8_MEMBER(goldnpkr_videoram_w); - DECLARE_WRITE8_MEMBER(goldnpkr_colorram_w); - DECLARE_READ8_MEMBER(goldnpkr_mux_port_r); - DECLARE_READ8_MEMBER(pottnpkr_mux_port_r); - DECLARE_WRITE8_MEMBER(mux_w); - DECLARE_WRITE8_MEMBER(mux_port_w); - DECLARE_WRITE8_MEMBER(wcfalcon_snd_w); - DECLARE_WRITE8_MEMBER(lamps_a_w); - DECLARE_WRITE8_MEMBER(sound_w); - DECLARE_WRITE8_MEMBER(pia0_a_w); - DECLARE_WRITE8_MEMBER(pia0_b_w); - DECLARE_WRITE8_MEMBER(pia1_a_w); - DECLARE_WRITE8_MEMBER(pia1_b_w); - DECLARE_READ8_MEMBER(pia0_a_r); - DECLARE_READ8_MEMBER(pia0_b_r); - DECLARE_READ8_MEMBER(pia1_a_r); - DECLARE_READ8_MEMBER(pia1_b_r); + void goldnpkr_base(machine_config &config); + void wildcard(machine_config &config); + void wildcrdb(machine_config &config); + void witchcrd(machine_config &config); + void mondial(machine_config &config); + void bchancep(machine_config &config); + void wcfalcon(machine_config &config); + void geniea(machine_config &config); + void genie(machine_config &config); + void pottnpkr(machine_config &config); + void goldnpkr(machine_config &config); + void wcrdxtnd(machine_config &config); + void init_vkdlswwh(); void init_icp1db(); void init_flcnw(); @@ -1346,29 +1342,44 @@ public: void init_vkdlswwr(); void init_vkdlswwv(); void init_bchancep(); + + DECLARE_READ8_MEMBER(pottnpkr_mux_port_r); + DECLARE_WRITE8_MEMBER(lamps_a_w); + DECLARE_WRITE8_MEMBER(sound_w); + DECLARE_WRITE8_MEMBER(mux_w); + + DECLARE_PALETTE_INIT(witchcrd); + + uint32_t screen_update_goldnpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + +protected: + required_device<cpu_device> m_maincpu; + + DECLARE_WRITE8_MEMBER(goldnpkr_videoram_w); + DECLARE_WRITE8_MEMBER(goldnpkr_colorram_w); + +private: + DECLARE_READ8_MEMBER(goldnpkr_mux_port_r); + DECLARE_WRITE8_MEMBER(mux_port_w); + DECLARE_WRITE8_MEMBER(wcfalcon_snd_w); + DECLARE_WRITE8_MEMBER(pia0_a_w); + DECLARE_WRITE8_MEMBER(pia0_b_w); + DECLARE_WRITE8_MEMBER(pia1_a_w); + DECLARE_WRITE8_MEMBER(pia1_b_w); + DECLARE_READ8_MEMBER(pia0_a_r); + DECLARE_READ8_MEMBER(pia0_b_r); + DECLARE_READ8_MEMBER(pia1_a_r); + DECLARE_READ8_MEMBER(pia1_b_r); + TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(wcrdxtnd_get_bg_tile_info); virtual void video_start() override; DECLARE_PALETTE_INIT(goldnpkr); - DECLARE_PALETTE_INIT(witchcrd); DECLARE_VIDEO_START(wcrdxtnd); DECLARE_PALETTE_INIT(wcrdxtnd); DECLARE_MACHINE_START(mondial); DECLARE_MACHINE_RESET(mondial); - uint32_t screen_update_goldnpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void goldnpkr_base(machine_config &config); - void wildcard(machine_config &config); - void wildcrdb(machine_config &config); - void witchcrd(machine_config &config); - void mondial(machine_config &config); - void bchancep(machine_config &config); - void wcfalcon(machine_config &config); - void geniea(machine_config &config); - void genie(machine_config &config); - void pottnpkr(machine_config &config); - void goldnpkr(machine_config &config); - void wcrdxtnd(machine_config &config); void bchancep_map(address_map &map); void genie_map(address_map &map); void goldnpkr_map(address_map &map); @@ -1382,13 +1393,11 @@ public: void witchcrd_falcon_map(address_map &map); void witchcrd_map(address_map &map); -protected: virtual void machine_start() override { m_lamps.resolve(); } required_shared_ptr<uint8_t> m_videoram; required_shared_ptr<uint8_t> m_colorram; - required_device<cpu_device> m_maincpu; optional_device<discrete_device> m_discrete; optional_device<ay8910_device> m_ay8910; required_device<gfxdecode_device> m_gfxdecode; @@ -1412,15 +1421,16 @@ public: m_portc_data(0x0f) { } + void megadpkr(machine_config &config); + +private: DECLARE_READ8_MEMBER(cpubank_decrypt_r); DECLARE_WRITE8_MEMBER(mcu_command_w); DECLARE_WRITE8_MEMBER(mcu_portb_w); DECLARE_WRITE8_MEMBER(mcu_portc_w); - void megadpkr(machine_config &config); void megadpkr_banked_map(address_map &map); void megadpkr_map(address_map &map); -private: required_region_ptr<uint8_t> m_cpubank; required_device<m68705p_device> m_mcu; diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp index c95d7ba0c0d..15516836133 100644 --- a/src/mame/drivers/good.cpp +++ b/src/mame/drivers/good.cpp @@ -52,6 +52,9 @@ public: { } + void good(machine_config &config); + +private: /* memory pointers */ required_shared_ptr<uint16_t> m_fg_tilemapram; required_shared_ptr<uint16_t> m_bg_tilemapram; @@ -68,7 +71,6 @@ public: uint32_t screen_update_good(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; - void good(machine_config &config); void good_map(address_map &map); }; diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp index f91567554bb..b582ddbe1a6 100644 --- a/src/mame/drivers/goodejan.cpp +++ b/src/mame/drivers/goodejan.cpp @@ -97,6 +97,10 @@ public: m_sc3_vram(*this, "sc3_vram"), m_spriteram16(*this, "sprite_ram") { } + void totmejan(machine_config &config); + void goodejan(machine_config &config); + +private: required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; @@ -139,8 +143,6 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri); virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void totmejan(machine_config &config); - void goodejan(machine_config &config); void common_io_map(address_map &map); void goodejan_io_map(address_map &map); void goodejan_map(address_map &map); diff --git a/src/mame/drivers/gp2x.cpp b/src/mame/drivers/gp2x.cpp index 20fc43bf507..d92c64215f7 100644 --- a/src/mame/drivers/gp2x.cpp +++ b/src/mame/drivers/gp2x.cpp @@ -35,6 +35,9 @@ public: m_maincpu_region(*this, "maincpu"), m_ram(*this, "ram"){ } + void gp2x(machine_config &config); + +private: required_device<cpu_device> m_maincpu; required_region_ptr<uint32_t> m_maincpu_region; DECLARE_READ32_MEMBER(gp2x_lcdc_r); @@ -56,7 +59,6 @@ public: uint32_t m_nand_ptr_temp; uint32_t m_timer; uint32_t screen_update_gp2x(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - void gp2x(machine_config &config); void gp2x_map(address_map &map); }; diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp index 7b9c91b54ba..4c97a07e8e4 100644 --- a/src/mame/drivers/gp_1.cpp +++ b/src/mame/drivers/gp_1.cpp @@ -52,17 +52,20 @@ public: , m_digits(*this, "digit%u", 0U) { } + void gp_1(machine_config &config); + void gp_1s(machine_config &config); + void init_gp_1(); + +private: DECLARE_WRITE8_MEMBER(porta_w); DECLARE_WRITE8_MEMBER(portas_w); DECLARE_WRITE8_MEMBER(portc_w); DECLARE_READ8_MEMBER(portb_r); TIMER_DEVICE_CALLBACK_MEMBER(zero_timer); - void gp_1(machine_config &config); - void gp_1s(machine_config &config); void gp_1_io(address_map &map); void gp_1_map(address_map &map); -private: + uint8_t m_u14; uint8_t m_digit; uint8_t m_segment[16]; diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp index d3ba29e39b8..2460596b0a5 100644 --- a/src/mame/drivers/gp_2.cpp +++ b/src/mame/drivers/gp_2.cpp @@ -61,15 +61,18 @@ public: , m_digits(*this, "digit%u", 0U) { } + void gp_2(machine_config &config); + void init_gp_2(); + +private: DECLARE_WRITE8_MEMBER(porta_w); DECLARE_WRITE8_MEMBER(portc_w); DECLARE_READ8_MEMBER(portb_r); TIMER_DEVICE_CALLBACK_MEMBER(zero_timer); - void gp_2(machine_config &config); void gp_2_io(address_map &map); void gp_2_map(address_map &map); -private: + uint8_t m_u14; uint8_t m_digit; uint8_t m_segment[16]; diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp index a5943b97727..f3d7b1a5ab7 100644 --- a/src/mame/drivers/gpworld.cpp +++ b/src/mame/drivers/gpworld.cpp @@ -66,6 +66,11 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void gpworld(machine_config &config); + + void init_gpworld(); + +private: uint8_t m_nmi_enable; uint8_t m_start_lamp; uint8_t m_ldp_read_latch; @@ -82,7 +87,6 @@ public: DECLARE_WRITE8_MEMBER(misc_io_write); DECLARE_WRITE8_MEMBER(brake_gas_write); DECLARE_WRITE8_MEMBER(palette_write); - void init_gpworld(); virtual void machine_start() override; uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_callback); @@ -93,10 +97,9 @@ public: required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - void gpworld(machine_config &config); void mainmem(address_map &map); void mainport(address_map &map); -protected: + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp index 81b1c036428..967a1a1161a 100644 --- a/src/mame/drivers/grfd2301.cpp +++ b/src/mame/drivers/grfd2301.cpp @@ -46,12 +46,14 @@ public: , m_p_chargen(*this, "chargen") { } + void grfd2301(machine_config &config); + +private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void grfd2301(machine_config &config); void io_map(address_map &map); void mem_map(address_map &map); -private: + virtual void machine_reset() override; required_shared_ptr<uint8_t> m_p_videoram; required_device<cpu_device> m_maincpu; diff --git a/src/mame/drivers/gridcomp.cpp b/src/mame/drivers/gridcomp.cpp index 5314bd2a4a2..f784ba8f1ea 100644 --- a/src/mame/drivers/gridcomp.cpp +++ b/src/mame/drivers/gridcomp.cpp @@ -111,6 +111,16 @@ public: , m_ram(*this, RAM_TAG) { } + void grid1129(machine_config &config); + void grid1131(machine_config &config); + void grid1121(machine_config &config); + void grid1139(machine_config &config); + void grid1109(machine_config &config); + void grid1101(machine_config &config); + + void init_gridcomp(); + +private: required_device<cpu_device> m_maincpu; required_device<i80130_device> m_osp; required_device<i8255_device> m_modem; @@ -118,7 +128,6 @@ public: required_device<speaker_sound_device> m_speaker; required_device<ram_device> m_ram; - void init_gridcomp(); DECLARE_MACHINE_START(gridcomp); DECLARE_MACHINE_RESET(gridcomp); @@ -136,16 +145,10 @@ public: void kbd_put(u16 data); - void grid1129(machine_config &config); - void grid1131(machine_config &config); - void grid1121(machine_config &config); - void grid1139(machine_config &config); - void grid1109(machine_config &config); - void grid1101(machine_config &config); void grid1101_io(address_map &map); void grid1101_map(address_map &map); void grid1121_map(address_map &map); -private: + bool m_kbd_ready; uint16_t m_kbd_data; diff --git a/src/mame/drivers/gstream.cpp b/src/mame/drivers/gstream.cpp index 10fe8c0aab2..de502ce603b 100644 --- a/src/mame/drivers/gstream.cpp +++ b/src/mame/drivers/gstream.cpp @@ -155,6 +155,17 @@ public: m_toggle = 0; } + void x2222(machine_config &config); + void gstream(machine_config &config); + + void init_gstream(); + void init_x2222(); + + DECLARE_CUSTOM_INPUT_MEMBER(gstream_mirror_service_r); + DECLARE_CUSTOM_INPUT_MEMBER(gstream_mirror_r); + DECLARE_CUSTOM_INPUT_MEMBER(x2222_toggle_r); + +private: /* devices */ required_device<e132xt_device> m_maincpu; optional_device_array<okim6295_device, 2> m_oki; @@ -182,11 +193,6 @@ public: DECLARE_READ32_MEMBER(gstream_speedup_r); DECLARE_READ32_MEMBER(x2222_speedup_r); DECLARE_READ32_MEMBER(x2222_speedup2_r); - DECLARE_CUSTOM_INPUT_MEMBER(gstream_mirror_service_r); - DECLARE_CUSTOM_INPUT_MEMBER(gstream_mirror_r); - DECLARE_CUSTOM_INPUT_MEMBER(x2222_toggle_r); - void init_gstream(); - void init_x2222(); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; @@ -200,8 +206,6 @@ public: required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; - void x2222(machine_config &config); - void gstream(machine_config &config); void gstream_32bit_map(address_map &map); void gstream_io(address_map &map); void x2222_32bit_map(address_map &map); diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp index 0e1f43c9a44..f7fab557739 100644 --- a/src/mame/drivers/gticlub.cpp +++ b/src/mame/drivers/gticlub.cpp @@ -273,7 +273,17 @@ public: { } + void thunderh(machine_config &config); + void hangplt(machine_config &config); + void slrasslt(machine_config &config); + void gticlub(machine_config &config); + + void init_hangplt_common(); + void init_hangplt(); + void init_hangpltu(); + void init_gticlub(); +private: // TODO: Needs verification on real hardware static const int m_sound_timer_usec = 2400; @@ -320,10 +330,6 @@ public: DECLARE_WRITE16_MEMBER(soundtimer_en_w); DECLARE_WRITE16_MEMBER(soundtimer_count_w); - void init_hangplt_common(); - void init_hangplt(); - void init_hangpltu(); - void init_gticlub(); DECLARE_MACHINE_START(gticlub); DECLARE_MACHINE_RESET(gticlub); DECLARE_MACHINE_RESET(hangplt); @@ -337,17 +343,13 @@ public: uint32_t screen_update_lscreen(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_rscreen(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - void thunderh(machine_config &config); - void hangplt(machine_config &config); - void slrasslt(machine_config &config); - void gticlub(machine_config &config); void gticlub_map(address_map &map); void hangplt_map(address_map &map); void hangplt_sharc0_map(address_map &map); void hangplt_sharc1_map(address_map &map); void sharc_map(address_map &map); void sound_memmap(address_map &map); -private: + void gticlub_led_setreg(int offset, uint8_t data); uint8_t m_gticlub_led_reg[2]; diff --git a/src/mame/drivers/gts1.cpp b/src/mame/drivers/gts1.cpp index c29117b2465..1d83ccd32ce 100644 --- a/src/mame/drivers/gts1.cpp +++ b/src/mame/drivers/gts1.cpp @@ -92,7 +92,7 @@ public: void gts1(machine_config &config); -protected: +private: DECLARE_READ8_MEMBER (gts1_solenoid_r); DECLARE_WRITE8_MEMBER(gts1_solenoid_w); DECLARE_READ8_MEMBER (gts1_switches_r); @@ -114,7 +114,6 @@ protected: void gts1_data(address_map &map); void gts1_io(address_map &map); -private: required_device<cpu_device> m_maincpu; required_ioport_array<3> m_dips; required_ioport_array<5> m_switches; diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp index 28e5ae51691..118e847eb47 100644 --- a/src/mame/drivers/gts3.cpp +++ b/src/mame/drivers/gts3.cpp @@ -48,16 +48,20 @@ public: , m_digits(*this, "digit%u", 0U) { } + void gts3(machine_config &config); + void init_gts3(); + + DECLARE_INPUT_CHANGED_MEMBER(test_inp); + +private: DECLARE_WRITE8_MEMBER(segbank_w); DECLARE_READ8_MEMBER(u4a_r); DECLARE_READ8_MEMBER(u4b_r); DECLARE_WRITE8_MEMBER(u4b_w); DECLARE_WRITE_LINE_MEMBER(nmi_w); - DECLARE_INPUT_CHANGED_MEMBER(test_inp); - void gts3(machine_config &config); void gts3_map(address_map &map); -private: + bool m_dispclk; bool m_lampclk; uint8_t m_digit; diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp index 14e2b649a63..7381d4c723f 100644 --- a/src/mame/drivers/gts3a.cpp +++ b/src/mame/drivers/gts3a.cpp @@ -42,7 +42,13 @@ public: , m_digits(*this, "digit%u", 0U) { } + void gts3a(machine_config &config); + void init_gts3a(); + + DECLARE_INPUT_CHANGED_MEMBER(test_inp); + +private: DECLARE_WRITE8_MEMBER(segbank_w); DECLARE_READ8_MEMBER(u4a_r); DECLARE_READ8_MEMBER(u4b_r); @@ -50,14 +56,12 @@ public: DECLARE_READ8_MEMBER(dmd_r); DECLARE_WRITE8_MEMBER(dmd_w); DECLARE_WRITE_LINE_MEMBER(nmi_w); - DECLARE_INPUT_CHANGED_MEMBER(test_inp); MC6845_UPDATE_ROW(crtc_update_row); DECLARE_PALETTE_INIT(gts3a); required_device<palette_device> m_palette; - void gts3a(machine_config &config); void gts3a_dmd_map(address_map &map); void gts3a_map(address_map &map); -private: + bool m_dispclk; bool m_lampclk; uint8_t m_digit; diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp index 97f3dde44fc..49a32b8a495 100644 --- a/src/mame/drivers/gts80.cpp +++ b/src/mame/drivers/gts80.cpp @@ -41,7 +41,14 @@ public: , m_digits(*this, "digit%u", 0U) { } + void gts80(machine_config &config); + void gts80_ss(machine_config &config); + void gts80_s(machine_config &config); + void gts80_hh(machine_config &config); + void init_gts80(); + +private: DECLARE_READ8_MEMBER(port1a_r); DECLARE_READ8_MEMBER(port2a_r); DECLARE_WRITE8_MEMBER(port1b_w); @@ -49,12 +56,8 @@ public: DECLARE_WRITE8_MEMBER(port2b_w); DECLARE_WRITE8_MEMBER(port3a_w); DECLARE_WRITE8_MEMBER(port3b_w); - void gts80(machine_config &config); - void gts80_ss(machine_config &config); - void gts80_s(machine_config &config); - void gts80_hh(machine_config &config); void gts80_map(address_map &map); -private: + uint8_t m_port2; uint8_t m_segment; uint8_t m_lamprow; diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp index 44c1001934e..02b028950e7 100644 --- a/src/mame/drivers/gts80a.cpp +++ b/src/mame/drivers/gts80a.cpp @@ -33,7 +33,13 @@ public: , m_digits(*this, "digit%u", 0U) { } + void gts80a(machine_config &config); + void gts80a_s(machine_config &config); + void gts80a_ss(machine_config &config); + void init_gts80a(); + +private: DECLARE_READ8_MEMBER(port1a_r); DECLARE_READ8_MEMBER(port2a_r); DECLARE_WRITE8_MEMBER(port1b_w); @@ -41,11 +47,8 @@ public: DECLARE_WRITE8_MEMBER(port2b_w); DECLARE_WRITE8_MEMBER(port3a_w); DECLARE_WRITE8_MEMBER(port3b_w); - void gts80a(machine_config &config); - void gts80a_s(machine_config &config); - void gts80a_ss(machine_config &config); void gts80a_map(address_map &map); -private: + uint8_t m_port2; uint8_t m_segment; uint8_t m_lamprow; diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp index 5c052239ba6..e8cc0c3bddf 100644 --- a/src/mame/drivers/gts80b.cpp +++ b/src/mame/drivers/gts80b.cpp @@ -34,7 +34,16 @@ public: , m_digits(*this, "digit%u", 0U) { } + void gts80b_s2(machine_config &config); + void gts80b_s3(machine_config &config); + void bonebstr(machine_config &config); + void gts80b_s1(machine_config &config); + void gts80b_s(machine_config &config); + void gts80b(machine_config &config); + void init_gts80b(); + +private: DECLARE_READ8_MEMBER(port1a_r); DECLARE_READ8_MEMBER(port2a_r); DECLARE_WRITE8_MEMBER(port1b_w); @@ -42,14 +51,8 @@ public: DECLARE_WRITE8_MEMBER(port2b_w); DECLARE_WRITE8_MEMBER(port3a_w); DECLARE_WRITE8_MEMBER(port3b_w); - void gts80b_s2(machine_config &config); - void gts80b_s3(machine_config &config); - void bonebstr(machine_config &config); - void gts80b_s1(machine_config &config); - void gts80b_s(machine_config &config); - void gts80b(machine_config &config); void gts80b_map(address_map &map); -private: + uint8_t m_dispcmd; uint8_t m_port2a; uint8_t m_port2b; diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp index 8104de2f956..eb057f4fdc9 100644 --- a/src/mame/drivers/guab.cpp +++ b/src/mame/drivers/guab.cpp @@ -82,6 +82,11 @@ public: m_sound_buffer(0), m_sound_latch(false) { } + void guab(machine_config &config); + + DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); + +private: EF9369_COLOR_UPDATE(ef9369_color_update); DECLARE_WRITE16_MEMBER(tms34061_w); DECLARE_READ16_MEMBER(tms34061_r); @@ -99,16 +104,14 @@ public: DECLARE_READ8_MEMBER(watchdog_r); DECLARE_WRITE8_MEMBER(watchdog_w); - DECLARE_INPUT_CHANGED_MEMBER(coin_inserted); DECLARE_FLOPPY_FORMATS(floppy_formats); - void guab(machine_config &config); void guab_map(address_map &map); -protected: + virtual void machine_start() override; -private: + required_device<cpu_device> m_maincpu; required_device<tms34061_device> m_tms34061; required_device<sn76489_device> m_sn; |