From d9bc46556f0ad968268fa0af83b7f24b59f9b3e2 Mon Sep 17 00:00:00 2001 From: David Haywood Date: Wed, 27 Jun 2018 22:39:14 +0100 Subject: move more stuff behind private: (Part H, I, J) (nw) (#3707) * move more stuff behind private: (Part H) (nw) * I & J (nw) --- src/mame/drivers/h19.cpp | 6 ++-- src/mame/drivers/h8.cpp | 6 ++-- src/mame/drivers/h89.cpp | 4 ++- src/mame/drivers/halleys.cpp | 13 +++++--- src/mame/drivers/hankin.cpp | 3 +- src/mame/drivers/hapyfish.cpp | 4 ++- src/mame/drivers/harddriv.cpp | 15 +++++---- src/mame/drivers/harriet.cpp | 2 +- src/mame/drivers/hazelgr.cpp | 4 ++- src/mame/drivers/hazeltin.cpp | 6 ++-- src/mame/drivers/headonb.cpp | 4 ++- src/mame/drivers/hh_amis2k.cpp | 3 +- src/mame/drivers/hideseek.cpp | 7 ++-- src/mame/drivers/highvdeo.cpp | 25 ++++++++------ src/mame/drivers/hikaru.cpp | 5 ++- src/mame/drivers/hitpoker.cpp | 7 ++-- src/mame/drivers/hk68v10.cpp | 70 +++++++++++++++++++-------------------- src/mame/drivers/homelab.cpp | 16 +++++---- src/mame/drivers/homez80.cpp | 7 ++-- src/mame/drivers/horizon.cpp | 8 +++-- src/mame/drivers/hornet.cpp | 23 +++++++------ src/mame/drivers/hotblock.cpp | 4 ++- src/mame/drivers/hotstuff.cpp | 4 ++- src/mame/drivers/hp16500.cpp | 12 ++++--- src/mame/drivers/hp2620.cpp | 6 ++-- src/mame/drivers/hp2640.cpp | 6 ++-- src/mame/drivers/hp49gp.cpp | 10 ++++-- src/mame/drivers/hp64k.cpp | 6 ++-- src/mame/drivers/hp700.cpp | 3 +- src/mame/drivers/hp80.cpp | 6 ++-- src/mame/drivers/hp9845.cpp | 19 +++++++---- src/mame/drivers/hp9k.cpp | 25 +++++++------- src/mame/drivers/hp9k_3xx.cpp | 24 ++++++-------- src/mame/drivers/hp_ipc.cpp | 11 +++--- src/mame/drivers/hprot1.cpp | 13 +++++--- src/mame/drivers/hpz80unk.cpp | 6 ++-- src/mame/drivers/ht6000.cpp | 3 +- src/mame/drivers/ht68k.cpp | 4 ++- src/mame/drivers/hunter2.cpp | 10 ++++-- src/mame/drivers/hvyunit.cpp | 4 ++- src/mame/drivers/hyperscan.cpp | 6 ++-- src/mame/drivers/hyprduel.cpp | 15 +++++---- src/mame/drivers/i7000.cpp | 7 ++-- src/mame/drivers/ibm3153.cpp | 6 ++-- src/mame/drivers/ibm6580.cpp | 6 ++-- src/mame/drivers/ibmpc.cpp | 4 ++- src/mame/drivers/ibmpcjr.cpp | 9 +++-- src/mame/drivers/icatel.cpp | 9 +++-- src/mame/drivers/ice_bozopail.cpp | 4 ++- src/mame/drivers/ice_tbd.cpp | 4 ++- src/mame/drivers/icecold.cpp | 5 ++- src/mame/drivers/ichiban.cpp | 4 ++- src/mame/drivers/idsa.cpp | 8 +++-- src/mame/drivers/ie15.cpp | 4 ++- src/mame/drivers/if800.cpp | 4 ++- src/mame/drivers/igs009.cpp | 15 +++++---- src/mame/drivers/igs_fear.cpp | 6 ++-- src/mame/drivers/igs_m027.cpp | 13 ++++---- src/mame/drivers/igs_m036.cpp | 9 +++-- src/mame/drivers/igspc.cpp | 6 ++-- src/mame/drivers/igspoker.cpp | 45 ++++++++++++++----------- src/mame/drivers/imds.cpp | 3 +- src/mame/drivers/imolagp.cpp | 7 ++-- src/mame/drivers/imsai.cpp | 6 ++-- src/mame/drivers/inder.cpp | 17 ++++++---- src/mame/drivers/inderp.cpp | 6 ++-- src/mame/drivers/indiana.cpp | 6 +++- src/mame/drivers/indigo.cpp | 19 ++++++----- src/mame/drivers/indy_indigo2.cpp | 12 ++++--- src/mame/drivers/instantm.cpp | 6 ++-- src/mame/drivers/instruct.cpp | 7 ++-- src/mame/drivers/inteladv.cpp | 6 ++-- src/mame/drivers/interact.cpp | 7 ++-- src/mame/drivers/intrscti.cpp | 7 ++-- src/mame/drivers/invqix.cpp | 7 ++-- src/mame/drivers/ipc.cpp | 4 ++- src/mame/drivers/ipds.cpp | 4 ++- src/mame/drivers/iqunlim.cpp | 4 ++- src/mame/drivers/iris3130.cpp | 11 +++--- src/mame/drivers/irisha.cpp | 6 ++-- src/mame/drivers/isbc.cpp | 17 +++++----- src/mame/drivers/isbc8010.cpp | 10 +++--- src/mame/drivers/isbc8030.cpp | 4 ++- src/mame/drivers/iskr103x.cpp | 4 ++- src/mame/drivers/itgambl2.cpp | 4 ++- src/mame/drivers/itgambl3.cpp | 4 ++- src/mame/drivers/itgamble.cpp | 7 ++-- src/mame/drivers/itt3030.cpp | 8 ++--- src/mame/drivers/jackie.cpp | 11 +++--- src/mame/drivers/jackpool.cpp | 7 ++-- src/mame/drivers/jade.cpp | 4 ++- src/mame/drivers/jankenmn.cpp | 3 +- src/mame/drivers/jantotsu.cpp | 4 ++- src/mame/drivers/jchan.cpp | 7 ++-- src/mame/drivers/jeutel.cpp | 3 +- src/mame/drivers/joctronic.cpp | 10 +++--- src/mame/drivers/jokrwild.cpp | 7 ++-- src/mame/drivers/jollyjgr.cpp | 6 ++-- src/mame/drivers/jonos.cpp | 6 ++-- src/mame/drivers/joystand.cpp | 4 ++- src/mame/drivers/jp.cpp | 3 +- src/mame/drivers/jpmmps.cpp | 8 +++-- src/mame/drivers/jpms80.cpp | 11 +++--- src/mame/drivers/jpmsru.cpp | 6 ++-- src/mame/drivers/jpmsys7.cpp | 3 +- src/mame/drivers/jr100.cpp | 6 ++-- src/mame/drivers/jr200.cpp | 6 ++-- src/mame/drivers/jrpacman.cpp | 8 +++-- src/mame/drivers/jubilee.cpp | 5 +-- src/mame/drivers/juicebox.cpp | 10 ++++-- src/mame/drivers/jungleyo.cpp | 3 +- src/mame/drivers/junior.cpp | 3 +- src/mame/drivers/junofrst.cpp | 3 +- src/mame/drivers/jupace.cpp | 6 ++-- src/mame/drivers/jupiter.cpp | 15 ++++++--- src/mame/drivers/jvh.cpp | 8 ++--- src/mame/includes/hanaawas.h | 4 ++- src/mame/includes/harddriv.h | 37 +++++++++++---------- src/mame/includes/hcastle.h | 4 ++- src/mame/includes/hec2hrp.h | 34 ++++++++++--------- src/mame/includes/hexion.h | 6 ++-- src/mame/includes/higemaru.h | 4 ++- src/mame/includes/himesiki.h | 4 ++- src/mame/includes/hitme.h | 6 ++-- src/mame/includes/hnayayoi.h | 11 +++--- src/mame/includes/hng64.h | 43 ++++++++++++++---------- src/mame/includes/holeland.h | 5 +-- src/mame/includes/homedata.h | 25 ++++++++------ src/mame/includes/homerun.h | 18 +++++----- src/mame/includes/hp48.h | 31 +++++++++-------- src/mame/includes/huebler.h | 4 ++- src/mame/includes/hx20.h | 6 ++-- src/mame/includes/hyhoo.h | 22 ++++++------ src/mame/includes/hyperspt.h | 8 +++-- src/mame/includes/ikki.h | 4 ++- src/mame/includes/imds2.h | 12 ++++--- src/mame/includes/intv.h | 35 +++++++++++--------- src/mame/includes/inufuku.h | 9 +++-- src/mame/includes/iqblock.h | 9 +++-- src/mame/includes/irobot.h | 31 +++++++++-------- src/mame/includes/ironhors.h | 9 ++--- src/mame/includes/itech32.h | 51 ++++++++++++++-------------- src/mame/includes/itech8.h | 53 +++++++++++++++-------------- src/mame/includes/jack.h | 24 ++++++++------ src/mame/includes/jackal.h | 4 ++- src/mame/includes/jaguar.h | 45 +++++++++++++------------ src/mame/includes/jailbrek.h | 4 ++- src/mame/includes/jedi.h | 3 +- src/mame/includes/jpmimpct.h | 7 ++-- src/mame/includes/jpmsys5.h | 44 +++++++++++++----------- 150 files changed, 950 insertions(+), 648 deletions(-) diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp index a5920e63cda..5a6b088ecca 100644 --- a/src/mame/drivers/h19.cpp +++ b/src/mame/drivers/h19.cpp @@ -99,6 +99,9 @@ public: { } + void h19(machine_config &config); + +private: DECLARE_WRITE8_MEMBER(h19_keyclick_w); DECLARE_WRITE8_MEMBER(h19_bell_w); DECLARE_READ8_MEMBER(kbd_key_r); @@ -109,10 +112,9 @@ public: MC6845_UPDATE_ROW(crtc_update_row); - void h19(machine_config &config); void io_map(address_map &map); void mem_map(address_map &map); -private: + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void machine_reset() override; diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp index 4c9cf9e55d5..f6300ed07c2 100644 --- a/src/mame/drivers/h8.cpp +++ b/src/mame/drivers/h8.cpp @@ -72,6 +72,9 @@ public: , m_digits(*this, "digit%u", 0U) { } + void h8(machine_config &config); + +private: DECLARE_READ8_MEMBER(portf0_r); DECLARE_WRITE8_MEMBER(portf0_w); DECLARE_WRITE8_MEMBER(portf1_w); @@ -82,10 +85,9 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(h8_c); TIMER_DEVICE_CALLBACK_MEMBER(h8_p); - void h8(machine_config &config); void h8_io(address_map &map); void h8_mem(address_map &map); -private: + uint8_t m_digit; uint8_t m_segment; uint8_t m_irq_ctl; diff --git a/src/mame/drivers/h89.cpp b/src/mame/drivers/h89.cpp index 88985d48b1e..79f9fd64dd7 100644 --- a/src/mame/drivers/h89.cpp +++ b/src/mame/drivers/h89.cpp @@ -36,6 +36,9 @@ public: { } + void h89(machine_config &config); + +private: required_device m_maincpu; DECLARE_WRITE8_MEMBER( port_f2_w ); @@ -43,7 +46,6 @@ public: uint8_t m_port_f2; virtual void machine_reset() override; TIMER_DEVICE_CALLBACK_MEMBER(h89_irq_timer); - void h89(machine_config &config); void h89_io(address_map &map); void h89_mem(address_map &map); }; diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp index 827e316cdc3..38834ecf57f 100644 --- a/src/mame/drivers/halleys.cpp +++ b/src/mame/drivers/halleys.cpp @@ -226,6 +226,14 @@ public: m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch") { } + void benberob(machine_config &config); + void halleys(machine_config &config); + + void init_halley87(); + void init_benberob(); + void init_halleys(); + +private: uint16_t *m_render_layer[MAX_LAYERS]; uint8_t m_sound_fifo[MAX_SOUNDS]; uint8_t *m_gfx_plane02; @@ -271,9 +279,6 @@ public: DECLARE_READ8_MEMBER(io_mirror_r); void blit(int offset); DECLARE_WRITE8_MEMBER(sndnmi_msk_w); - void init_halley87(); - void init_benberob(); - void init_halleys(); virtual void machine_reset() override; virtual void video_start() override; DECLARE_PALETTE_INIT(halleys); @@ -293,8 +298,6 @@ public: required_device m_audiocpu; required_device m_palette; required_device m_soundlatch; - void benberob(machine_config &config); - void halleys(machine_config &config); void halleys_map(address_map &map); void sound_map(address_map &map); }; diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp index 36acaf4e68f..7a0aeda7bfc 100644 --- a/src/mame/drivers/hankin.cpp +++ b/src/mame/drivers/hankin.cpp @@ -47,7 +47,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(self_test); void hankin(machine_config &config); -protected: +private: DECLARE_WRITE_LINE_MEMBER(ic10_ca2_w); DECLARE_WRITE_LINE_MEMBER(ic10_cb2_w); DECLARE_WRITE_LINE_MEMBER(ic11_ca2_w); @@ -70,7 +70,6 @@ protected: void hankin_map(address_map &map); void hankin_sub_map(address_map &map); -private: bool m_timer_x; bool m_timer_sb; uint8_t m_timer_s[3]; diff --git a/src/mame/drivers/hapyfish.cpp b/src/mame/drivers/hapyfish.cpp index 9645878c40c..d3a1a55d4a8 100644 --- a/src/mame/drivers/hapyfish.cpp +++ b/src/mame/drivers/hapyfish.cpp @@ -30,10 +30,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } + void hapyfish(machine_config &config); + +private: virtual void video_start() override; uint32_t screen_update_hapyfish(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; - void hapyfish(machine_config &config); void hapyfish_map(address_map &map); }; diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index 9299beec0ce..b87a63fcca1 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -514,13 +514,6 @@ public: , m_rightpcb(*this, "rightpcb") { } - TIMER_DEVICE_CALLBACK_MEMBER(hack_timer); - DECLARE_WRITE_LINE_MEMBER(tx_a); - - required_device m_mainpcb; - optional_device m_leftpcb; - optional_device m_rightpcb; - void steeltal1_machine(machine_config &config); void harddriv_machine(machine_config &config); void hdrivairp_machine(machine_config &config); @@ -535,6 +528,14 @@ public: void steeltalp_machine(machine_config &config); void racedrivc_machine(machine_config &config); void stunrun_machine(machine_config &config); + +private: + TIMER_DEVICE_CALLBACK_MEMBER(hack_timer); + DECLARE_WRITE_LINE_MEMBER(tx_a); + + required_device m_mainpcb; + optional_device m_leftpcb; + optional_device m_rightpcb; }; diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp index 8b843d0a4a8..feae77ae14c 100644 --- a/src/mame/drivers/harriet.cpp +++ b/src/mame/drivers/harriet.cpp @@ -27,7 +27,7 @@ public: } void harriet(machine_config &config); -protected: +private: DECLARE_READ8_MEMBER(zpram_r); DECLARE_WRITE8_MEMBER(zpram_w); DECLARE_READ8_MEMBER(unk_status_r); diff --git a/src/mame/drivers/hazelgr.cpp b/src/mame/drivers/hazelgr.cpp index 39d345451e6..7ffe08d743b 100644 --- a/src/mame/drivers/hazelgr.cpp +++ b/src/mame/drivers/hazelgr.cpp @@ -23,9 +23,11 @@ public: { } void haze(machine_config &config); + +private: void io_map(address_map &map); void mem_map(address_map &map); -private: + required_device m_maincpu; }; diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp index b37544d14df..2c2d726baab 100644 --- a/src/mame/drivers/hazeltin.cpp +++ b/src/mame/drivers/hazeltin.cpp @@ -136,6 +136,9 @@ public: { } + void hazl1500(machine_config &config); + +private: virtual void machine_start() override; virtual void machine_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; @@ -166,10 +169,9 @@ public: NETDEV_ANALOG_CALLBACK_MEMBER(vblank_cb); NETDEV_ANALOG_CALLBACK_MEMBER(tvinterq_cb); - void hazl1500(machine_config &config); void hazl1500_io(address_map &map); void hazl1500_mem(address_map &map); -private: + required_device m_maincpu; required_device m_video_board; required_device m_u9; diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp index 2e3c5ae282e..6c894201925 100644 --- a/src/mame/drivers/headonb.cpp +++ b/src/mame/drivers/headonb.cpp @@ -43,6 +43,9 @@ public: m_gfxdecode(*this, "gfxdecode"), m_video_ram(*this, "video_ram") { } + void headonb(machine_config &config); + +private: required_device m_maincpu; required_device m_gfxdecode; @@ -57,7 +60,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TILE_GET_INFO_MEMBER(get_tile_info); - void headonb(machine_config &config); void headonb_io_map(address_map &map); void headonb_map(address_map &map); }; diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp index e3b27a59a2b..4b34c94d336 100644 --- a/src/mame/drivers/hh_amis2k.cpp +++ b/src/mame/drivers/hh_amis2k.cpp @@ -50,7 +50,7 @@ public: void wildfire(machine_config &config); -protected: +private: virtual void machine_start() override; DECLARE_WRITE8_MEMBER(write_d); @@ -66,7 +66,6 @@ protected: void write_a12(int state); void sound_update(); -private: required_device m_maincpu; required_device m_speaker; required_device m_a12_decay_timer; diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp index 25741bc1a79..22d229de991 100644 --- a/src/mame/drivers/hideseek.cpp +++ b/src/mame/drivers/hideseek.cpp @@ -42,14 +42,17 @@ public: { } + void hideseek(machine_config &config); + void init_hideseek(); + +private: virtual void video_start() override; DECLARE_PALETTE_INIT(hideseek); uint32_t screen_update_hideseek(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void hideseek(machine_config &config); void mem_map(address_map &map); -protected: + required_device m_maincpu; }; diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp index 5af0afc5c08..c76e9a121a2 100644 --- a/src/mame/drivers/highvdeo.cpp +++ b/src/mame/drivers/highvdeo.cpp @@ -124,6 +124,19 @@ public: , m_palette(*this, "palette") { } + void grancapi(machine_config &config); + void tv_ncf(machine_config &config); + void ciclone(machine_config &config); + void nyjoker(machine_config &config); + void magicbom(machine_config &config); + void brasil(machine_config &config); + void fashion(machine_config &config); + void newmcard(machine_config &config); + void record(machine_config &config); + void tv_tcf(machine_config &config); + void tv_vcf(machine_config &config); + +private: required_shared_ptr m_blit_ram; optional_memory_bank m_mainbank; @@ -162,17 +175,7 @@ public: required_device m_maincpu; required_device m_okim6376; required_device m_palette; - void grancapi(machine_config &config); - void tv_ncf(machine_config &config); - void ciclone(machine_config &config); - void nyjoker(machine_config &config); - void magicbom(machine_config &config); - void brasil(machine_config &config); - void fashion(machine_config &config); - void newmcard(machine_config &config); - void record(machine_config &config); - void tv_tcf(machine_config &config); - void tv_vcf(machine_config &config); + void brasil_io(address_map &map); void brasil_map(address_map &map); void ciclone_io(address_map &map); diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp index 0c20d3f6048..2904d7d047f 100644 --- a/src/mame/drivers/hikaru.cpp +++ b/src/mame/drivers/hikaru.cpp @@ -395,10 +395,13 @@ public: hikaru_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } + + void hikaru(machine_config &config); + +private: virtual void video_start() override; uint32_t screen_update_hikaru(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; - void hikaru(machine_config &config); void hikaru_map(address_map &map); void hikaru_map_slave(address_map &map); }; diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp index 60f01f9b3bc..86ce8100c82 100644 --- a/src/mame/drivers/hitpoker.cpp +++ b/src/mame/drivers/hitpoker.cpp @@ -64,6 +64,11 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void hitpoker(machine_config &config); + + void init_hitpoker(); + +private: required_shared_ptr m_sys_regs; uint8_t m_pic_data; @@ -87,13 +92,11 @@ public: DECLARE_WRITE8_MEMBER(hitpoker_pic_w); DECLARE_WRITE_LINE_MEMBER(hitpoker_irq); DECLARE_READ8_MEMBER(irq_clear_r); - void init_hitpoker(); virtual void video_start() override; uint32_t screen_update_hitpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; - void hitpoker(machine_config &config); void hitpoker_io(address_map &map); void hitpoker_map(address_map &map); }; diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp index 3f668014f18..434ab9aee56 100644 --- a/src/mame/drivers/hk68v10.cpp +++ b/src/mame/drivers/hk68v10.cpp @@ -192,51 +192,51 @@ class hk68v10_state : public driver_device { public: -hk68v10_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device (mconfig, type, tag), - m_maincpu (*this, "maincpu") - ,m_sccterm(*this, "scc") -// ,m_cart(*this, "exp_rom1") -{ -} - -DECLARE_READ16_MEMBER (bootvect_r); -DECLARE_WRITE16_MEMBER (bootvect_w); -//DECLARE_READ16_MEMBER (vme_a24_r); -//DECLARE_WRITE16_MEMBER (vme_a24_w); -//DECLARE_READ16_MEMBER (vme_a16_r); -//DECLARE_WRITE16_MEMBER (vme_a16_w); -virtual void machine_start () override; -virtual void machine_reset () override; + hk68v10_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") + , m_sccterm(*this, "scc") + // ,m_cart(*this, "exp_rom1") + { + } -void hk68v10(machine_config &config); -void hk68v10_mem(address_map &map); -protected: + void hk68v10(machine_config &config); private: -required_device m_maincpu; -required_device m_sccterm; + DECLARE_READ16_MEMBER(bootvect_r); + DECLARE_WRITE16_MEMBER(bootvect_w); + //DECLARE_READ16_MEMBER (vme_a24_r); + //DECLARE_WRITE16_MEMBER (vme_a24_w); + //DECLARE_READ16_MEMBER (vme_a16_r); + //DECLARE_WRITE16_MEMBER (vme_a16_w); + virtual void machine_start() override; + virtual void machine_reset() override; + + void hk68v10_mem(address_map &map); + + required_device m_maincpu; + required_device m_sccterm; -// Pointer to System ROMs needed by bootvect_r and masking RAM buffer for post reset accesses + // Pointer to System ROMs needed by bootvect_r and masking RAM buffer for post reset accesses uint16_t *m_sysrom; uint16_t m_sysram[4]; }; void hk68v10_state::hk68v10_mem(address_map &map) { -map.unmap_value_high(); -map(0x000000, 0x000007).ram().w(FUNC(hk68v10_state::bootvect_w)); /* After first write we act as RAM */ -map(0x000000, 0x000007).rom().r(FUNC(hk68v10_state::bootvect_r)); /* ROM mirror just durin reset */ -map(0x000008, 0x1fffff).ram(); /* 2 Mb RAM */ -map(0xFC0000, 0xFC3fff).rom(); /* System EPROM Area 16Kb HBUG */ -map(0xFC4000, 0xFDffff).rom(); /* System EPROM Area an additional 112Kb for System ROM */ -map(0xFE9000, 0xFE9007).rw("cio", FUNC(z8536_device::read), FUNC(z8536_device::write)).umask16(0xff00); -map(0xfea000, 0xfea000).rw(m_sccterm, FUNC(scc8530_device::ca_r), FUNC(scc8530_device::ca_w)); /* Dual serial port Z80-SCC */ -map(0xfea002, 0xfea002).rw(m_sccterm, FUNC(scc8530_device::cb_r), FUNC(scc8530_device::cb_w)); /* Dual serial port Z80-SCC */ -map(0xfea004, 0xfea004).rw(m_sccterm, FUNC(scc8530_device::da_r), FUNC(scc8530_device::da_w)); /* Dual serial port Z80-SCC */ -map(0xfea006, 0xfea006).rw(m_sccterm, FUNC(scc8530_device::db_r), FUNC(scc8530_device::db_w)); /* Dual serial port Z80-SCC */ -//AM_RANGE(0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */ -//AM_RANGE(0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */ + map.unmap_value_high(); + map(0x000000, 0x000007).ram().w(FUNC(hk68v10_state::bootvect_w)); /* After first write we act as RAM */ + map(0x000000, 0x000007).rom().r(FUNC(hk68v10_state::bootvect_r)); /* ROM mirror just durin reset */ + map(0x000008, 0x1fffff).ram(); /* 2 Mb RAM */ + map(0xFC0000, 0xFC3fff).rom(); /* System EPROM Area 16Kb HBUG */ + map(0xFC4000, 0xFDffff).rom(); /* System EPROM Area an additional 112Kb for System ROM */ + map(0xFE9000, 0xFE9007).rw("cio", FUNC(z8536_device::read), FUNC(z8536_device::write)).umask16(0xff00); + map(0xfea000, 0xfea000).rw(m_sccterm, FUNC(scc8530_device::ca_r), FUNC(scc8530_device::ca_w)); /* Dual serial port Z80-SCC */ + map(0xfea002, 0xfea002).rw(m_sccterm, FUNC(scc8530_device::cb_r), FUNC(scc8530_device::cb_w)); /* Dual serial port Z80-SCC */ + map(0xfea004, 0xfea004).rw(m_sccterm, FUNC(scc8530_device::da_r), FUNC(scc8530_device::da_w)); /* Dual serial port Z80-SCC */ + map(0xfea006, 0xfea006).rw(m_sccterm, FUNC(scc8530_device::db_r), FUNC(scc8530_device::db_w)); /* Dual serial port Z80-SCC */ + //AM_RANGE(0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */ + //AM_RANGE(0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */ } /* Input ports */ diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp index e9782c9adf6..e69f8b57199 100644 --- a/src/mame/drivers/homelab.cpp +++ b/src/mame/drivers/homelab.cpp @@ -57,6 +57,15 @@ public: , m_cass(*this, "cassette") { } + void homelab3(machine_config &config); + void brailab4(machine_config &config); + void homelab(machine_config &config); + + void init_brailab4(); + + DECLARE_CUSTOM_INPUT_MEMBER(cass3_r); + +private: DECLARE_READ8_MEMBER(key_r); DECLARE_WRITE8_MEMBER(cass_w); DECLARE_READ8_MEMBER(cass2_r); @@ -65,8 +74,6 @@ public: DECLARE_WRITE8_MEMBER(portff_w); DECLARE_WRITE8_MEMBER(brailab4_port7f_w); DECLARE_WRITE8_MEMBER(brailab4_portff_w); - DECLARE_CUSTOM_INPUT_MEMBER(cass3_r); - void init_brailab4(); DECLARE_VIDEO_START(homelab2); DECLARE_MACHINE_RESET(homelab3); DECLARE_VIDEO_START(homelab3); @@ -77,15 +84,12 @@ public: uint32_t screen_update_homelab2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_homelab3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void homelab3(machine_config &config); - void brailab4(machine_config &config); - void homelab(machine_config &config); void brailab4_io(address_map &map); void brailab4_mem(address_map &map); void homelab2_mem(address_map &map); void homelab3_io(address_map &map); void homelab3_mem(address_map &map); -private: + const uint8_t *m_p_videoram; bool m_nmi; required_device m_maincpu; diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp index 7e7dd6c439e..ec42b3107fa 100644 --- a/src/mame/drivers/homez80.cpp +++ b/src/mame/drivers/homez80.cpp @@ -36,14 +36,17 @@ public: , m_p_chargen(*this, "chargen") { } + void homez80(machine_config &config); + +private: + DECLARE_READ8_MEMBER( homez80_keyboard_r ); INTERRUPT_GEN_MEMBER(homez80_interrupt); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void homez80(machine_config &config); void homez80_io(address_map &map); void homez80_mem(address_map &map); -private: + bool m_irq; virtual void machine_reset() override; required_device m_maincpu; diff --git a/src/mame/drivers/horizon.cpp b/src/mame/drivers/horizon.cpp index 85cd3184667..1c2691ef90a 100644 --- a/src/mame/drivers/horizon.cpp +++ b/src/mame/drivers/horizon.cpp @@ -59,13 +59,15 @@ public: , m_usart_r(*this, I8251_R_TAG) { } - DECLARE_READ8_MEMBER(ff_r); - void horizon(machine_config &config); void horizon2mhz(machine_config &config); + +private: + DECLARE_READ8_MEMBER(ff_r); + void horizon_io(address_map &map); void horizon_mem(address_map &map); -private: + virtual void machine_reset() override; required_device m_maincpu; required_device m_usart_l; diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp index e734b1fa901..10a10c47acc 100644 --- a/src/mame/drivers/hornet.cpp +++ b/src/mame/drivers/hornet.cpp @@ -363,6 +363,19 @@ public: m_watchdog(*this, "watchdog") { } + void terabrst(machine_config &config); + void sscope2(machine_config &config); + void hornet_2board(machine_config &config); + void hornet_2board_v2(machine_config &config); + void hornet(machine_config &config); + + void init_hornet(); + void init_hornet_2board(); + void init_gradius4(); + void init_nbapbp(); + void init_terabrst(); + +private: // TODO: Needs verification on real hardware static const int m_sound_timer_usec = 2800; @@ -426,11 +439,6 @@ public: DECLARE_READ8_MEMBER(comm_eeprom_r); DECLARE_WRITE8_MEMBER(comm_eeprom_w); - void init_hornet(); - void init_hornet_2board(); - void init_gradius4(); - void init_nbapbp(); - void init_terabrst(); virtual void machine_start() override; virtual void machine_reset() override; DECLARE_MACHINE_RESET(hornet_2board); @@ -440,11 +448,6 @@ public: int jvs_encode_data(uint8_t *in, int length); int jvs_decode_data(uint8_t *in, uint8_t *out, int length); void jamma_jvs_cmd_exec(); - void terabrst(machine_config &config); - void sscope2(machine_config &config); - void hornet_2board(machine_config &config); - void hornet_2board_v2(machine_config &config); - void hornet(machine_config &config); void gn680_memmap(address_map &map); void hornet_map(address_map &map); void sharc0_map(address_map &map); diff --git a/src/mame/drivers/hotblock.cpp b/src/mame/drivers/hotblock.cpp index e6d6f5a584b..38c733c44e0 100644 --- a/src/mame/drivers/hotblock.cpp +++ b/src/mame/drivers/hotblock.cpp @@ -55,6 +55,9 @@ public: m_palette(*this, "palette"), m_vram(*this, "vram") { } + void hotblock(machine_config &config); + +private: /* devices */ required_device m_maincpu; required_device m_palette; @@ -78,7 +81,6 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void hotblock(machine_config &config); void hotblock_io(address_map &map); void hotblock_map(address_map &map); }; diff --git a/src/mame/drivers/hotstuff.cpp b/src/mame/drivers/hotstuff.cpp index 71182c6773e..c649b6f7bd7 100644 --- a/src/mame/drivers/hotstuff.cpp +++ b/src/mame/drivers/hotstuff.cpp @@ -19,12 +19,14 @@ public: m_maincpu(*this, "maincpu"), m_rtc(*this, "rtc") { } + void hotstuff(machine_config &config); + +private: required_shared_ptr m_bitmapram; virtual void video_start() override; uint32_t screen_update_hotstuff(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_rtc; - void hotstuff(machine_config &config); void hotstuff_map(address_map &map); }; diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp index 5c1b7e288f1..d5801d017d5 100644 --- a/src/mame/drivers/hp16500.cpp +++ b/src/mame/drivers/hp16500.cpp @@ -65,6 +65,12 @@ public: m_mlc(*this, "mlc") { } + void hp16500(machine_config &config); + void hp16500a(machine_config &config); + void hp1651(machine_config &config); + void hp1650(machine_config &config); + +private: virtual void video_start() override; uint32_t screen_update_hp16500(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); uint32_t screen_update_hp16500a(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -97,15 +103,11 @@ public: MC6845_UPDATE_ROW(crtc_update_row); MC6845_UPDATE_ROW(crtc_update_row_1650); - void hp16500(machine_config &config); - void hp16500a(machine_config &config); - void hp1651(machine_config &config); - void hp1650(machine_config &config); void hp16500_map(address_map &map); void hp16500a_map(address_map &map); void hp1650_map(address_map &map); void hp1651_map(address_map &map); -private: + uint32_t m_palette[256], m_colors[3], m_count, m_clutoffs; }; diff --git a/src/mame/drivers/hp2620.cpp b/src/mame/drivers/hp2620.cpp index cb3ed88143c..9e0276d3a69 100644 --- a/src/mame/drivers/hp2620.cpp +++ b/src/mame/drivers/hp2620.cpp @@ -23,6 +23,9 @@ public: , m_nvram(*this, "nvram") { } + void hp2622(machine_config &config); + +private: DECLARE_READ8_MEMBER(nvram_r); DECLARE_WRITE8_MEMBER(nvram_w); DECLARE_READ8_MEMBER(keystat_r); @@ -32,10 +35,9 @@ public: u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - void hp2622(machine_config &config); void io_map(address_map &map); void mem_map(address_map &map); -private: + required_device m_maincpu; required_region_ptr m_p_chargen; required_shared_ptr m_nvram; diff --git a/src/mame/drivers/hp2640.cpp b/src/mame/drivers/hp2640.cpp index 3355aad4c33..d17294b6581 100644 --- a/src/mame/drivers/hp2640.cpp +++ b/src/mame/drivers/hp2640.cpp @@ -122,6 +122,9 @@ class hp2645_state : public driver_device public: hp2645_state(const machine_config &mconfig, device_type type, const char *tag); + void hp2645(machine_config &config); + +private: virtual void machine_start() override; virtual void machine_reset() override; @@ -152,10 +155,9 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(timer_beep_exp); - void hp2645(machine_config &config); void cpu_io_map(address_map &map); void cpu_mem_map(address_map &map); -protected: + required_device m_cpu; required_device m_timer_10ms; required_ioport_array<4> m_io_key; diff --git a/src/mame/drivers/hp49gp.cpp b/src/mame/drivers/hp49gp.cpp index db92f3639fa..b2ca9e5d9d8 100644 --- a/src/mame/drivers/hp49gp.cpp +++ b/src/mame/drivers/hp49gp.cpp @@ -32,14 +32,19 @@ public: m_maincpu(*this, "maincpu") { } + void hp49gp(machine_config &config); + + void init_hp49gp(); + + DECLARE_INPUT_CHANGED_MEMBER(port_changed); + +private: uint32_t m_port[9]; required_device m_s3c2410; required_shared_ptr m_steppingstone; lcd_spi_t m_lcd_spi; - void init_hp49gp(); virtual void machine_start() override; virtual void machine_reset() override; - DECLARE_INPUT_CHANGED_MEMBER(port_changed); DECLARE_READ32_MEMBER(s3c2410_gpio_port_r); DECLARE_WRITE32_MEMBER(s3c2410_gpio_port_w); inline void verboselog(int n_level, const char *s_fmt, ...) ATTR_PRINTF(3,4); @@ -48,7 +53,6 @@ public: void lcd_spi_line_w( int line, int data); int lcd_spi_line_r( int line); required_device m_maincpu; - void hp49gp(machine_config &config); void hp49gp_map(address_map &map); }; diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp index 7ba62429e12..c898fb5c6fb 100644 --- a/src/mame/drivers/hp64k.cpp +++ b/src/mame/drivers/hp64k.cpp @@ -174,6 +174,9 @@ class hp64k_state : public driver_device public: hp64k_state(const machine_config &mconfig, device_type type, const char *tag); + void hp64k(machine_config &config); + +private: virtual void driver_start() override; //virtual void machine_start(); virtual void video_start() override; @@ -237,10 +240,9 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(hp64k_beeper_off); DECLARE_WRITE_LINE_MEMBER(hp64k_baud_clk_w); - void hp64k(machine_config &config); void cpu_io_map(address_map &map); void cpu_mem_map(address_map &map); -private: + required_device m_cpu; required_device m_crtc; required_device m_palette; diff --git a/src/mame/drivers/hp700.cpp b/src/mame/drivers/hp700.cpp index e51a3f9f1a3..2425fdadf2c 100644 --- a/src/mame/drivers/hp700.cpp +++ b/src/mame/drivers/hp700.cpp @@ -21,9 +21,10 @@ public: { } void hp700_92(machine_config &config); + +private: void io_map(address_map &map); void mem_map(address_map &map); -private: required_device m_maincpu; required_device m_duart; }; diff --git a/src/mame/drivers/hp80.cpp b/src/mame/drivers/hp80.cpp index 09ce0b38b00..122d54d0436 100644 --- a/src/mame/drivers/hp80.cpp +++ b/src/mame/drivers/hp80.cpp @@ -127,6 +127,9 @@ class hp85_state : public driver_device public: hp85_state(const machine_config &mconfig, device_type type, const char *tag); + void hp85(machine_config &config); + +private: virtual void machine_start() override; virtual void machine_reset() override; @@ -166,10 +169,9 @@ public: DECLARE_WRITE8_MEMBER(irl_w); DECLARE_WRITE8_MEMBER(halt_w); - void hp85(machine_config &config); void cpu_mem_map(address_map &map); void rombank_mem_map(address_map &map); -protected: + required_device m_cpu; required_device m_screen; required_device m_palette; diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index 8deffdc25f5..6cdff36239a 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -204,9 +204,11 @@ public: driver_device(mconfig, type, tag) { } - uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void hp9845a(machine_config &config); void hp9835a(machine_config &config); + +private: + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; static INPUT_PORTS_START( hp9845 ) @@ -833,6 +835,9 @@ class hp9845b_state : public hp9845_base_state public: hp9845b_state(const machine_config &mconfig, device_type type, const char *tag); + void hp9845b(machine_config &config); + +private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual void machine_start() override; @@ -845,8 +850,6 @@ public: DECLARE_WRITE_LINE_MEMBER(vblank_w); - void hp9845b(machine_config &config); -protected: void set_graphic_mode(bool graphic); void set_video_mar(uint16_t mar); void video_fill_buff(bool buff_idx); @@ -2062,6 +2065,9 @@ class hp9845c_state : public hp9845ct_base_state public: hp9845c_state(const machine_config &mconfig, device_type type, const char *tag); + void hp9845c(machine_config &config); + +private: virtual void machine_start() override; virtual void machine_reset() override; @@ -2070,8 +2076,6 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer); - void hp9845c(machine_config &config); -protected: virtual void set_graphic_mode(bool graphic , bool alpha) override; void video_render_buff(unsigned video_scanline , unsigned line_in_row, bool buff_idx); void graphic_video_render(unsigned video_scanline); @@ -2799,6 +2803,9 @@ class hp9845t_state : public hp9845ct_base_state public: hp9845t_state(const machine_config &mconfig, device_type type, const char *tag); + void hp9845t(machine_config &config); + +private: virtual void machine_start() override; virtual void machine_reset() override; @@ -2807,8 +2814,6 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer); - void hp9845t(machine_config &config); -protected: virtual void set_graphic_mode(bool graphic , bool alpha) override; void video_render_buff(unsigned video_scanline , unsigned line_in_row, bool buff_idx); void graphic_video_render(unsigned video_scanline); diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp index aa315b19bb5..6847f2d5d1f 100644 --- a/src/mame/drivers/hp9k.cpp +++ b/src/mame/drivers/hp9k.cpp @@ -112,15 +112,6 @@ static uint8_t prom16a[256] = { class hp9k_state : public driver_device { -private: - - int crtc_curreg; - int crtc_addrStartHi; - int crtc_addrStartLow; - - void calc_prom_crc(uint8_t* prom); - void putChar(uint8_t thec,int x,int y,bitmap_ind16 &bitmap); - public: hp9k_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), @@ -136,6 +127,19 @@ public: calc_prom_crc(prom16a); } + void hp9k(machine_config &config); + + void init_hp9k(); + +private: + + int crtc_curreg; + int crtc_addrStartHi; + int crtc_addrStartLow; + + void calc_prom_crc(uint8_t* prom); + void putChar(uint8_t thec,int x,int y,bitmap_ind16 &bitmap); + uint8_t kbdBit; required_device m_maincpu; @@ -145,8 +149,6 @@ public: uint8_t m_videoram[0x4000]; uint8_t m_screenram[0x800]; - void init_hp9k(); - DECLARE_READ16_MEMBER(buserror_r); DECLARE_WRITE16_MEMBER(buserror_w); @@ -167,7 +169,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_gfxdecode; - void hp9k(machine_config &config); void hp9k_mem(address_map &map); }; diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp index 1be8237d1f8..f74f87f1c35 100644 --- a/src/mame/drivers/hp9k_3xx.cpp +++ b/src/mame/drivers/hp9k_3xx.cpp @@ -96,6 +96,17 @@ public: m_vram(*this, "vram") { } + void hp9k370(machine_config &config); + void hp9k330(machine_config &config); + void hp9k382(machine_config &config); + void hp9k310(machine_config &config); + void hp9k340(machine_config &config); + void hp9k380(machine_config &config); + void hp9k320(machine_config &config); + void hp9k332(machine_config &config); + void hp9k300(machine_config &config); + +private: required_device m_maincpu; optional_device m_iocpu; optional_device m_mlc; @@ -147,14 +158,6 @@ public: #endif } - void hp9k370(machine_config &config); - void hp9k330(machine_config &config); - void hp9k382(machine_config &config); - void hp9k310(machine_config &config); - void hp9k340(machine_config &config); - void hp9k380(machine_config &config); - void hp9k320(machine_config &config); - void hp9k332(machine_config &config); void hp9k310_map(address_map &map); void hp9k320_map(address_map &map); void hp9k330_map(address_map &map); @@ -165,11 +168,6 @@ public: void hp9k3xx_common(address_map &map); void iocpu_map(address_map &map); -protected: - void hp9k300(machine_config &config); - -private: - DECLARE_WRITE_LINE_MEMBER(cpu_reset); static constexpr uint8_t HIL_CS = 0x01; diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index b2ed5189eb2..c043f1a7e8b 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -392,6 +392,11 @@ public: , m_screen(*this, "screen") { } + void hp_ipc_base(machine_config &config); + void hp_ipc(machine_config &config); + void hp9808a(machine_config &config); + +private: virtual void machine_start() override; virtual void machine_reset() override; @@ -418,17 +423,12 @@ public: emu_timer *m_bus_error_timer; - void hp_ipc_base(machine_config &config); - void hp_ipc(machine_config &config); - void hp_ipc_mem_inner_base(address_map &map); void hp_ipc_mem_inner_9807a(address_map &map); void hp_ipc_mem_outer(address_map &map); - void hp9808a(machine_config &config); void hp_ipc_mem_inner_9808a(address_map &map); -private: required_device m_maincpu; required_device m_bankdev; required_device m_fdc; @@ -446,7 +446,6 @@ private: return (m_mmu[(m_maincpu->get_fc() >> 1) & 3] + offset) & 0x3FFFFF; } -protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void set_bus_error(uint32_t address, bool write, uint16_t mem_mask); bool m_bus_error; diff --git a/src/mame/drivers/hprot1.cpp b/src/mame/drivers/hprot1.cpp index 3eb700da6c6..84787c7c89c 100644 --- a/src/mame/drivers/hprot1.cpp +++ b/src/mame/drivers/hprot1.cpp @@ -73,17 +73,20 @@ public: , m_lcdc(*this, "hd44780") { } + void hprotr8a(machine_config &config); + void hprot2r6(machine_config &config); + void hprot1(machine_config &config); + + void init_hprot1(); + +private: DECLARE_WRITE8_MEMBER(henry_p1_w); DECLARE_WRITE8_MEMBER(henry_p3_w); - void init_hprot1(); DECLARE_PALETTE_INIT(hprot1); HD44780_PIXEL_UPDATE(hprot1_pixel_update); - void hprotr8a(machine_config &config); - void hprot2r6(machine_config &config); - void hprot1(machine_config &config); void i80c31_io(address_map &map); void i80c31_prg(address_map &map); -private: + virtual void machine_start() override; virtual void machine_reset() override; required_device m_maincpu; diff --git a/src/mame/drivers/hpz80unk.cpp b/src/mame/drivers/hpz80unk.cpp index ebc31d35587..ea7d8216acd 100644 --- a/src/mame/drivers/hpz80unk.cpp +++ b/src/mame/drivers/hpz80unk.cpp @@ -57,16 +57,18 @@ public: , m_uart(*this, "uart%u", 1) { } + void hpz80unk(machine_config &config); + +private: DECLARE_READ8_MEMBER(port00_r); DECLARE_READ8_MEMBER(port02_r); DECLARE_READ8_MEMBER(port03_r); DECLARE_READ8_MEMBER(port0d_r); DECLARE_READ8_MEMBER(portfc_r); - void hpz80unk(machine_config &config); void hpz80unk_io(address_map &map); void hpz80unk_mem(address_map &map); -private: + uint8_t m_port02_data; virtual void machine_reset() override; required_device m_maincpu; diff --git a/src/mame/drivers/ht6000.cpp b/src/mame/drivers/ht6000.cpp index 406fa4fab5f..17bdc75230c 100644 --- a/src/mame/drivers/ht6000.cpp +++ b/src/mame/drivers/ht6000.cpp @@ -33,11 +33,10 @@ public: void ht6000(machine_config &config); -protected: +private: virtual void machine_start() override; virtual void machine_reset() override; -private: required_memory_region m_rom2; required_ioport_array<16> m_switches; diff --git a/src/mame/drivers/ht68k.cpp b/src/mame/drivers/ht68k.cpp index f7375f1ff62..565da68d62f 100644 --- a/src/mame/drivers/ht68k.cpp +++ b/src/mame/drivers/ht68k.cpp @@ -52,6 +52,9 @@ public: { } + void ht68k(machine_config &config); + +private: required_device m_maincpu; required_device m_duart; required_device m_fdc; @@ -65,7 +68,6 @@ public: DECLARE_WRITE8_MEMBER(duart_output); required_shared_ptr m_p_ram; virtual void machine_reset() override; - void ht68k(machine_config &config); void ht68k_mem(address_map &map); }; diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp index e04f452b0d5..36df799a881 100644 --- a/src/mame/drivers/hunter2.cpp +++ b/src/mame/drivers/hunter2.cpp @@ -51,6 +51,11 @@ public: , m_bank3(*this, "bank3") { } + void hunter2(machine_config &config); + + void init_hunter2(); + +private: DECLARE_READ8_MEMBER(keyboard_r); DECLARE_READ8_MEMBER(serial_dsr_r); DECLARE_WRITE8_MEMBER(keyboard_w); @@ -64,17 +69,16 @@ public: DECLARE_WRITE8_MEMBER(irqctrl_w); DECLARE_WRITE8_MEMBER(memmap_w); DECLARE_PALETTE_INIT(hunter2); - void init_hunter2(); + DECLARE_WRITE_LINE_MEMBER(timer0_out); DECLARE_WRITE_LINE_MEMBER(timer1_out); DECLARE_WRITE_LINE_MEMBER(cts_w); DECLARE_WRITE_LINE_MEMBER(rxd_w); - void hunter2(machine_config &config); void hunter2_banked_mem(address_map &map); void hunter2_io(address_map &map); void hunter2_mem(address_map &map); -private: + uint8_t m_keydata; uint8_t m_irq_mask; virtual void machine_reset() override; diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp index 56a5ddce7a4..c8831beb1b9 100644 --- a/src/mame/drivers/hvyunit.cpp +++ b/src/mame/drivers/hvyunit.cpp @@ -101,6 +101,9 @@ public: { } + void hvyunit(machine_config &config); + +private: /* Devices */ required_device m_mastercpu; required_device m_slavecpu; @@ -157,7 +160,6 @@ public: DECLARE_WRITE_LINE_MEMBER(screen_vblank); TIMER_DEVICE_CALLBACK_MEMBER(scanline); - void hvyunit(machine_config &config); void master_io(address_map &map); void master_memory(address_map &map); void slave_io(address_map &map); diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp index c16ef9bf83b..926c1d1ed55 100644 --- a/src/mame/drivers/hyperscan.cpp +++ b/src/mame/drivers/hyperscan.cpp @@ -69,6 +69,9 @@ public: m_maincpu(*this, "maincpu") { } + void hyperscan(machine_config &config); + +private: required_device m_maincpu; virtual void machine_start() override; @@ -88,9 +91,8 @@ public: void spg290_blit_bitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect, uint32_t control, uint32_t attribute, int posy, int posx, uint32_t nptr, uint32_t buf_start, uint32_t transrgb); void spg290_blit_character(bitmap_rgb32 &bitmap, const rectangle &cliprect, uint32_t control, uint32_t attribute, int posy, int posx, uint32_t nptr, uint32_t buf_start, uint32_t transrgb); - void hyperscan(machine_config &config); void spg290_mem(address_map &map); -private: + static const device_timer_id TIMER_SPG290 = 0; static const device_timer_id TIMER_I2C = 1; diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp index bf1d731d909..0328543d788 100644 --- a/src/mame/drivers/hyprduel.cpp +++ b/src/mame/drivers/hyprduel.cpp @@ -65,6 +65,13 @@ public: , m_vdp(*this, "vdp") { } + void magerror(machine_config &config); + void hyprduel(machine_config &config); + + void init_magerror(); + void init_hyprduel(); + +private: DECLARE_READ16_MEMBER(irq_cause_r); DECLARE_WRITE16_MEMBER(irq_cause_w); DECLARE_WRITE16_MEMBER(subcpu_control_w); @@ -72,25 +79,21 @@ public: DECLARE_WRITE16_MEMBER(hyprduel_cpusync_trigger1_w); DECLARE_READ16_MEMBER(hyprduel_cpusync_trigger2_r); DECLARE_WRITE16_MEMBER(hyprduel_cpusync_trigger2_w); - void init_magerror(); - void init_hyprduel(); DECLARE_MACHINE_START(hyprduel); DECLARE_MACHINE_START(magerror); TIMER_CALLBACK_MEMBER(vblank_end_callback); DECLARE_WRITE_LINE_MEMBER(vdp_blit_end_w); TIMER_DEVICE_CALLBACK_MEMBER(interrupt); - void magerror(machine_config &config); - void hyprduel(machine_config &config); void i4220_config(machine_config &config); + void hyprduel_map(address_map &map); void hyprduel_map2(address_map &map); void magerror_map(address_map &map); void magerror_map2(address_map &map); -protected: + virtual void machine_reset() override; -private: /* memory pointers */ required_shared_ptr m_irq_enable; required_shared_ptr_array m_sharedram; diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp index a61380a1bc5..840650ed797 100644 --- a/src/mame/drivers/i7000.cpp +++ b/src/mame/drivers/i7000.cpp @@ -67,6 +67,11 @@ public: , m_videoram(*this, "videoram") { } + void i7000(machine_config &config); + + void init_i7000(); + +private: void video_start() override; void machine_start() override; @@ -81,13 +86,11 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr); - void init_i7000(); DECLARE_PALETTE_INIT(i7000); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( i7000_card ); DECLARE_READ8_MEMBER(i7000_kbd_r); DECLARE_WRITE8_MEMBER(i7000_scanlines_w); - void i7000(machine_config &config); void i7000_io(address_map &map); void i7000_mem(address_map &map); }; diff --git a/src/mame/drivers/ibm3153.cpp b/src/mame/drivers/ibm3153.cpp index dd6827aa57f..991e7879b00 100644 --- a/src/mame/drivers/ibm3153.cpp +++ b/src/mame/drivers/ibm3153.cpp @@ -52,13 +52,15 @@ public: , m_p_chargen(*this, "chargen") { } + void ibm3153(machine_config &config); + +private: DECLARE_PALETTE_INIT(ibm3153); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void ibm3153(machine_config &config); void io_map(address_map &map); void mem_map(address_map &map); -private: + virtual void machine_reset() override; required_device m_maincpu; required_region_ptr m_p_chargen; diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp index 447756285b7..1a171c959ca 100644 --- a/src/mame/drivers/ibm6580.cpp +++ b/src/mame/drivers/ibm6580.cpp @@ -150,6 +150,9 @@ public: , m_p_chargen(*this, "chargen") { } + void ibm6580(machine_config &config); + +private: DECLARE_PALETTE_INIT(ibm6580); DECLARE_WRITE16_MEMBER(pic_latch_w); @@ -183,10 +186,9 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void ibm6580(machine_config &config); void ibm6580_io(address_map &map); void ibm6580_mem(address_map &map); -private: + virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/drivers/ibmpc.cpp b/src/mame/drivers/ibmpc.cpp index a9dabe3ad7c..c891ac66652 100644 --- a/src/mame/drivers/ibmpc.cpp +++ b/src/mame/drivers/ibmpc.cpp @@ -269,10 +269,12 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") { } - required_device m_maincpu; void ibm5160(machine_config &config); void ibm5150(machine_config &config); void ibm5140(machine_config &config); + +private: + required_device m_maincpu; void pc8_io(address_map &map); void pc8_map(address_map &map); }; diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp index cbf07482994..ce36f85f117 100644 --- a/src/mame/drivers/ibmpcjr.cpp +++ b/src/mame/drivers/ibmpcjr.cpp @@ -45,6 +45,12 @@ public: m_keyboard(*this, "pc_keyboard") { } + void ibmpcjx(machine_config &config); + void ibmpcjr(machine_config &config); + + void init_pcjr(); + +private: required_device m_maincpu; required_device m_pic8259; required_device m_pit8253; @@ -105,9 +111,6 @@ public: }; void machine_reset() override; - void init_pcjr(); - void ibmpcjx(machine_config &config); - void ibmpcjr(machine_config &config); void ibmpcjr_io(address_map &map); void ibmpcjr_map(address_map &map); void ibmpcjx_io(address_map &map); diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp index 9030fd03d35..5530b035d98 100644 --- a/src/mame/drivers/icatel.cpp +++ b/src/mame/drivers/icatel.cpp @@ -38,6 +38,11 @@ public: , m_lcdc(*this, "hd44780") { } + void icatel(machine_config &config); + + void init_icatel(); + +private: DECLARE_READ8_MEMBER(magic_string); DECLARE_READ8_MEMBER(i80c31_p1_r); @@ -60,16 +65,14 @@ public: DECLARE_READ8_MEMBER(ci16_r); DECLARE_WRITE8_MEMBER(ci16_w); - void init_icatel(); DECLARE_PALETTE_INIT(icatel); HD44780_PIXEL_UPDATE(icatel_pixel_update); - void icatel(machine_config &config); void i80c31_data(address_map &map); void i80c31_io(address_map &map); void i80c31_prg(address_map &map); -private: + virtual void machine_start() override; virtual void machine_reset() override; required_device m_maincpu; diff --git a/src/mame/drivers/ice_bozopail.cpp b/src/mame/drivers/ice_bozopail.cpp index c3d31b87b35..fded5792af3 100644 --- a/src/mame/drivers/ice_bozopail.cpp +++ b/src/mame/drivers/ice_bozopail.cpp @@ -29,11 +29,13 @@ public: , m_maincpu(*this, "maincpu") { } + void ice_bozo(machine_config &config); + +private: virtual void machine_start() override; virtual void machine_reset() override; required_device m_maincpu; - void ice_bozo(machine_config &config); void ice_bozo_map(address_map &map); }; diff --git a/src/mame/drivers/ice_tbd.cpp b/src/mame/drivers/ice_tbd.cpp index 780f9442ae1..986fd4a1115 100644 --- a/src/mame/drivers/ice_tbd.cpp +++ b/src/mame/drivers/ice_tbd.cpp @@ -30,9 +30,11 @@ public: { } void ice_tbd(machine_config &config); + +private: void ice_tbd_io_map(address_map &map); void ice_tbd_map(address_map &map); -private: + virtual void machine_start() override; virtual void machine_reset() override; required_device m_maincpu; diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp index fbf49fee9ff..409d88cc508 100644 --- a/src/mame/drivers/icecold.cpp +++ b/src/mame/drivers/icecold.cpp @@ -36,8 +36,12 @@ public: m_start_output(*this, "start") { } + void icecold(machine_config &config); + DECLARE_INPUT_CHANGED_MEMBER( test_switch_press ); DECLARE_CUSTOM_INPUT_MEMBER( motors_limit_r ); + +private: DECLARE_WRITE8_MEMBER( scanlines_w ); DECLARE_WRITE8_MEMBER( digit_w ); DECLARE_READ8_MEMBER( kbd_r ); @@ -82,7 +86,6 @@ public: int m_lmotor; // left motor position (0-100) TIMER_DEVICE_CALLBACK_MEMBER(icecold_sint_timer); TIMER_DEVICE_CALLBACK_MEMBER(icecold_motors_timer); - void icecold(machine_config &config); void icecold_map(address_map &map); }; diff --git a/src/mame/drivers/ichiban.cpp b/src/mame/drivers/ichiban.cpp index a5943e0b17d..6db873ae81f 100644 --- a/src/mame/drivers/ichiban.cpp +++ b/src/mame/drivers/ichiban.cpp @@ -55,6 +55,9 @@ public: , m_maincpu(*this, "maincpu") { } + void ichibanjyan(machine_config &config); + +private: // devices required_device m_maincpu; @@ -64,7 +67,6 @@ public: virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void ichibanjyan(machine_config &config); void ichibanjyan_io(address_map &map); void ichibanjyan_map(address_map &map); }; diff --git a/src/mame/drivers/idsa.cpp b/src/mame/drivers/idsa.cpp index 6bff408e4de..b5114fd7757 100644 --- a/src/mame/drivers/idsa.cpp +++ b/src/mame/drivers/idsa.cpp @@ -46,6 +46,10 @@ public: , m_ppi(*this, "ppi%u", 1) { } + void bsktbllp(machine_config &config); + void idsa(machine_config &config); + +private: DECLARE_WRITE_LINE_MEMBER(clock_w); DECLARE_READ8_MEMBER(portb0_r); DECLARE_WRITE8_MEMBER(port80_w); @@ -63,11 +67,9 @@ public: DECLARE_WRITE8_MEMBER(ay2_a_w); DECLARE_WRITE8_MEMBER(ay2_b_w); - void bsktbllp(machine_config &config); - void idsa(machine_config &config); void maincpu_io_map(address_map &map); void maincpu_map(address_map &map); -private: + virtual void machine_reset() override; uint16_t m_irqcnt; diff --git a/src/mame/drivers/ie15.cpp b/src/mame/drivers/ie15.cpp index ea9f44d3527..1af652ce245 100644 --- a/src/mame/drivers/ie15.cpp +++ b/src/mame/drivers/ie15.cpp @@ -25,8 +25,10 @@ public: m_ie15(*this, "ie15") { } - required_device m_ie15; void ie15(machine_config &config); + +private: + required_device m_ie15; }; diff --git a/src/mame/drivers/if800.cpp b/src/mame/drivers/if800.cpp index 125f39ccc03..5ca27f8f116 100644 --- a/src/mame/drivers/if800.cpp +++ b/src/mame/drivers/if800.cpp @@ -25,6 +25,9 @@ public: m_maincpu(*this, "maincpu"), m_palette(*this, "palette") { } + void if800(machine_config &config); + +private: required_device m_hgdc; required_shared_ptr m_video_ram; @@ -33,7 +36,6 @@ public: required_device m_maincpu; required_device m_palette; UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); - void if800(machine_config &config); void if800_io(address_map &map); void if800_map(address_map &map); void upd7220_map(address_map &map); diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp index 6109cdd4855..b46b4e08827 100644 --- a/src/mame/drivers/igs009.cpp +++ b/src/mame/drivers/igs009.cpp @@ -59,6 +59,15 @@ public: , m_leds(*this, "led%u", 0U) { } + void gp98(machine_config &config); + void jingbell(machine_config &config); + + void init_jingbell(); + void init_jingbelli(); + + DECLARE_CUSTOM_INPUT_MEMBER(hopper_r); + +private: DECLARE_WRITE8_MEMBER(reel1_ram_w); DECLARE_WRITE8_MEMBER(reel2_ram_w); DECLARE_WRITE8_MEMBER(reel3_ram_w); @@ -73,7 +82,6 @@ public: DECLARE_READ8_MEMBER(magic_r); void show_out(); - DECLARE_CUSTOM_INPUT_MEMBER(hopper_r); DECLARE_WRITE_LINE_MEMBER(vblank_irq); TILE_GET_INFO_MEMBER(get_jingbell_reel1_tile_info); @@ -87,19 +95,14 @@ public: TILE_GET_INFO_MEMBER(get_fg_tile_info); void decrypt_jingbell(); - void init_jingbell(); - void init_jingbelli(); DECLARE_VIDEO_START(gp98); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void gp98(machine_config &config); - void jingbell(machine_config &config); void gp98_portmap(address_map &map); void jingbell_map(address_map &map); void jingbell_portmap(address_map &map); -protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/drivers/igs_fear.cpp b/src/mame/drivers/igs_fear.cpp index ad511b29551..e2dcf2ff23c 100644 --- a/src/mame/drivers/igs_fear.cpp +++ b/src/mame/drivers/igs_fear.cpp @@ -21,9 +21,12 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void igs_fear(machine_config &config); - DECLARE_WRITE_LINE_MEMBER(sound_irq); void init_igs_fear(); + +private: + DECLARE_WRITE_LINE_MEMBER(sound_irq); //virtual void video_start(); virtual void video_start_igs_fear(); uint32_t screen_update_igs_fear(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -31,7 +34,6 @@ public: required_device m_maincpu; optional_device m_gfxdecode; required_device m_palette; - void igs_fear(machine_config &config); void igs_igs_fear_map(address_map &map); }; diff --git a/src/mame/drivers/igs_m027.cpp b/src/mame/drivers/igs_m027.cpp index 1ad7f8c5a24..5f3cbff153b 100644 --- a/src/mame/drivers/igs_m027.cpp +++ b/src/mame/drivers/igs_m027.cpp @@ -39,10 +39,8 @@ public: m_igs017_igs031(*this, "igs017_igs031") { } - optional_shared_ptr m_igs_mainram; - required_device m_maincpu; - required_device m_igs017_igs031; - + void igs_majhong(machine_config &config); + void amazonia(machine_config &config); void init_sdwx(); void init_chessc2(); @@ -59,14 +57,17 @@ public: void init_amazonia(); void init_amazoni2(); +private: + optional_shared_ptr m_igs_mainram; + required_device m_maincpu; + required_device m_igs017_igs031; + virtual void video_start() override; uint32_t screen_update_igs_majhong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_irq); void sdwx_gfx_decrypt(); void pgm_create_dummy_internal_arm_region(); - void igs_majhong(machine_config &config); - void amazonia(machine_config &config); void igs_majhong_map(address_map &map); }; diff --git a/src/mame/drivers/igs_m036.cpp b/src/mame/drivers/igs_m036.cpp index 8dd3c22f185..256e2273cb7 100644 --- a/src/mame/drivers/igs_m036.cpp +++ b/src/mame/drivers/igs_m036.cpp @@ -72,18 +72,21 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - uint32_t screen_update_igs_m036(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void igs_m036_tt(machine_config &config); + void igs_m036(machine_config &config); + void init_igs_m036(); void init_cjdh2(); void init_cjddzsp(); void init_igsm312(); +private: + uint32_t screen_update_igs_m036(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device m_maincpu; void pgm_create_dummy_internal_arm_region(void); - void igs_m036_tt(machine_config &config); - void igs_m036(machine_config &config); void igs_m036_map(address_map &map); }; diff --git a/src/mame/drivers/igspc.cpp b/src/mame/drivers/igspc.cpp index fd8c0955425..21aa054bafa 100644 --- a/src/mame/drivers/igspc.cpp +++ b/src/mame/drivers/igspc.cpp @@ -55,14 +55,16 @@ public: { } void speeddrv(machine_config &config); + + void init_speeddrv(); + +private: void speeddrv_io(address_map &map); void speeddrv_map(address_map &map); -protected: // devices required_device m_maincpu; public: - void init_speeddrv(); }; void speeddrv_state::speeddrv_map(address_map &map) diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index cb09e334fcf..e213001a994 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -96,18 +96,14 @@ public: , m_lamps(*this, "lamp%u", 1U) { } - DECLARE_READ8_MEMBER(igs_irqack_r); - DECLARE_WRITE8_MEMBER(igs_irqack_w); - DECLARE_WRITE8_MEMBER(bg_tile_w); - DECLARE_WRITE8_MEMBER(fg_tile_w); - DECLARE_WRITE8_MEMBER(fg_color_w); - DECLARE_WRITE8_MEMBER(igs_nmi_and_coins_w); - DECLARE_WRITE8_MEMBER(igs_lamps_w); - DECLARE_READ8_MEMBER(custom_io_r); - DECLARE_WRITE8_MEMBER(custom_io_w); - DECLARE_READ8_MEMBER(exp_rom_r); - void show_out(); - DECLARE_CUSTOM_INPUT_MEMBER(hopper_r); + void csk234it(machine_config &config); + void igs_ncs(machine_config &config); + void csk227it(machine_config &config); + void igspoker(machine_config &config); + void pktetris(machine_config &config); + void cpokerpk(machine_config &config); + void number10(machine_config &config); + void init_igs_ncs(); void init_number10(); void init_pktet346(); @@ -119,25 +115,34 @@ public: void init_igs_ncs2(); void init_cpokerpk(); void init_kungfu(); + + DECLARE_CUSTOM_INPUT_MEMBER(hopper_r); + +private: + DECLARE_READ8_MEMBER(igs_irqack_r); + DECLARE_WRITE8_MEMBER(igs_irqack_w); + DECLARE_WRITE8_MEMBER(bg_tile_w); + DECLARE_WRITE8_MEMBER(fg_tile_w); + DECLARE_WRITE8_MEMBER(fg_color_w); + DECLARE_WRITE8_MEMBER(igs_nmi_and_coins_w); + DECLARE_WRITE8_MEMBER(igs_lamps_w); + DECLARE_READ8_MEMBER(custom_io_r); + DECLARE_WRITE8_MEMBER(custom_io_w); + DECLARE_READ8_MEMBER(exp_rom_r); + void show_out(); + TILE_GET_INFO_MEMBER(get_bg_tile_info); TILE_GET_INFO_MEMBER(get_fg_tile_info); DECLARE_VIDEO_START(cpokerpk); uint32_t screen_update_igs_video(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); uint32_t screen_update_cpokerpk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(igs_interrupt); - void csk234it(machine_config &config); - void igs_ncs(machine_config &config); - void csk227it(machine_config &config); - void igspoker(machine_config &config); - void pktetris(machine_config &config); - void cpokerpk(machine_config &config); - void number10(machine_config &config); + void cpokerpk_io_map(address_map &map); void igspoker_io_map(address_map &map); void igspoker_prg_map(address_map &map); void number10_io_map(address_map &map); -protected: virtual void machine_start() override { m_led.resolve(); m_lamps.resolve(); } virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/drivers/imds.cpp b/src/mame/drivers/imds.cpp index a72dad47ca4..1a21ad5b6fc 100644 --- a/src/mame/drivers/imds.cpp +++ b/src/mame/drivers/imds.cpp @@ -35,7 +35,7 @@ public: void imds(machine_config &config); -protected: +private: DECLARE_READ8_MEMBER(term_r); DECLARE_READ8_MEMBER(term_status_r); void kbd_put(u8 data); @@ -44,7 +44,6 @@ protected: void imds_io(address_map &map); void imds_mem(address_map &map); -private: required_device m_maincpu; required_device m_terminal; }; diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp index a5cb7371ade..c7c9a629b80 100644 --- a/src/mame/drivers/imolagp.cpp +++ b/src/mame/drivers/imolagp.cpp @@ -103,6 +103,11 @@ public: m_digits(*this, "digit%u%u", 0U, 0U) { } + void imolagp(machine_config &config); + + DECLARE_CUSTOM_INPUT_MEMBER(imolagp_steerlatch_r); + +private: required_device m_maincpu; required_device m_slavecpu; required_device m_steer_pot_timer; @@ -126,7 +131,6 @@ public: DECLARE_READ8_MEMBER(imola_draw_mode_r); DECLARE_WRITE8_MEMBER(vreg_control_w); DECLARE_WRITE8_MEMBER(vreg_data_w); - DECLARE_CUSTOM_INPUT_MEMBER(imolagp_steerlatch_r); DECLARE_WRITE_LINE_MEMBER(vblank_irq); TIMER_DEVICE_CALLBACK_MEMBER(imolagp_pot_callback); @@ -135,7 +139,6 @@ public: virtual void video_start() override; DECLARE_PALETTE_INIT(imolagp); uint32_t screen_update_imolagp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void imolagp(machine_config &config); void imolagp_master_io(address_map &map); void imolagp_master_map(address_map &map); void imolagp_slave_io(address_map &map); diff --git a/src/mame/drivers/imsai.cpp b/src/mame/drivers/imsai.cpp index 534791e7979..8ab9ee5266f 100644 --- a/src/mame/drivers/imsai.cpp +++ b/src/mame/drivers/imsai.cpp @@ -34,15 +34,17 @@ public: , m_pit(*this, "pit") { } + void imsai(machine_config &config); + +private: void kbd_put(u8 data); DECLARE_READ8_MEMBER(keyin_r); DECLARE_READ8_MEMBER(status_r); DECLARE_WRITE8_MEMBER(control_w); - void imsai(machine_config &config); void imsai_io(address_map &map); void imsai_mem(address_map &map); -private: + uint8_t m_term_data; virtual void machine_reset() override; required_device m_maincpu; diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp index a1dc937bad2..d5d154e8364 100644 --- a/src/mame/drivers/inder.cpp +++ b/src/mame/drivers/inder.cpp @@ -60,6 +60,15 @@ public: , m_digits(*this, "digit%u", 0U) { } + void inder(machine_config &config); + void brvteam(machine_config &config); + void canasta(machine_config &config); + void lapbylap(machine_config &config); + + void init_inder(); + void init_inder1(); + +private: DECLARE_READ8_MEMBER(ppic_r); DECLARE_WRITE8_MEMBER(ppia_w); DECLARE_WRITE8_MEMBER(ppib_w); @@ -81,19 +90,13 @@ public: DECLARE_WRITE_LINE_MEMBER(qc7a_w); DECLARE_WRITE_LINE_MEMBER(q9a_w); DECLARE_WRITE_LINE_MEMBER(qc9b_w); - void init_inder(); - void init_inder1(); - void inder(machine_config &config); - void brvteam(machine_config &config); - void canasta(machine_config &config); - void lapbylap(machine_config &config); void brvteam_map(address_map &map); void canasta_map(address_map &map); void inder_map(address_map &map); void inder_sub_map(address_map &map); void lapbylap_map(address_map &map); void lapbylap_sub_map(address_map &map); -private: + void update_mus(); bool m_pc0; uint8_t m_game; diff --git a/src/mame/drivers/inderp.cpp b/src/mame/drivers/inderp.cpp index cb07d6a4cc7..a126b691ee4 100644 --- a/src/mame/drivers/inderp.cpp +++ b/src/mame/drivers/inderp.cpp @@ -32,13 +32,15 @@ public: , m_inputs(*this, "SW.%u", 0) { } + void inderp(machine_config &config); + +private: DECLARE_WRITE_LINE_MEMBER(clock_tick); DECLARE_WRITE8_MEMBER(inputs_w); DECLARE_READ8_MEMBER(inputs_r); - void inderp(machine_config &config); void maincpu_map(address_map &map); -private: + required_device m_maincpu; required_ioport_array<10> m_inputs; u8 m_inbank; diff --git a/src/mame/drivers/indiana.cpp b/src/mame/drivers/indiana.cpp index 3c8d2003bca..0dc1b19d87e 100644 --- a/src/mame/drivers/indiana.cpp +++ b/src/mame/drivers/indiana.cpp @@ -35,10 +35,14 @@ public: indiana_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, M68K_TAG) { } + + void indiana(machine_config &config); + void init_indiana(); + +private: virtual void machine_reset() override; required_device m_maincpu; - void indiana(machine_config &config); void indiana_mem(address_map &map); }; diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp index f92d42f2246..7d9b1939ccd 100644 --- a/src/mame/drivers/indigo.cpp +++ b/src/mame/drivers/indigo.cpp @@ -34,11 +34,6 @@ class indigo_state : public driver_device { public: - enum - { - TIMER_RTC - }; - indigo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") @@ -48,6 +43,15 @@ public: { } + void indigo4k(machine_config &config); + void indigo3k(machine_config &config); + +private: + enum + { + TIMER_RTC + }; + DECLARE_READ32_MEMBER(hpc_r); DECLARE_WRITE32_MEMBER(hpc_w); DECLARE_READ32_MEMBER(int_r); @@ -60,12 +64,10 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); static void cdrom_config(device_t *device); - void indigo4k(machine_config &config); - void indigo3k(machine_config &config); void indigo3k_map(address_map &map); void indigo4k_map(address_map &map); void indigo_map(address_map &map); -private: + struct hpc_t { uint8_t m_misc_status; @@ -95,7 +97,6 @@ private: inline void ATTR_PRINTF(3,4) verboselog(int n_level, const char *s_fmt, ... ); -protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index 7d9333ec74b..f93815ce62a 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -81,15 +81,18 @@ public: { } + void ip225015(machine_config &config); + void ip224613(machine_config &config); + void ip244415(machine_config &config); + + void init_ip225015(); + +private: virtual void machine_start() override; virtual void machine_reset() override; DECLARE_WRITE32_MEMBER(ip22_write_ram); - void init_ip225015(); - void ip225015(machine_config &config); - void ip224613(machine_config &config); - void ip244415(machine_config &config); void ip225015_map(address_map &map); static void cdrom_config(device_t *device); @@ -99,7 +102,6 @@ public: static const char* IOC2_TAG; static const char* RTC_TAG; -protected: required_device m_maincpu; required_shared_ptr m_mainram; required_device m_sgi_mc; diff --git a/src/mame/drivers/instantm.cpp b/src/mame/drivers/instantm.cpp index 661aebd69e5..7f45523161f 100644 --- a/src/mame/drivers/instantm.cpp +++ b/src/mame/drivers/instantm.cpp @@ -39,15 +39,17 @@ public: , m_maincpu(*this, "maincpu") { } + void instantm(machine_config &config); + +private: DECLARE_READ8_MEMBER(port01_r); DECLARE_WRITE8_MEMBER(port01_w); DECLARE_WRITE_LINE_MEMBER(clock_w); - void instantm(machine_config &config); void main_map(address_map &map); void sub_io(address_map &map); void sub_map(address_map &map); -private: + u8 m_port01; bool m_clock_en; virtual void machine_start() override; diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index 998d4633612..887c6b1796f 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -66,6 +66,10 @@ public: , m_digits(*this, "digit%u", 0U) { } + void instruct(machine_config &config); + +private: + DECLARE_READ8_MEMBER(port_r); DECLARE_READ8_MEMBER(portfc_r); DECLARE_READ8_MEMBER(portfd_r); @@ -78,11 +82,10 @@ public: DECLARE_WRITE8_MEMBER(portfa_w); DECLARE_QUICKLOAD_LOAD_MEMBER(instruct); INTERRUPT_GEN_MEMBER(t2l_int); - void instruct(machine_config &config); void data_map(address_map &map); void io_map(address_map &map); void mem_map(address_map &map); -private: + virtual void machine_reset() override; virtual void machine_start() override { m_digits.resolve(); } uint16_t m_lar; diff --git a/src/mame/drivers/inteladv.cpp b/src/mame/drivers/inteladv.cpp index 3ab31e40c33..40088572920 100644 --- a/src/mame/drivers/inteladv.cpp +++ b/src/mame/drivers/inteladv.cpp @@ -33,18 +33,18 @@ public: m_palette(*this, "palette") { } + void inteladv(machine_config &config); + +private: uint32_t screen_update_inteladv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void inteladv(machine_config &config); void inteladv_main(address_map &map); void inteladv(address_map &map); -protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; -private: required_device m_maincpu; required_device m_palette; }; diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp index cd2fc2e8e0b..9a199c37d5d 100644 --- a/src/mame/drivers/interact.cpp +++ b/src/mame/drivers/interact.cpp @@ -72,12 +72,15 @@ public: : hec2hrp_state(mconfig, type, tag), m_videoram(*this, "videoram") { } + void hector1(machine_config &config); + void interact(machine_config &config); + +private: + required_shared_ptr m_videoram; DECLARE_MACHINE_START(interact); DECLARE_MACHINE_RESET(interact); uint32_t screen_update_interact(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void hector1(machine_config &config); - void interact(machine_config &config); void interact_mem(address_map &map); }; diff --git a/src/mame/drivers/intrscti.cpp b/src/mame/drivers/intrscti.cpp index 89273429369..3b6afd2a03c 100644 --- a/src/mame/drivers/intrscti.cpp +++ b/src/mame/drivers/intrscti.cpp @@ -31,16 +31,19 @@ public: m_palette(*this, "palette") { } + void intrscti(machine_config &config); + + void init_intrscti(); + +private: required_device m_maincpu; required_device m_subcpu; required_shared_ptr m_vram; required_device m_gfxdecode; required_device m_palette; - void init_intrscti(); virtual void video_start() override; uint32_t screen_update_intrscti(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void intrscti(machine_config &config); void intrscti_io_map(address_map &map); void intrscti_map(address_map &map); void intrscti_sub_io_map(address_map &map); diff --git a/src/mame/drivers/invqix.cpp b/src/mame/drivers/invqix.cpp index e62c018a835..02b865e8a79 100644 --- a/src/mame/drivers/invqix.cpp +++ b/src/mame/drivers/invqix.cpp @@ -136,6 +136,9 @@ public: m_vram(*this, "vram") { } + void invqix(machine_config &config); + +private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_READ16_MEMBER(port3_r); @@ -149,10 +152,9 @@ public: DECLARE_WRITE16_MEMBER(vctl_w); - void invqix(machine_config &config); void invqix_io_map(address_map &map); void invqix_prg_map(address_map &map); -protected: + // devices required_device m_maincpu; required_device m_eeprom; @@ -161,7 +163,6 @@ protected: // driver_device overrides virtual void video_start() override; -private: uint16_t m_vctl; // 0000 for normal, 0001 for flip, 0100 when going to change (blank?) }; diff --git a/src/mame/drivers/ipc.cpp b/src/mame/drivers/ipc.cpp index 70ed53850aa..846aab5ac7e 100644 --- a/src/mame/drivers/ipc.cpp +++ b/src/mame/drivers/ipc.cpp @@ -55,9 +55,11 @@ public: { } void ipc(machine_config &config); + +private: void ipc_io(address_map &map); void ipc_mem(address_map &map); -private: + virtual void machine_reset() override; required_device m_maincpu; }; diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp index d9684c4990f..da688422ab2 100644 --- a/src/mame/drivers/ipds.cpp +++ b/src/mame/drivers/ipds.cpp @@ -27,6 +27,9 @@ public: { } + void ipds(machine_config &config); + +private: required_device m_maincpu; required_device m_crtc; required_device m_palette; @@ -38,7 +41,6 @@ public: I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels ); uint8_t m_term_data; virtual void machine_reset() override; - void ipds(machine_config &config); void ipds_io(address_map &map); void ipds_mem(address_map &map); }; diff --git a/src/mame/drivers/iqunlim.cpp b/src/mame/drivers/iqunlim.cpp index 094181d0d44..6d784233e91 100644 --- a/src/mame/drivers/iqunlim.cpp +++ b/src/mame/drivers/iqunlim.cpp @@ -64,10 +64,12 @@ public: m_maincpu(*this, "maincpu") { } + void iqunlim(machine_config &config); + +private: required_device m_maincpu; virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - void iqunlim(machine_config &config); void iqunlim_mem(address_map &map); }; diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp index 625d706c389..b397d02ef32 100644 --- a/src/mame/drivers/iris3130.cpp +++ b/src/mame/drivers/iris3130.cpp @@ -62,6 +62,11 @@ public: { } + void sgi_ip2(machine_config &config); + + void init_sgi_ip2(); + +private: DECLARE_READ8_MEMBER(sgi_ip2_m_but_r); DECLARE_WRITE8_MEMBER(sgi_ip2_m_but_w); DECLARE_READ16_MEMBER(sgi_ip2_m_quad_r); @@ -89,20 +94,18 @@ public: DECLARE_WRITE16_MEMBER(sgi_ip2_stkbase_w); DECLARE_READ16_MEMBER(sgi_ip2_stklmt_r); DECLARE_WRITE16_MEMBER(sgi_ip2_stklmt_w); - void init_sgi_ip2(); DECLARE_WRITE_LINE_MEMBER(duarta_irq_handler); DECLARE_WRITE_LINE_MEMBER(duartb_irq_handler); required_device m_maincpu; - void sgi_ip2(machine_config &config); void sgi_ip2_map(address_map &map); -protected: + required_shared_ptr m_mainram; required_device m_duarta; required_device m_duartb; required_shared_ptr m_bss; required_shared_ptr m_ptmap; required_device m_rtc; -private: + uint8_t m_mbut; uint16_t m_mquad; uint16_t m_tdbase; diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp index 084516faedb..71f54b853bd 100644 --- a/src/mame/drivers/irisha.cpp +++ b/src/mame/drivers/irisha.cpp @@ -39,6 +39,9 @@ public: , m_keyboard(*this, "LINE%u", 0) { } + void irisha(machine_config &config); + +private: DECLARE_READ8_MEMBER(irisha_keyboard_r); DECLARE_READ8_MEMBER(irisha_8255_portb_r); DECLARE_READ8_MEMBER(irisha_8255_portc_r); @@ -50,10 +53,9 @@ public: uint32_t screen_update_irisha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_shared_ptr m_p_videoram; - void irisha(machine_config &config); void irisha_io(address_map &map); void irisha_mem(address_map &map); -private: + bool m_sg1_line; bool m_keypressed; uint8_t m_keyboard_cnt; diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp index 58925540e74..46d8354e137 100644 --- a/src/mame/drivers/isbc.cpp +++ b/src/mame/drivers/isbc.cpp @@ -51,6 +51,14 @@ public: , m_leds(*this, "led%u", 0U) { } + void isbc2861(machine_config &config); + void isbc86(machine_config &config); + void rpc86(machine_config &config); + void isbc8605(machine_config &config); + void isbc286(machine_config &config); + void isbc8630(machine_config &config); + +private: DECLARE_WRITE_LINE_MEMBER(write_centronics_ack); DECLARE_WRITE_LINE_MEMBER(isbc86_tmr2_w); @@ -71,12 +79,6 @@ public: DECLARE_WRITE_LINE_MEMBER(led_ds1_w); DECLARE_WRITE_LINE_MEMBER(led_ds3_w); DECLARE_WRITE_LINE_MEMBER(megabyte_select_w); - void isbc2861(machine_config &config); - void isbc86(machine_config &config); - void rpc86(machine_config &config); - void isbc8605(machine_config &config); - void isbc286(machine_config &config); - void isbc8630(machine_config &config); void isbc2861_mem(address_map &map); void isbc286_io(address_map &map); void isbc286_mem(address_map &map); @@ -86,7 +88,7 @@ public: void isbc_io(address_map &map); void rpc86_io(address_map &map); void rpc86_mem(address_map &map); -protected: + virtual void machine_start() override { m_leds.resolve(); } virtual void machine_reset() override; @@ -103,7 +105,6 @@ protected: optional_shared_ptr m_biosram; output_finder<2> m_leds; -private: bool m_upperen; offs_t m_megabyte_page; bool m_nmi_enable; diff --git a/src/mame/drivers/isbc8010.cpp b/src/mame/drivers/isbc8010.cpp index 5a3058b4226..8073f8cdedc 100644 --- a/src/mame/drivers/isbc8010.cpp +++ b/src/mame/drivers/isbc8010.cpp @@ -54,18 +54,20 @@ public: , m_usart_clock_state(0) { } + void isbc8010b(machine_config &config); + void isbc8010a(machine_config &config); + void isbc8010(machine_config &config); + +private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER( usart_clock_tick ); - void isbc8010b(machine_config &config); - void isbc8010a(machine_config &config); - void isbc8010(machine_config &config); void isbc8010_io(address_map &map); void isbc8010_mem(address_map &map); void isbc8010a_mem(address_map &map); void isbc8010b_mem(address_map &map); -private: + required_device m_maincpu; required_device m_usart; required_device m_ppi_0; diff --git a/src/mame/drivers/isbc8030.cpp b/src/mame/drivers/isbc8030.cpp index 04ef886b99e..0cb5c28371f 100644 --- a/src/mame/drivers/isbc8030.cpp +++ b/src/mame/drivers/isbc8030.cpp @@ -58,9 +58,11 @@ public: { } void isbc8030(machine_config &config); + +private: void isbc8030_io(address_map &map); void isbc8030_mem(address_map &map); -private: + required_device m_maincpu; required_device m_usart; required_device m_ppi; diff --git a/src/mame/drivers/iskr103x.cpp b/src/mame/drivers/iskr103x.cpp index 9018f5f9927..673ebc57695 100644 --- a/src/mame/drivers/iskr103x.cpp +++ b/src/mame/drivers/iskr103x.cpp @@ -35,9 +35,11 @@ public: , m_maincpu(*this, "maincpu") { } - required_device m_maincpu; void iskr1030m(machine_config &config); void iskr1031(machine_config &config); + +private: + required_device m_maincpu; void iskr1031_io(address_map &map); void iskr1031_map(address_map &map); }; diff --git a/src/mame/drivers/itgambl2.cpp b/src/mame/drivers/itgambl2.cpp index 1580685cd05..2f5e53200ca 100644 --- a/src/mame/drivers/itgambl2.cpp +++ b/src/mame/drivers/itgambl2.cpp @@ -72,6 +72,9 @@ public: m_maincpu(*this, "maincpu"), m_palette(*this, "palette") { } + void itgambl2(machine_config &config); + +private: int m_test_x; int m_test_y; int m_start_offs; @@ -81,7 +84,6 @@ public: uint32_t screen_update_itgambl2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_palette; - void itgambl2(machine_config &config); void itgambl2_map(address_map &map); }; diff --git a/src/mame/drivers/itgambl3.cpp b/src/mame/drivers/itgambl3.cpp index cee1042acb0..3ce8f76c871 100644 --- a/src/mame/drivers/itgambl3.cpp +++ b/src/mame/drivers/itgambl3.cpp @@ -58,6 +58,9 @@ public: m_maincpu(*this, "maincpu"), m_palette(*this, "palette") { } + void itgambl3(machine_config &config); + +private: int m_test_x; int m_test_y; int m_start_offs; @@ -67,7 +70,6 @@ public: uint32_t screen_update_itgambl3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_palette; - void itgambl3(machine_config &config); void itgambl3_map(address_map &map); }; diff --git a/src/mame/drivers/itgamble.cpp b/src/mame/drivers/itgamble.cpp index 70f06aa88d4..12b225a8237 100644 --- a/src/mame/drivers/itgamble.cpp +++ b/src/mame/drivers/itgamble.cpp @@ -73,12 +73,13 @@ public: m_palette(*this, "palette") { } - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void mnumber(machine_config &config); void itgamble(machine_config &config); + +private: + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void itgamble_map(address_map &map); -protected: // devices required_device m_maincpu; diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp index 13e1d8efb6a..2f6251adb59 100644 --- a/src/mame/drivers/itt3030.cpp +++ b/src/mame/drivers/itt3030.cpp @@ -229,11 +229,12 @@ public: , m_palette(*this, "palette") { } + void itt3030(machine_config &config); + +private: // screen updates uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); -public: - DECLARE_READ8_MEMBER(vsync_r); DECLARE_WRITE8_MEMBER( beep_w ); DECLARE_WRITE8_MEMBER(bank_w); @@ -252,11 +253,10 @@ public: DECLARE_WRITE_LINE_MEMBER(fdchld_w); DECLARE_PALETTE_INIT(itt3030); - void itt3030(machine_config &config); void itt3030_io(address_map &map); void itt3030_map(address_map &map); void lower48_map(address_map &map); -protected: + // driver_device overrides virtual void machine_start() override; virtual void machine_reset() override; diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp index 20a2f045a8d..e74456d48d1 100644 --- a/src/mame/drivers/jackie.cpp +++ b/src/mame/drivers/jackie.cpp @@ -75,6 +75,13 @@ public: , m_lamps(*this, "lamp%u", 1U) { } + void jackie(machine_config &config); + + void init_jackie(); + + DECLARE_CUSTOM_INPUT_MEMBER(hopper_r); + +private: DECLARE_WRITE8_MEMBER(fg_tile_w); DECLARE_WRITE8_MEMBER(fg_color_w); DECLARE_WRITE8_MEMBER(bg_scroll_w); @@ -97,22 +104,18 @@ public: void unk_reg_hi_w( int offset, uint8_t data, int reg ); void show_out(); - DECLARE_CUSTOM_INPUT_MEMBER(hopper_r); TILE_GET_INFO_MEMBER(get_fg_tile_info); TILE_GET_INFO_MEMBER(get_reel1_tile_info); TILE_GET_INFO_MEMBER(get_reel2_tile_info); TILE_GET_INFO_MEMBER(get_reel3_tile_info); - void init_jackie(); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(irq); - void jackie(machine_config &config); void jackie_io_map(address_map &map); void jackie_prg_map(address_map &map); -protected: virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; diff --git a/src/mame/drivers/jackpool.cpp b/src/mame/drivers/jackpool.cpp index 5774f9a874b..e092f654c25 100644 --- a/src/mame/drivers/jackpool.cpp +++ b/src/mame/drivers/jackpool.cpp @@ -39,9 +39,13 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void jackpool(machine_config &config); + + void init_jackpool(); + +private: DECLARE_READ8_MEMBER(jackpool_io_r); DECLARE_WRITE_LINE_MEMBER(map_vreg_w); - void init_jackpool(); virtual void video_start() override; uint32_t screen_update_jackpool(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jackpool_interrupt); @@ -52,7 +56,6 @@ public: required_device m_eeprom; required_device m_gfxdecode; required_device m_palette; - void jackpool(machine_config &config); void jackpool_mem(address_map &map); }; diff --git a/src/mame/drivers/jade.cpp b/src/mame/drivers/jade.cpp index e6f6d5bb05b..12f99d56acd 100644 --- a/src/mame/drivers/jade.cpp +++ b/src/mame/drivers/jade.cpp @@ -34,9 +34,11 @@ public: { } void jade(machine_config &config); + +private: void io_map(address_map &map); void mem_map(address_map &map); -private: + required_device m_maincpu; }; diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp index 4a650a68392..dab1e3d8e1f 100644 --- a/src/mame/drivers/jankenmn.cpp +++ b/src/mame/drivers/jankenmn.cpp @@ -173,7 +173,7 @@ public: void jankenmn(machine_config &config); -protected: +private: DECLARE_WRITE8_MEMBER(lamps1_w); DECLARE_WRITE8_MEMBER(lamps2_w); DECLARE_WRITE8_MEMBER(lamps3_w); @@ -183,7 +183,6 @@ protected: void jankenmn_map(address_map &map); void jankenmn_port_map(address_map &map); -private: required_device m_maincpu; output_finder<2> m_digits; output_finder<16> m_lamps; diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp index 2cb5ae3af4a..77c08eaa652 100644 --- a/src/mame/drivers/jantotsu.cpp +++ b/src/mame/drivers/jantotsu.cpp @@ -114,6 +114,9 @@ public: m_adpcm(*this, "adpcm") , m_palette(*this, "palette"){ } + void jantotsu(machine_config &config); + +private: /* sound-related */ uint32_t m_adpcm_pos; uint8_t m_adpcm_idle; @@ -144,7 +147,6 @@ public: required_device m_maincpu; required_device m_adpcm; required_device m_palette; - void jantotsu(machine_config &config); void jantotsu_io(address_map &map); void jantotsu_map(address_map &map); }; diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp index becc0b404d7..1df789de95e 100644 --- a/src/mame/drivers/jchan.cpp +++ b/src/mame/drivers/jchan.cpp @@ -183,6 +183,11 @@ public: , m_ctrl(*this, "ctrl") { } + void jchan(machine_config &config); + + void init_jchan(); + +private: required_device m_maincpu; required_device m_subcpu; required_device m_palette; @@ -206,13 +211,11 @@ public: template DECLARE_WRITE16_MEMBER(sknsspr_sprite32_w); template DECLARE_WRITE16_MEMBER(sknsspr_sprite32regs_w); - void init_jchan(); virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(vblank); - void jchan(machine_config &config); void jchan_main(address_map &map); void jchan_sub(address_map &map); }; diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp index 2a85e252f56..8f2c6573ff4 100644 --- a/src/mame/drivers/jeutel.cpp +++ b/src/mame/drivers/jeutel.cpp @@ -42,7 +42,7 @@ public: void init_jeutel(); void jeutel(machine_config &config); -protected: +private: DECLARE_READ8_MEMBER(portb_r); DECLARE_WRITE8_MEMBER(porta_w); DECLARE_WRITE8_MEMBER(ppi0a_w); @@ -54,7 +54,6 @@ protected: void jeutel_cpu3_io(address_map &map); void jeutel_map(address_map &map); -private: bool m_timer_a; uint8_t m_sndcmd; uint8_t m_digit; diff --git a/src/mame/drivers/joctronic.cpp b/src/mame/drivers/joctronic.cpp index c3bac14cc78..ae963d7012a 100644 --- a/src/mame/drivers/joctronic.cpp +++ b/src/mame/drivers/joctronic.cpp @@ -28,6 +28,11 @@ public: , m_soundbank(*this, "soundbank") { } + void slalom03(machine_config &config); + void joctronic(machine_config &config); + void bldyrolr(machine_config &config); + +private: DECLARE_READ8_MEMBER(csin_r); DECLARE_WRITE8_MEMBER(control_port_w); DECLARE_WRITE8_MEMBER(display_1_w); @@ -59,9 +64,6 @@ public: virtual void machine_start() override; virtual void machine_reset() override; - void slalom03(machine_config &config); - void joctronic(machine_config &config); - void bldyrolr(machine_config &config); void bldyrolr_maincpu_map(address_map &map); void joctronic_sound_io_map(address_map &map); void joctronic_sound_map(address_map &map); @@ -70,7 +72,7 @@ public: void slalom03_maincpu_map(address_map &map); void slalom03_sound_io_map(address_map &map); void slalom03_sound_map(address_map &map); -private: + required_device m_maincpu; required_device m_soundcpu; optional_device m_oki; diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp index c6c27f7fcf5..21b026faafd 100644 --- a/src/mame/drivers/jokrwild.cpp +++ b/src/mame/drivers/jokrwild.cpp @@ -92,6 +92,11 @@ public: m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode") { } + void jokrwild(machine_config &config); + + void init_jokrwild(); + +private: required_shared_ptr m_videoram; required_shared_ptr m_colorram; tilemap_t *m_bg_tilemap; @@ -100,14 +105,12 @@ public: DECLARE_READ8_MEMBER(rng_r); DECLARE_WRITE8_MEMBER(testa_w); DECLARE_WRITE8_MEMBER(testb_w); - void init_jokrwild(); TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start() override; DECLARE_PALETTE_INIT(jokrwild); uint32_t screen_update_jokrwild(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device m_maincpu; required_device m_gfxdecode; - void jokrwild(machine_config &config); void jokrwild_map(address_map &map); }; diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp index 1cdee280013..fd45f919e17 100644 --- a/src/mame/drivers/jollyjgr.cpp +++ b/src/mame/drivers/jollyjgr.cpp @@ -141,6 +141,10 @@ public: m_bm_palette(*this, "bm_palette") { } + void fspider(machine_config &config); + void jollyjgr(machine_config &config); + +private: /* memory pointers */ required_shared_ptr m_videoram; required_shared_ptr m_colorram; @@ -175,8 +179,6 @@ public: required_device m_gfxdecode; required_device m_palette; required_device m_bm_palette; - void fspider(machine_config &config); - void jollyjgr(machine_config &config); void fspider_map(address_map &map); void jollyjgr_map(address_map &map); }; diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp index f26e21ddbe1..3641f690713 100644 --- a/src/mame/drivers/jonos.cpp +++ b/src/mame/drivers/jonos.cpp @@ -33,14 +33,16 @@ public: , m_p_chargen(*this, "chargen") { } + void jonos(machine_config &config); + +private: DECLARE_READ8_MEMBER(keyboard_r); DECLARE_WRITE8_MEMBER(cursor_w); u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void kbd_put(u8 data); - void jonos(machine_config &config); void jonos_mem(address_map &map); -private: + u8 m_framecnt; u8 m_term_data; u8 m_curs_ctrl; diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp index 7fa1b94e345..5a600622a73 100644 --- a/src/mame/drivers/joystand.cpp +++ b/src/mame/drivers/joystand.cpp @@ -133,6 +133,9 @@ public: m_outputs(*this, "outputs") { } + void joystand(machine_config &config); + +private: // devices required_device m_maincpu; required_device m_tmp68301; @@ -204,7 +207,6 @@ public: virtual void machine_start() override; virtual void machine_reset() override; INTERRUPT_GEN_MEMBER(joystand_interrupt); - void joystand(machine_config &config); void joystand_map(address_map &map); }; diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp index e2ab1017a7c..41faf918895 100644 --- a/src/mame/drivers/jp.cpp +++ b/src/mame/drivers/jp.cpp @@ -47,7 +47,7 @@ public: void jp(machine_config &config); void jps(machine_config &config); -protected: +private: DECLARE_READ8_MEMBER(porta_r); DECLARE_READ8_MEMBER(portb_r); DECLARE_WRITE8_MEMBER(out1_w); @@ -67,7 +67,6 @@ protected: void jp_map(address_map &map); void jp_sound_map(address_map &map); -private: void update_display(); uint32_t m_disp_data; diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp index c89465a1275..0d0f44eefa0 100644 --- a/src/mame/drivers/jpmmps.cpp +++ b/src/mame/drivers/jpmmps.cpp @@ -146,20 +146,22 @@ public: m_psg(*this, "sn"), m_meters(*this, "meters") { } + + void jpmmps(machine_config &config); + +private: uint8_t m_sound_buffer; uint8_t m_psg_latch; virtual void machine_reset() override; - void jpmmps(machine_config &config); void jpmmps_io_map(address_map &map); void jpmmps_map(address_map &map); -protected: // devices required_device m_maincpu; required_device m_psg; required_device m_meters; -public: + DECLARE_WRITE8_MEMBER(jpmmps_meters_w); DECLARE_WRITE8_MEMBER(jpmmps_psg_buf_w); DECLARE_WRITE8_MEMBER(jpmmps_ic22_portc_w); diff --git a/src/mame/drivers/jpms80.cpp b/src/mame/drivers/jpms80.cpp index 6fd0f20d8b7..ab091f72d7e 100644 --- a/src/mame/drivers/jpms80.cpp +++ b/src/mame/drivers/jpms80.cpp @@ -54,6 +54,13 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } + + void jpms80(machine_config &config); + + void init_jpms80(); + + +private: virtual void machine_reset() override; DECLARE_WRITE_LINE_MEMBER(int1_enable_w); @@ -61,15 +68,11 @@ public: DECLARE_WRITE_LINE_MEMBER(watchdog_w); DECLARE_WRITE_LINE_MEMBER(io_enable_w); - void jpms80(machine_config &config); void jpms80_io_map(address_map &map); void jpms80_map(address_map &map); -protected: // devices required_device m_maincpu; -public: - void init_jpms80(); }; WRITE_LINE_MEMBER(jpms80_state::int1_enable_w) diff --git a/src/mame/drivers/jpmsru.cpp b/src/mame/drivers/jpmsru.cpp index 5731ccb3662..f4feb09491e 100644 --- a/src/mame/drivers/jpmsru.cpp +++ b/src/mame/drivers/jpmsru.cpp @@ -32,15 +32,17 @@ public: void jpmsru(machine_config &config); void jpmsru_4(machine_config &config); + + void init_jpmsru(); + +private: void jpmsru_4_map(address_map &map); void jpmsru_io(address_map &map); void jpmsru_map(address_map &map); -protected: // devices required_device m_maincpu; public: - void init_jpmsru(); }; // blind guess diff --git a/src/mame/drivers/jpmsys7.cpp b/src/mame/drivers/jpmsys7.cpp index 777e3d45ff1..b61a2563cd0 100644 --- a/src/mame/drivers/jpmsys7.cpp +++ b/src/mame/drivers/jpmsys7.cpp @@ -34,8 +34,9 @@ public: { } void jpmsys7(machine_config &config); + +private: void jpmsys7_map(address_map &map); -protected: // devices required_device m_maincpu; diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp index 00e77364822..89988173412 100644 --- a/src/mame/drivers/jr100.cpp +++ b/src/mame/drivers/jr100.cpp @@ -51,6 +51,9 @@ public: m_line8(*this, "LINE8") , m_maincpu(*this, "maincpu") { } + void jr100(machine_config &config); + +private: required_shared_ptr m_ram; required_shared_ptr m_pcg; required_shared_ptr m_vram; @@ -73,9 +76,8 @@ public: DECLARE_QUICKLOAD_LOAD_MEMBER(jr100); - void jr100(machine_config &config); void jr100_mem(address_map &map); -protected: + required_device m_via; required_device m_cassette; required_device m_beeper; diff --git a/src/mame/drivers/jr200.cpp b/src/mame/drivers/jr200.cpp index 563c4862018..4da347d71ef 100644 --- a/src/mame/drivers/jr200.cpp +++ b/src/mame/drivers/jr200.cpp @@ -51,6 +51,9 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void jr200(machine_config &config); + +private: required_shared_ptr m_vram; required_shared_ptr m_cram; required_shared_ptr m_mn1271_ram; @@ -76,9 +79,8 @@ public: uint32_t screen_update_jr200(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(timer_d_callback); - void jr200(machine_config &config); void jr200_mem(address_map &map); -protected: + required_device m_maincpu; required_device m_beeper; required_memory_region m_pcg; diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp index d3b01cc5291..5cce0687c40 100644 --- a/src/mame/drivers/jrpacman.cpp +++ b/src/mame/drivers/jrpacman.cpp @@ -114,11 +114,15 @@ class jrpacman_state : public pacman_state public: jrpacman_state(const machine_config &mconfig, device_type type, const char *tag) : pacman_state(mconfig, type, tag) { } + + void jrpacman(machine_config &config); + + void init_jrpacman(); + +private: DECLARE_WRITE8_MEMBER(jrpacman_interrupt_vector_w); DECLARE_WRITE_LINE_MEMBER(irq_mask_w); - void init_jrpacman(); DECLARE_WRITE_LINE_MEMBER(vblank_irq); - void jrpacman(machine_config &config); void main_map(address_map &map); void port_map(address_map &map); }; diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp index 8d744d4e552..39ab0b410f4 100644 --- a/src/mame/drivers/jubilee.cpp +++ b/src/mame/drivers/jubilee.cpp @@ -217,6 +217,9 @@ public: m_lamps(*this, "lamp%u", 0U) { } + void jubileep(machine_config &config); + +private: DECLARE_WRITE8_MEMBER(jubileep_videoram_w); DECLARE_WRITE8_MEMBER(jubileep_colorram_w); DECLARE_WRITE8_MEMBER(unk_w); @@ -224,11 +227,9 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); uint32_t screen_update_jubileep(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jubileep_interrupt); - void jubileep(machine_config &config); void jubileep_cru_map(address_map &map); void jubileep_map(address_map &map); -protected: virtual void machine_start() override { m_lamps.resolve(); } virtual void video_start() override; diff --git a/src/mame/drivers/juicebox.cpp b/src/mame/drivers/juicebox.cpp index dab59e93e21..aca44325b06 100644 --- a/src/mame/drivers/juicebox.cpp +++ b/src/mame/drivers/juicebox.cpp @@ -43,6 +43,13 @@ public: , m_smartmedia(*this, "smartmedia") { } + void juicebox(machine_config &config); + + void init_juicebox(); + + DECLARE_INPUT_CHANGED_MEMBER(port_changed); + +private: required_device m_maincpu; required_device m_s3c44b0; required_device m_smartmedia; @@ -54,10 +61,8 @@ public: #endif DECLARE_READ32_MEMBER(juicebox_nand_r); DECLARE_WRITE32_MEMBER(juicebox_nand_w); - void init_juicebox(); 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); void smc_reset(); void smc_init(); @@ -66,7 +71,6 @@ public: DECLARE_READ32_MEMBER(s3c44b0_gpio_port_r); DECLARE_WRITE32_MEMBER(s3c44b0_gpio_port_w); DECLARE_WRITE16_MEMBER(s3c44b0_i2s_data_w); - void juicebox(machine_config &config); void juicebox_map(address_map &map); }; diff --git a/src/mame/drivers/jungleyo.cpp b/src/mame/drivers/jungleyo.cpp index 5d14ac70ba6..de732f955e8 100644 --- a/src/mame/drivers/jungleyo.cpp +++ b/src/mame/drivers/jungleyo.cpp @@ -56,14 +56,13 @@ public: void jungleyo(machine_config &config); -public: +private: /* video-related */ virtual void video_start() override; uint32_t screen_update_jungleyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void jungleyo_map(address_map &map); -private: required_device m_maincpu; required_device m_gfxdecode; }; diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp index 32d37542c0f..35eeaaf6652 100644 --- a/src/mame/drivers/junior.cpp +++ b/src/mame/drivers/junior.cpp @@ -47,7 +47,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(junior_reset); void junior(machine_config &config); -protected: +private: DECLARE_READ8_MEMBER(junior_riot_a_r); DECLARE_READ8_MEMBER(junior_riot_b_r); DECLARE_WRITE8_MEMBER(junior_riot_a_w); @@ -59,7 +59,6 @@ protected: void junior_mem(address_map &map); -private: required_device m_riot; uint8_t m_port_a; uint8_t m_port_b; diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp index 19050485088..7fa79b44042 100644 --- a/src/mame/drivers/junofrst.cpp +++ b/src/mame/drivers/junofrst.cpp @@ -115,7 +115,7 @@ public: void junofrst(machine_config &config); -protected: +private: DECLARE_WRITE8_MEMBER(blitter_w); DECLARE_WRITE8_MEMBER(bankselect_w); DECLARE_WRITE8_MEMBER(sh_irqtrigger_w); @@ -133,7 +133,6 @@ protected: void mcu_io_map(address_map &map); void mcu_map(address_map &map); -private: required_device m_audiocpu; required_device m_i8039; required_device m_filter_0_0; diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp index b1491881555..ee2239a680b 100644 --- a/src/mame/drivers/jupace.cpp +++ b/src/mame/drivers/jupace.cpp @@ -98,6 +98,9 @@ public: , m_joy(*this, "JOY") { } + void ace(machine_config &config); + +private: virtual void machine_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -129,10 +132,9 @@ public: DECLARE_WRITE8_MEMBER(ald_w); DECLARE_SNAPSHOT_LOAD_MEMBER( ace ); - void ace(machine_config &config); void ace_io(address_map &map); void ace_mem(address_map &map); -private: + required_device m_maincpu; required_device m_ppi; required_device m_z80pio; diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp index bfa4d7a0012..827561807d5 100644 --- a/src/mame/drivers/jupiter.cpp +++ b/src/mame/drivers/jupiter.cpp @@ -54,11 +54,13 @@ public: , m_acia1(*this, "acia1") { } + void jupiter2(machine_config &config); + void init_jupiter2(); - void jupiter2(machine_config &config); - void jupiter2_mem(address_map &map); private: + void jupiter2_mem(address_map &map); + virtual void machine_start() override; required_device m_maincpu; required_device m_acia0; @@ -75,18 +77,21 @@ public: , m_p_ram(*this, "ram") , m_p_chargen(*this, "chargen") { } + + void jupiter3(machine_config &config); + + void init_jupiter3(); +private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void init_jupiter3(); void kbd_put(u8 data); DECLARE_READ8_MEMBER(status_r); DECLARE_READ8_MEMBER(key_r); DECLARE_READ8_MEMBER(ff_r); - void jupiter3(machine_config &config); void jupiter3_io(address_map &map); void jupiter3_mem(address_map &map); -private: + virtual void machine_reset() override; uint8_t m_term_data; required_device m_maincpu; diff --git a/src/mame/drivers/jvh.cpp b/src/mame/drivers/jvh.cpp index ac936793cf9..5dcfd10de99 100644 --- a/src/mame/drivers/jvh.cpp +++ b/src/mame/drivers/jvh.cpp @@ -23,19 +23,19 @@ public: void jvh2(machine_config &config); void jvh(machine_config &config); + + void init_jvh(); + +private: void escape_io(address_map &map); void jvh_map(address_map &map); void jvh_sub_map(address_map &map); void movmastr_io(address_map &map); -protected: - // devices required_device m_maincpu; // driver_device overrides virtual void machine_reset() override; -public: - void init_jvh(); }; diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index ecca52469d9..341adeb623d 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -18,6 +18,9 @@ public: m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode") { } + void hanaawas(machine_config &config); + +private: /* memory pointers */ required_shared_ptr m_videoram; required_shared_ptr m_colorram; @@ -44,7 +47,6 @@ public: DECLARE_WRITE8_MEMBER(hanaawas_portB_w); required_device m_maincpu; required_device m_gfxdecode; - void hanaawas(machine_config &config); void hanaawas_map(address_map &map); void io_map(address_map &map); }; diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index 2cc9e28cb15..6c0caf03724 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -56,6 +56,18 @@ DECLARE_DEVICE_TYPE(HARDDRIV_SOUND_BOARD, harddriv_sound_board_device) class harddriv_state : public device_t { public: + harddriv_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + void driver_msp(machine_config &config); + void driver_nomsp(machine_config &config); + void multisync_msp(machine_config &config); + void multisync_nomsp(machine_config &config); + void dsk(machine_config &config); + void dsk2(machine_config &config); + void ds3(machine_config &config); + void multisync2(machine_config &config); + void adsp(machine_config &config); + void init_strtdriv(void); void init_harddriv(void); @@ -81,6 +93,11 @@ public: mc68681_device* get_duart() { return m_duartn68681; } screen_device* get_screen() { return m_screen; } + DECLARE_WRITE_LINE_MEMBER(video_int_write_line); + DECLARE_WRITE_LINE_MEMBER(sound_int_write_line); + +private: + void init_video(); INTERRUPT_GEN_MEMBER(hd68k_irq_gen); TIMER_CALLBACK_MEMBER(deferred_adsp_bank_switch); @@ -203,10 +220,6 @@ public: TMS340X0_TO_SHIFTREG_CB_MEMBER(hdgsp_write_to_shiftreg); TMS340X0_FROM_SHIFTREG_CB_MEMBER(hdgsp_read_from_shiftreg); - DECLARE_WRITE_LINE_MEMBER(video_int_write_line); - DECLARE_WRITE_LINE_MEMBER(sound_int_write_line); - - /* DSK board */ DECLARE_WRITE16_MEMBER( hd68k_dsk_control_w ); DECLARE_READ16_MEMBER( hd68k_dsk_ram_r ); @@ -256,15 +269,6 @@ public: DECLARE_READ32_MEMBER(hdds3xdsp_serial_rx_callback); - void driver_msp(machine_config &config); - void driver_nomsp(machine_config &config); - void multisync_msp(machine_config &config); - void multisync_nomsp(machine_config &config); - void dsk(machine_config &config); - void dsk2(machine_config &config); - void ds3(machine_config &config); - void multisync2(machine_config &config); - void adsp(machine_config &config); void adsp_data_map(address_map &map); void adsp_program_map(address_map &map); void driver_68k_map(address_map &map); @@ -282,8 +286,6 @@ public: void multisync2_gsp_map(address_map &map); void multisync_68k_map(address_map &map); void multisync_gsp_map(address_map &map); -protected: - harddriv_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); required_device m_maincpu; required_device m_gsp; @@ -509,6 +511,8 @@ public: DECLARE_WRITE16_MEMBER(hd68k_snd_data_w); DECLARE_WRITE16_MEMBER(hd68k_snd_reset_w); +private: + DECLARE_READ16_MEMBER(hdsnd68k_data_r); DECLARE_WRITE16_MEMBER(hdsnd68k_data_w); DECLARE_READ16_MEMBER(hdsnd68k_switches_r); @@ -541,12 +545,11 @@ public: void driversnd_68k_map(address_map &map); void driversnd_dsp_io_map(address_map &map); void driversnd_dsp_program_map(address_map &map); -protected: + virtual void device_start() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; -private: required_device m_soundcpu; required_device m_latch; required_device m_dac; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index b7c860afa26..411e33f0a96 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -28,6 +28,9 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void hcastle(machine_config &config); + +private: required_device m_spriteram; required_device m_spriteram2; /* memory pointers */ @@ -72,7 +75,6 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; - void hcastle(machine_config &config); void hcastle_map(address_map &map); void sound_map(address_map &map); }; diff --git a/src/mame/includes/hec2hrp.h b/src/mame/includes/hec2hrp.h index 9690982d778..feca946642d 100644 --- a/src/mame/includes/hec2hrp.h +++ b/src/mame/includes/hec2hrp.h @@ -99,9 +99,21 @@ public: m_printer(*this, "printer") {} - DECLARE_WRITE8_MEMBER(minidisc_control_w); + void hec2mx80(machine_config &config); + void hec2hrp(machine_config &config); + void hec2hrx(machine_config &config); + void hec2mx40(machine_config &config); + void hec2mdhrx(machine_config &config); + void hec2hr(machine_config &config); + void hector_audio(machine_config &config); + + void hector_init(); + +protected: + DECLARE_VIDEO_START(hec2hrp); + void hector_hr(bitmap_ind16 &bitmap, uint8_t *page, int ymax, int yram); + void hector_reset(int hr, int with_d2); - DECLARE_WRITE8_MEMBER(switch_bank_w); DECLARE_WRITE8_MEMBER(keyboard_w); DECLARE_READ8_MEMBER(keyboard_r); DECLARE_WRITE8_MEMBER(sn_2000_w); @@ -110,6 +122,11 @@ public: DECLARE_WRITE8_MEMBER(sn_3000_w); DECLARE_WRITE8_MEMBER(color_a_w); DECLARE_WRITE8_MEMBER(color_b_w); + +private: + DECLARE_WRITE8_MEMBER(minidisc_control_w); + + DECLARE_WRITE8_MEMBER(switch_bank_w); DECLARE_READ8_MEMBER(io_8255_r); DECLARE_WRITE8_MEMBER(io_8255_w); DECLARE_WRITE8_MEMBER(mx40_io_port_w); @@ -127,15 +144,6 @@ public: DECLARE_READ8_MEMBER( disc2_io50_port_r); DECLARE_WRITE8_MEMBER( disc2_io50_port_w); - void hec2mx80(machine_config &config); - void hec2hrp(machine_config &config); - void hec2hrx(machine_config &config); - void hec2mx40(machine_config &config); - void hec2mdhrx(machine_config &config); - void hec2hr(machine_config &config); - void hector_audio(machine_config &config); - -protected: DECLARE_FLOPPY_FORMATS(minidisc_formats); required_device m_maincpu; @@ -196,7 +204,6 @@ protected: DECLARE_MACHINE_START(hec2hrp); DECLARE_MACHINE_RESET(hec2hrp); - DECLARE_VIDEO_START(hec2hrp); DECLARE_MACHINE_START(hec2hrx); DECLARE_MACHINE_RESET(hec2hrx); DECLARE_MACHINE_START(hec2mdhrx); @@ -213,11 +220,8 @@ protected: void update_state(int Adresse, int Value ); void init_sn76477(); void update_sound(address_space &space, uint8_t data); - void hector_reset(int hr, int with_d2); - void hector_init(); void init_palette(); void hector_80c(bitmap_ind16 &bitmap, uint8_t *page, int ymax, int yram); - void hector_hr(bitmap_ind16 &bitmap, uint8_t *page, int ymax, int yram); /*----------- defined in machine/hecdisk2.c -----------*/ void hector_disc2_reset(); diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index 780300d29e9..8cfeb213714 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -14,6 +14,10 @@ public: m_gfxdecode(*this, "gfxdecode") { } + void hexion(machine_config &config); + void hexionb(machine_config &config); + +private: required_device m_maincpu; required_device m_k053252; required_device m_gfxdecode; @@ -47,8 +51,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); inline void get_tile_info(tile_data &tileinfo,int tile_index,uint8_t *ram); - void hexion(machine_config &config); - void hexionb(machine_config &config); void hexion_map(address_map &map); void hexionb_map(address_map &map); }; diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index c6229ecd8fd..9c8b595ee34 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -21,6 +21,9 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void higemaru(machine_config &config); + +private: /* memory pointers */ required_shared_ptr m_videoram; required_shared_ptr m_colorram; @@ -40,6 +43,5 @@ public: required_device m_maincpu; required_device m_gfxdecode; required_device m_palette; - void higemaru(machine_config &config); void higemaru_map(address_map &map); }; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index afde7eab7d8..656484a568e 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -24,6 +24,9 @@ public: m_palette(*this, "palette"), m_soundlatch(*this, "soundlatch") { } + void himesiki(machine_config &config); + +private: /* memory pointers */ required_shared_ptr m_bg_ram; required_shared_ptr m_spriteram_p103a; @@ -54,7 +57,6 @@ public: virtual void video_start() override; uint32_t screen_update_himesiki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void himesiki_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void himesiki(machine_config &config); void himesiki_iom0(address_map &map); void himesiki_iom1(address_map &map); void himesiki_prm0(address_map &map); diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index bfc2a61103e..7778c11c907 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -30,6 +30,10 @@ public: m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen") { } + void hitme(machine_config &config); + void barricad(machine_config &config); + +private: /* memory pointers */ required_shared_ptr m_videoram; @@ -58,8 +62,6 @@ public: required_device m_discrete; required_device m_gfxdecode; required_device m_screen; - void hitme(machine_config &config); - void barricad(machine_config &config); void hitme_map(address_map &map); void hitme_portmap(address_map &map); }; diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index 1ef6baeee63..7e3d34dcc27 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -18,6 +18,13 @@ public: m_msm(*this, "msm"), m_palette(*this, "palette") { } + void untoucha(machine_config &config); + void hnayayoi(machine_config &config); + void hnfubuki(machine_config &config); + + void init_hnfubuki(); + +private: /* video-related */ std::unique_ptr m_pixmap[8]; int m_palbank; @@ -40,7 +47,6 @@ public: DECLARE_WRITE_LINE_MEMBER(coin_counter_w); DECLARE_WRITE_LINE_MEMBER(nmi_enable_w); DECLARE_WRITE_LINE_MEMBER(nmi_clock_w); - void init_hnfubuki(); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; @@ -54,9 +60,6 @@ public: required_device m_maincpu; required_device m_msm; required_device m_palette; - void untoucha(machine_config &config); - void hnayayoi(machine_config &config); - void hnfubuki(machine_config &config); void hnayayoi_io_map(address_map &map); void hnayayoi_map(address_map &map); void hnfubuki_map(address_map &map); diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h index 4a56cf74382..058b04f8e80 100644 --- a/src/mame/includes/hng64.h +++ b/src/mame/includes/hng64.h @@ -139,6 +139,8 @@ class hng64_state : public driver_device public: hng64_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), + m_screen(*this, "screen"), + m_palette(*this, "palette"), m_maincpu(*this, "maincpu"), m_audiocpu(*this, "audiocpu"), m_dsp(*this, "l7a1045"), @@ -158,10 +160,29 @@ public: m_3d_1(*this, "3d_1"), m_3d_2(*this, "3d_2"), m_com_ram(*this, "com_ram"), - m_gfxdecode(*this, "gfxdecode"), - m_screen(*this, "screen"), - m_palette(*this, "palette") { } + m_gfxdecode(*this, "gfxdecode") + {} + + void hng64(machine_config &config); + + void init_hng64_race(); + void init_fatfurwa(); + void init_buriki(); + void init_hng64(); + void init_hng64_shoot(); + void init_ss64(); + void init_hng64_fght(); + + DECLARE_CUSTOM_INPUT_MEMBER(left_handle_r); + DECLARE_CUSTOM_INPUT_MEMBER(right_handle_r); + DECLARE_CUSTOM_INPUT_MEMBER(acc_down_r); + DECLARE_CUSTOM_INPUT_MEMBER(brake_down_r); + + uint8_t *m_texturerom; + required_device m_screen; + required_device m_palette; +private: required_device m_maincpu; required_device m_audiocpu; required_device m_dsp; @@ -188,8 +209,6 @@ public: //required_shared_ptr m_com_mmu_mem; required_device m_gfxdecode; - required_device m_screen; - required_device m_palette; int m_mcu_type; @@ -283,13 +302,7 @@ public: DECLARE_WRITE8_MEMBER(hng64_comm_space_w); DECLARE_READ8_MEMBER(hng64_comm_mmu_r); DECLARE_WRITE8_MEMBER(hng64_comm_mmu_w); - void init_hng64_race(); - void init_fatfurwa(); - void init_buriki(); - void init_hng64(); - void init_hng64_shoot(); - void init_ss64(); - void init_hng64_fght(); + void init_hng64_reorder_gfx(); void set_irq(uint32_t irq_vector); @@ -335,17 +348,12 @@ public: - DECLARE_CUSTOM_INPUT_MEMBER(left_handle_r); - DECLARE_CUSTOM_INPUT_MEMBER(right_handle_r); - DECLARE_CUSTOM_INPUT_MEMBER(acc_down_r); - DECLARE_CUSTOM_INPUT_MEMBER(brake_down_r); std::unique_ptr m_poly_renderer; TIMER_CALLBACK_MEMBER(hng64_3dfifo_processed); emu_timer *m_3dfifo_timer; - uint8_t *m_texturerom; uint16_t* m_vertsrom; int m_vertsrom_size; std::vector m_polys; // HNG64_MAX_POLYGONS @@ -394,7 +402,6 @@ public: DECLARE_WRITE16_MEMBER(sound_comms_w); uint16_t main_latch[2]; uint16_t sound_latch[2]; - void hng64(machine_config &config); void hng64_audio(machine_config &config); void hng64_network(machine_config &config); void hng_comm_io_map(address_map &map); diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index a18185823bb..2c4897bd223 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -22,7 +22,10 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram") { } + void crzrally(machine_config &config); + void holeland(machine_config &config); +private: /* devices */ required_device m_maincpu; required_device m_gfxdecode; @@ -57,8 +60,6 @@ public: uint32_t screen_update_crzrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void holeland_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void crzrally_draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); - void crzrally(machine_config &config); - void holeland(machine_config &config); void crzrally_map(address_map &map); void holeland_map(address_map &map); void io_map(address_map &map); diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index 965777d4dfa..44fb0738bbc 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -23,6 +23,20 @@ public: { } + void reikaids(machine_config &config); + void mrokumei(machine_config &config); + void mirderby(machine_config &config); + void pteacher(machine_config &config); + void lemnangl(machine_config &config); + void mjkinjas(machine_config &config); + + void init_reikaids(); + void init_mjikaga(); + void init_jogakuen(); + void init_battlcry(); + void init_mirderby(); + +private: /* memory pointers */ optional_shared_ptr m_vreg; required_shared_ptr m_videoram; @@ -92,11 +106,6 @@ public: DECLARE_WRITE8_MEMBER(mrokumei_blitter_start_w); DECLARE_WRITE8_MEMBER(reikaids_blitter_start_w); DECLARE_WRITE8_MEMBER(pteacher_blitter_start_w); - void init_reikaids(); - void init_mjikaga(); - void init_jogakuen(); - void init_battlcry(); - void init_mirderby(); TILE_GET_INFO_MEMBER(mrokumei_get_info0_0); TILE_GET_INFO_MEMBER(mrokumei_get_info1_0); TILE_GET_INFO_MEMBER(mrokumei_get_info0_1); @@ -153,12 +162,6 @@ public: inline void lemnangl_info( tile_data &tileinfo, int tile_index, int page, int layer, int gfxset, int gfxbank ); inline void mirderby_info0( tile_data &tileinfo, int tile_index, int page, int gfxbank ); inline void mirderby_info1( tile_data &tileinfo, int tile_index, int page, int gfxbank ); - void reikaids(machine_config &config); - void mrokumei(machine_config &config); - void mirderby(machine_config &config); - void pteacher(machine_config &config); - void lemnangl(machine_config &config); - void mjkinjas(machine_config &config); void cpu0_map(address_map &map); void cpu1_map(address_map &map); void cpu2_map(address_map &map); diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index 42d35139ff3..9df6781da45 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -27,6 +27,16 @@ public: m_palette(*this, "palette") { } + void ganjaja(machine_config &config); + void dynashot(machine_config &config); + void homerun(machine_config &config); + + DECLARE_CUSTOM_INPUT_MEMBER(homerun_sprite0_r); + DECLARE_CUSTOM_INPUT_MEMBER(homerun_d7756_busy_r); + DECLARE_CUSTOM_INPUT_MEMBER(ganjaja_d7756_busy_r); + DECLARE_CUSTOM_INPUT_MEMBER(ganjaja_hopper_status_r); + +private: required_device m_maincpu; required_shared_ptr m_videoram; required_shared_ptr m_spriteram; @@ -53,11 +63,6 @@ public: DECLARE_WRITE8_MEMBER(homerun_scrolly_w); DECLARE_WRITE8_MEMBER(homerun_scrollx_w); - DECLARE_CUSTOM_INPUT_MEMBER(homerun_sprite0_r); - DECLARE_CUSTOM_INPUT_MEMBER(homerun_d7756_busy_r); - DECLARE_CUSTOM_INPUT_MEMBER(ganjaja_d7756_busy_r); - DECLARE_CUSTOM_INPUT_MEMBER(ganjaja_hopper_status_r); - TILE_GET_INFO_MEMBER(get_homerun_tile_info); virtual void machine_start() override; virtual void machine_reset() override; @@ -65,9 +70,6 @@ public: uint32_t screen_update_homerun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(homerun_banking_w); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void ganjaja(machine_config &config); - void dynashot(machine_config &config); - void homerun(machine_config &config); void homerun_iomap(address_map &map); void homerun_memmap(address_map &map); }; diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h index 6abd0798496..3582f1e219b 100644 --- a/src/mame/includes/hp48.h +++ b/src/mame/includes/hp48.h @@ -61,10 +61,27 @@ public: , m_screen(*this, "screen") , m_port(*this, "port%u", 1U) {} + void hp48s(machine_config &config); + void hp48gp(machine_config &config); + void hp48sx(machine_config &config); + void hp48g(machine_config &config); + void hp48gx(machine_config &config); + void hp49g(machine_config &config); + + void init_hp48(); + + /* from highest to lowest priority: HDW, NCE2, CE1, CE2, NCE3, NCE1 */ + hp48_module m_modules[6]; + + void decode_nibble(uint8_t* dst, uint8_t* src, int size); + void encode_nibble(uint8_t* dst, uint8_t* src, int size); + + void apply_modules(); + +private: virtual void machine_reset() override; void base_machine_start(hp48_models model); - void init_hp48(); DECLARE_PALETTE_INIT(hp48); DECLARE_MACHINE_START(hp49g); DECLARE_MACHINE_START(hp48gx); @@ -83,15 +100,12 @@ public: TIMER_CALLBACK_MEMBER(timer1_cb); TIMER_CALLBACK_MEMBER(timer2_cb); void update_annunciators(); - void apply_modules(); void pulse_irq(int irq_line); void rs232_start_recv_byte(uint8_t data); void rs232_send_byte(); int get_in(); void update_kdn(); void reset_modules(); - void decode_nibble(uint8_t* dst, uint8_t* src, int size); - void encode_nibble(uint8_t* dst, uint8_t* src, int size); /* memory controller */ DECLARE_WRITE_LINE_MEMBER(mem_reset); @@ -109,12 +123,6 @@ public: /* keyboard interrupt system */ DECLARE_WRITE_LINE_MEMBER(rsi); void hp48_common(machine_config &config); - void hp48s(machine_config &config); - void hp48gp(machine_config &config); - void hp48sx(machine_config &config); - void hp48g(machine_config &config); - void hp48gx(machine_config &config); - void hp49g(machine_config &config); void hp48(address_map &map); required_device m_maincpu; @@ -132,9 +140,6 @@ public: /* keyboard interrupt */ uint8_t m_kdn; - /* from highest to lowest priority: HDW, NCE2, CE1, CE2, NCE3, NCE1 */ - hp48_module m_modules[6]; - /* RAM/ROM extensions, GX/SX only port1: SX/GX: 32/128 KB port2: SX:32/128KB, GX:128/512/4096 KB diff --git a/src/mame/includes/huebler.h b/src/mame/includes/huebler.h index 4f7107ee6d8..05f88881925 100644 --- a/src/mame/includes/huebler.h +++ b/src/mame/includes/huebler.h @@ -39,6 +39,9 @@ public: , m_key_a8(1) { } + void amu880(machine_config &config); + +private: required_device m_cassette; required_device m_z80sio; required_device m_palette; @@ -69,7 +72,6 @@ public: DECLARE_WRITE_LINE_MEMBER(ctc_z0_w); DECLARE_WRITE_LINE_MEMBER(ctc_z2_w); DECLARE_WRITE_LINE_MEMBER(cassette_w); - void amu880(machine_config &config); void amu880_io(address_map &map); void amu880_mem(address_map &map); }; diff --git a/src/mame/includes/hx20.h b/src/mame/includes/hx20.h index 9ef8a2b7938..c21acf72619 100644 --- a/src/mame/includes/hx20.h +++ b/src/mame/includes/hx20.h @@ -69,6 +69,10 @@ public: m_kbrequest(1) { } + void cm6000(machine_config &config); + void hx20(machine_config &config); + +private: required_device m_maincpu; required_device m_subcpu; required_device m_rtc; @@ -144,8 +148,6 @@ public: // sio state int m_sio_rx; int m_sio_pin; - void cm6000(machine_config &config); - void hx20(machine_config &config); void cm6000_mem(address_map &map); void hx20_io(address_map &map); void hx20_mem(address_map &map); diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index 605562238e3..b257b860e19 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -6,11 +6,6 @@ class hyhoo_state : public driver_device { public: - enum - { - TIMER_BLITTER - }; - hyhoo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), @@ -18,6 +13,17 @@ public: m_screen(*this, "screen"), m_clut(*this, "clut") { } + void hyhoo(machine_config &config); + void hyhoo2(machine_config &config); + + DECLARE_CUSTOM_INPUT_MEMBER(nb1413m3_busyflag_r); + +private: + enum + { + TIMER_BLITTER + }; + required_device m_maincpu; required_device m_nb1413m3; required_device m_screen; @@ -40,17 +46,13 @@ public: DECLARE_WRITE8_MEMBER(hyhoo_blitter_w); DECLARE_WRITE8_MEMBER(hyhoo_romsel_w); - DECLARE_CUSTOM_INPUT_MEMBER(nb1413m3_busyflag_r); - virtual void video_start() override; uint32_t screen_update_hyhoo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void hyhoo_gfxdraw(); - void hyhoo(machine_config &config); - void hyhoo2(machine_config &config); void hyhoo_io_map(address_map &map); void hyhoo_map(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/includes/hyperspt.h b/src/mame/includes/hyperspt.h index ffb967c9ce6..4d7cc66cd40 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -32,6 +32,11 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void hyperspt(machine_config &config); + void roadf(machine_config &config); + void hypersptb(machine_config &config); + +private: /* memory pointers */ required_shared_ptr m_spriteram; required_shared_ptr m_scroll; @@ -74,9 +79,6 @@ public: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - void hyperspt(machine_config &config); - void roadf(machine_config &config); - void hypersptb(machine_config &config); void common_map(address_map &map); void common_sound_map(address_map &map); void hyperspt_map(address_map &map); diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index f898e9d354f..342ef148d5f 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -24,6 +24,9 @@ public: m_screen(*this, "screen"), m_palette(*this, "palette") { } + void ikki(machine_config &config); + +private: required_device m_maincpu; required_device m_subcpu; /* memory pointers */ @@ -51,7 +54,6 @@ public: uint32_t screen_update_ikki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(ikki_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void ikki(machine_config &config); void ikki_cpu1(address_map &map); void ikki_cpu2(address_map &map); }; diff --git a/src/mame/includes/imds2.h b/src/mame/includes/imds2.h index c06e9cbb93c..94a9894cf61 100644 --- a/src/mame/includes/imds2.h +++ b/src/mame/includes/imds2.h @@ -21,9 +21,12 @@ class imds2_state : public driver_device { - public: +public: imds2_state(const machine_config &mconfig, device_type type, const char *tag); + void imds2(machine_config &config); + +private: DECLARE_READ8_MEMBER(ipc_mem_read); DECLARE_WRITE8_MEMBER(ipc_mem_write); DECLARE_WRITE8_MEMBER(imds2_ipc_control_w); @@ -73,18 +76,17 @@ class imds2_state : public driver_device virtual void video_start() override; virtual void machine_reset() override; - void imds2(machine_config &config); void ioc_io_map(address_map &map); void ioc_mem_map(address_map &map); void ipc_io_map(address_map &map); void ipc_mem_map(address_map &map); - private: + required_device m_ipccpu; required_device m_ipcsyspic; required_device m_ipclocpic; required_device m_ipctimer; - required_device m_ipcusart0; - required_device m_ipcusart1; + required_device m_ipcusart0; + required_device m_ipcusart1; required_device m_serial0; required_device m_serial1; required_device m_ioccpu; diff --git a/src/mame/includes/intv.h b/src/mame/includes/intv.h index 2dec630b1b0..67d9001fa71 100644 --- a/src/mame/includes/intv.h +++ b/src/mame/includes/intv.h @@ -30,13 +30,6 @@ class intv_state : public driver_device { public: - enum - { - TIMER_INTV_INTERRUPT2_COMPLETE, - TIMER_INTV_INTERRUPT_COMPLETE, - TIMER_INTV_BTB_FILL - }; - intv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), @@ -56,6 +49,24 @@ public: m_palette(*this, "palette") { } + void intvkbd(machine_config &config); + void intv2(machine_config &config); + void intvoice(machine_config &config); + void intvecs(machine_config &config); + void intv(machine_config &config); + + void init_intvecs(); + void init_intvkbd(); + void init_intv(); + +private: + enum + { + TIMER_INTV_INTERRUPT2_COMPLETE, + TIMER_INTV_INTERRUPT_COMPLETE, + TIMER_INTV_BTB_FILL + }; + required_device m_maincpu; required_device m_sound; required_device m_stic; @@ -104,9 +115,6 @@ public: int m_tape_interrupts_enabled; int m_tape_motor_mode; - void init_intvecs(); - void init_intvkbd(); - void init_intv(); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; @@ -119,18 +127,13 @@ public: TIMER_CALLBACK_MEMBER(intv_interrupt_complete); TIMER_CALLBACK_MEMBER(intv_btb_fill); - void intvkbd(machine_config &config); - void intv2(machine_config &config); - void intvoice(machine_config &config); - void intvecs(machine_config &config); - void intv(machine_config &config); void intv2_mem(address_map &map); void intv_mem(address_map &map); void intvecs_mem(address_map &map); void intvkbd2_mem(address_map &map); void intvkbd_mem(address_map &map); void intvoice_mem(address_map &map); -protected: + int m_is_keybd; optional_device m_keyboard; diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index 4b7dd607f90..4a6e2207f97 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -24,6 +24,12 @@ public: m_spr(*this, "vsystem_spr"), m_soundlatch(*this, "soundlatch") { } + void inufuku(machine_config &config); + void _3on3dunk(machine_config &config); + + DECLARE_CUSTOM_INPUT_MEMBER(soundflag_r); + +private: /* memory pointers */ required_shared_ptr m_bg_videoram; required_shared_ptr m_bg_rasterram; @@ -59,7 +65,6 @@ public: DECLARE_WRITE16_MEMBER(inufuku_bg_videoram_w); DECLARE_READ16_MEMBER(inufuku_tx_videoram_r); DECLARE_WRITE16_MEMBER(inufuku_tx_videoram_w); - DECLARE_CUSTOM_INPUT_MEMBER(soundflag_r); TILE_GET_INFO_MEMBER(get_inufuku_bg_tile_info); TILE_GET_INFO_MEMBER(get_inufuku_tx_tile_info); virtual void machine_start() override; @@ -67,8 +72,6 @@ public: virtual void video_start() override; uint32_t screen_update_inufuku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_inufuku); - void inufuku(machine_config &config); - void _3on3dunk(machine_config &config); void inufuku_map(address_map &map); void inufuku_sound_io_map(address_map &map); void inufuku_sound_map(address_map &map); diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h index d2cc38676d0..c78be4a0caa 100644 --- a/src/mame/includes/iqblock.h +++ b/src/mame/includes/iqblock.h @@ -14,6 +14,12 @@ public: m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram") { } + void iqblock(machine_config &config); + + void init_grndtour(); + void init_iqblock(); + +private: required_device m_maincpu; required_device m_gfxdecode; @@ -36,15 +42,12 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(irq); - void init_grndtour(); - void init_iqblock(); virtual void video_start() override; 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 iqblock(machine_config &config); void main_map(address_map &map); void main_portmap(address_map &map); }; diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index ee341e346e0..605693f8a50 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -21,20 +21,6 @@ class irobot_state : public driver_device { public: - struct irmb_ops - { - const struct irmb_ops *nxtop; - uint32_t func; - uint32_t diradd; - uint32_t latchmask; - uint32_t *areg; - uint32_t *breg; - uint8_t cycles; - uint8_t diren; - uint8_t flags; - uint8_t ramsel; - }; - irobot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), @@ -55,7 +41,21 @@ public: void irobot(machine_config &config); -protected: +private: + struct irmb_ops + { + const struct irmb_ops *nxtop; + uint32_t func; + uint32_t diradd; + uint32_t latchmask; + uint32_t *areg; + uint32_t *breg; + uint8_t cycles; + uint8_t diren; + uint8_t flags; + uint8_t ramsel; + }; + virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; @@ -86,7 +86,6 @@ protected: void load_oproms(); void irmb_run(); -private: required_shared_ptr m_videoram; uint8_t m_vg_clear; uint8_t m_bufsel; diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index 94430ba7fe1..1887ee67e28 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -29,6 +29,10 @@ public: m_spriteram2(*this, "spriteram2"), m_spriteram(*this, "spriteram") { } + void farwest(machine_config &config); + void ironhors(machine_config &config); + +private: DECLARE_WRITE8_MEMBER(sh_irqtrigger_w); DECLARE_WRITE8_MEMBER(videoram_w); DECLARE_WRITE8_MEMBER(colorram_w); @@ -47,19 +51,16 @@ public: DECLARE_PALETTE_INIT(ironhors); DECLARE_VIDEO_START(farwest); - void farwest(machine_config &config); - void ironhors(machine_config &config); void farwest_master_map(address_map &map); void farwest_slave_map(address_map &map); void master_map(address_map &map); void slave_io_map(address_map &map); void slave_map(address_map &map); -protected: + virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; -private: /* devices */ required_device m_maincpu; required_device m_soundcpu; diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index ac925a9afba..fc8a4835007 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -44,7 +44,34 @@ public: m_leds(*this, "led%u", 0U) { } + void tourny(machine_config &config); + void sftm(machine_config &config); + void drivedge(machine_config &config); + void bloodstm(machine_config &config); + void timekill(machine_config &config); + + void init_gtclasscp(); + void init_shufshot(); + void init_wcbowlt(); + void init_hardyard(); + void init_s_ver(); + void init_sftm110(); + void init_wcbowln(); + void init_gt2kp(); + void init_sftm(); + void init_drivedge(); + void init_wcbowl(); + void init_wcbowlj(); + void init_aamat(); + void init_bloodstm(); + void init_aama(); + void init_timekill(); + void init_gt3d(); + void init_gt3dl(); + + DECLARE_CUSTOM_INPUT_MEMBER(special_port_r); +private: required_device m_maincpu; required_device m_soundcpu; optional_device m_dsp1; @@ -157,29 +184,10 @@ public: DECLARE_WRITE32_MEMBER(itech020_video_w); DECLARE_WRITE32_MEMBER(drivedge_zbuf_control_w); DECLARE_READ32_MEMBER(itech020_video_r); - DECLARE_CUSTOM_INPUT_MEMBER(special_port_r); DECLARE_WRITE8_MEMBER(drivedge_portb_out); DECLARE_WRITE_LINE_MEMBER(drivedge_turbo_light); DECLARE_WRITE8_MEMBER(pia_portb_out); - void init_gtclasscp(); - void init_shufshot(); - void init_wcbowlt(); - void init_hardyard(); - void init_s_ver(); - void init_sftm110(); - void init_wcbowln(); - void init_gt2kp(); - void init_sftm(); - void init_drivedge(); - void init_wcbowl(); - void init_wcbowlj(); - void init_aamat(); - void init_bloodstm(); - void init_aama(); - void init_timekill(); - void init_gt3d(); - void init_gt3dl(); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; @@ -209,11 +217,6 @@ public: void handle_video_command(); inline int determine_irq_state(int vint, int xint, int qint); void itech32_update_interrupts(int vint, int xint, int qint); - void tourny(machine_config &config); - void sftm(machine_config &config); - void drivedge(machine_config &config); - void bloodstm(machine_config &config); - void timekill(machine_config &config); void bloodstm_map(address_map &map); void drivedge_map(address_map &map); void drivedge_tms1_map(address_map &map); diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index a5e28d42777..7e98f201e3d 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -31,6 +31,33 @@ public: m_fakey(*this, "FAKEY"), m_visarea(0, 0, 0, 0) { } + void grmatch(machine_config &config); + void rimrockn(machine_config &config); + void gtg2(machine_config &config); + void slikshot_lo(machine_config &config); + void slikshot_lo_noz80(machine_config &config); + void ninclown(machine_config &config); + void sstrike(machine_config &config); + void stratab_hi(machine_config &config); + void hstennis_lo(machine_config &config); + void wfortune(machine_config &config); + void stratab_lo(machine_config &config); + void slikshot_hi(machine_config &config); + void hstennis_hi(machine_config &config); + + void init_rimrockn(); + void init_grmatch(); + void init_peggle(); + void init_slikshot(); + void init_neckneck(); + void init_arligntn(); + void init_hstennis(); + void init_sstrike(); + + DECLARE_CUSTOM_INPUT_MEMBER(special_r); + DECLARE_CUSTOM_INPUT_MEMBER(gtg_mux); + +private: static constexpr uint32_t YBUFFER_COUNT = 15; static constexpr uint32_t VRAM_SIZE = 0x40000; static constexpr uint32_t VRAM_MASK = VRAM_SIZE - 1; @@ -119,17 +146,6 @@ public: DECLARE_WRITE8_MEMBER(pia_porta_out); DECLARE_WRITE8_MEMBER(ym2203_portb_out); - DECLARE_CUSTOM_INPUT_MEMBER(special_r); - DECLARE_CUSTOM_INPUT_MEMBER(gtg_mux); - - void init_rimrockn(); - void init_grmatch(); - void init_peggle(); - void init_slikshot(); - void init_neckneck(); - void init_arligntn(); - void init_hstennis(); - void init_sstrike(); virtual void machine_start() override; virtual void machine_reset() override; virtual void video_start() override; @@ -191,19 +207,6 @@ public: void itech8_sound_ym3812_external(machine_config &config); void itech8_core_lo(machine_config &config); void itech8_core_hi(machine_config &config); - void grmatch(machine_config &config); - void rimrockn(machine_config &config); - void gtg2(machine_config &config); - void slikshot_lo(machine_config &config); - void slikshot_lo_noz80(machine_config &config); - void ninclown(machine_config &config); - void sstrike(machine_config &config); - void stratab_hi(machine_config &config); - void hstennis_lo(machine_config &config); - void wfortune(machine_config &config); - void stratab_lo(machine_config &config); - void slikshot_hi(machine_config &config); - void hstennis_hi(machine_config &config); void gtg2_map(address_map &map); void ninclown_map(address_map &map); void slikz80_io_map(address_map &map); @@ -214,6 +217,6 @@ public: void sound3812_map(address_map &map); void tmshi_map(address_map &map); void tmslo_map(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/includes/jack.h b/src/mame/includes/jack.h index 4e743b9f5cd..c44858540da 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -27,6 +27,19 @@ public: m_decrypted_opcodes(*this, "decrypted_opcodes") { } + void joinem(machine_config &config); + void treahunt(machine_config &config); + void unclepoo(machine_config &config); + void striv(machine_config &config); + void jack(machine_config &config); + + void init_zzyzzyxx(); + void init_striv(); + void init_treahunt(); + void init_loverboy(); + void init_jack(); + +private: /* device- and memory pointers */ required_device m_maincpu; required_device m_audiocpu; @@ -60,12 +73,6 @@ public: DECLARE_WRITE8_MEMBER(jack_flipscreen_w); DECLARE_READ8_MEMBER(timer_r); - void init_zzyzzyxx(); - void init_striv(); - void init_treahunt(); - void init_loverboy(); - void init_jack(); - TILE_GET_INFO_MEMBER(get_bg_tile_info); TILEMAP_MAPPER_MEMBER(tilemap_scan_cols_flipy); TILE_GET_INFO_MEMBER(joinem_get_bg_tile_info); @@ -88,11 +95,6 @@ public: void jack_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void joinem_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void treahunt_decode( ); - void joinem(machine_config &config); - void treahunt(machine_config &config); - void unclepoo(machine_config &config); - void striv(machine_config &config); - void jack(machine_config &config); void decrypted_opcodes_map(address_map &map); void jack_map(address_map &map); void joinem_map(address_map &map); diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 782f0d5a851..6f5ba11b080 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -21,6 +21,9 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void jackal(machine_config &config); + +private: /* memory pointers */ required_shared_ptr m_videoctrl; uint8_t * m_scrollram; @@ -60,7 +63,6 @@ public: void draw_background( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_sprites_region( bitmap_ind16 &bitmap, const rectangle &cliprect, const uint8_t *sram, int length, int bank ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void jackal(machine_config &config); void master_map(address_map &map); void slave_map(address_map &map); }; diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index e1fafb6145e..36845ff4625 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -77,6 +77,29 @@ public: { } + void cojag68k(machine_config &config); + void cojagr3k(machine_config &config); + void cojagr3k_rom(machine_config &config); + void jaguarcd(machine_config &config); + void jaguar(machine_config &config); + + void init_jaguar(); + void init_jaguarcd(); + void init_area51mx(); + void init_maxforce(); + void init_freezeat(); + void init_fishfren(); + void init_a51mxr3k(); + void init_area51(); + void init_freezeat4(); + void init_freezeat5(); + void init_freezeat6(); + void init_vcircle(); + void init_freezeat3(); + void init_freezeat2(); + void init_area51a(); + +private: // devices required_device m_maincpu; required_device m_gpu; @@ -224,21 +247,6 @@ public: DECLARE_WRITE16_MEMBER(butch_regs_w16); DECLARE_READ32_MEMBER(butch_regs_r); DECLARE_WRITE32_MEMBER(butch_regs_w); - void init_jaguar(); - void init_jaguarcd(); - void init_area51mx(); - void init_maxforce(); - void init_freezeat(); - void init_fishfren(); - void init_a51mxr3k(); - void init_area51(); - void init_freezeat4(); - void init_freezeat5(); - void init_freezeat6(); - void init_vcircle(); - void init_freezeat3(); - void init_freezeat2(); - void init_area51a(); // from audio/jaguar.c DECLARE_READ16_MEMBER( jerry_regs_r ); @@ -264,11 +272,6 @@ public: IRQ_CALLBACK_MEMBER(jaguar_irq_callback); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( jaguar_cart ); DECLARE_QUICKLOAD_LOAD_MEMBER( jaguar ); - void cojag68k(machine_config &config); - void cojagr3k(machine_config &config); - void cojagr3k_rom(machine_config &config); - void jaguarcd(machine_config &config); - void jaguar(machine_config &config); void dsp_map(address_map &map); void dsp_rom_map(address_map &map); void gpu_map(address_map &map); @@ -282,7 +285,7 @@ public: void m68020_map(address_map &map); void r3000_map(address_map &map); void r3000_rom_map(address_map &map); -protected: + // timer IDs enum { diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 7b7814cee9a..58993d445f5 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -27,6 +27,9 @@ public: m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } + void jailbrek(machine_config &config); + +private: /* memory pointers */ required_shared_ptr m_colorram; required_shared_ptr m_videoram; @@ -61,7 +64,6 @@ public: DECLARE_WRITE_LINE_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(interrupt_nmi); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - void jailbrek(machine_config &config); void jailbrek_map(address_map &map); void vlm_map(address_map &map); }; diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index d0d0e3f4466..fb57669942d 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -47,7 +47,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(jedi_audio_comm_stat_r); void jedi(machine_config &config); -protected: +private: DECLARE_WRITE8_MEMBER(main_irq_ack_w); DECLARE_WRITE8_MEMBER(rom_banksel_w); DECLARE_WRITE_LINE_MEMBER(coin_counter_left_w); @@ -80,7 +80,6 @@ protected: void audio_map(address_map &map); void main_map(address_map &map); -private: /* machine state */ emu_timer *m_interrupt_timer; diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index df062f1f4a1..425e0edf9e0 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -81,6 +81,10 @@ public: , m_lamp_output(*this, "lamp%u", 0U) { } + void impctawp(machine_config &config); + void jpmimpct(machine_config &config); + +private: DECLARE_WRITE_LINE_MEMBER(reel0_optic_cb) { if (state) m_optic_pattern |= 0x01; else m_optic_pattern &= ~0x01; } DECLARE_WRITE_LINE_MEMBER(reel1_optic_cb) { if (state) m_optic_pattern |= 0x02; else m_optic_pattern &= ~0x02; } DECLARE_WRITE_LINE_MEMBER(reel2_optic_cb) { if (state) m_optic_pattern |= 0x04; else m_optic_pattern &= ~0x04; } @@ -121,13 +125,10 @@ public: DECLARE_MACHINE_START(impctawp); DECLARE_MACHINE_RESET(impctawp); TIMER_DEVICE_CALLBACK_MEMBER(duart_1_timer_event); - void impctawp(machine_config &config); - void jpmimpct(machine_config &config); void awp68k_program_map(address_map &map); void m68k_program_map(address_map &map); void tms_program_map(address_map &map); -private: uint8_t m_tms_irq; uint8_t m_duart_1_irq; struct duart_t m_duart_1; diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h index 47e0d429aff..0e3cebb0731 100644 --- a/src/mame/includes/jpmsys5.h +++ b/src/mame/includes/jpmsys5.h @@ -37,40 +37,45 @@ public: void jpmsys5(machine_config &config); void jpmsys5_ym(machine_config &config); -protected: - virtual void machine_start() override; - virtual void machine_reset() override; - - DECLARE_READ16_MEMBER(coins_r); - DECLARE_WRITE16_MEMBER(coins_w); - DECLARE_READ16_MEMBER(unk_r); - DECLARE_WRITE16_MEMBER(mux_w); - DECLARE_READ16_MEMBER(mux_r); - DECLARE_WRITE16_MEMBER(jpm_upd7759_w); - DECLARE_READ16_MEMBER(jpm_upd7759_r); DECLARE_WRITE_LINE_MEMBER(ptm_irq); DECLARE_WRITE_LINE_MEMBER(u26_o1_callback); DECLARE_WRITE_LINE_MEMBER(pia_irq); - DECLARE_READ8_MEMBER(u29_porta_r); - DECLARE_WRITE8_MEMBER(u29_portb_w); DECLARE_WRITE_LINE_MEMBER(u29_ca2_w); DECLARE_WRITE_LINE_MEMBER(u29_cb2_w); DECLARE_WRITE_LINE_MEMBER(acia_irq); DECLARE_WRITE_LINE_MEMBER(a0_tx_w); DECLARE_WRITE_LINE_MEMBER(a1_tx_w); DECLARE_WRITE_LINE_MEMBER(a2_tx_w); + + DECLARE_READ8_MEMBER(u29_porta_r); + DECLARE_WRITE8_MEMBER(u29_portb_w); + +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + + DECLARE_WRITE16_MEMBER(jpm_upd7759_w); + DECLARE_READ16_MEMBER(jpm_upd7759_r); + + required_device m_maincpu; + required_device_array m_acia6850; + + void jpm_sys5_common_map(address_map &map); + +private: + DECLARE_READ16_MEMBER(coins_r); + DECLARE_WRITE16_MEMBER(coins_w); + DECLARE_READ16_MEMBER(unk_r); + DECLARE_WRITE16_MEMBER(mux_w); + DECLARE_READ16_MEMBER(mux_r); + DECLARE_READ16_MEMBER(mux_awp_r); DECLARE_READ16_MEMBER(coins_awp_r); void sys5_draw_lamps(); - void jpm_sys5_common_map(address_map &map); void m68000_awp_map(address_map &map); void m68000_awp_map_saa(address_map &map); - required_device m_maincpu; - required_device_array m_acia6850; - -private: required_device m_upd7759; optional_device m_vfd; required_ioport m_direct_port; @@ -104,7 +109,7 @@ public: void jpmsys5v(machine_config &config); -protected: +private: virtual void machine_start() override; virtual void machine_reset() override; @@ -118,7 +123,6 @@ protected: void m68000_map(address_map &map); -private: required_device m_tms34061; required_device m_palette; required_memory_bank m_rombank; -- cgit v1.2.3