diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2013-04-10 08:42:34 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2013-04-10 08:42:34 +0000 |
commit | 9be192b9a41faf1f4f9d9b719440440d88671887 (patch) | |
tree | ce9ccd90a2076d64fbded9b7487b0a7b088b0ba2 | |
parent | d68164b4c1216ac23354ac3a4634048c2c0e998a (diff) |
added m_maincpu where missing in driver classes that are placed in drivers (nw)
296 files changed, 884 insertions, 340 deletions
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 068a3b4ddf8..5b43956badb 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -56,7 +56,8 @@ public: m_oki2(*this, "oki2") , m_spriteram_1(*this, "spritera1"), m_spriteram_2(*this, "spritera2"), - m_bgram(*this, "bgram"){ } + m_bgram(*this, "bgram"), + m_maincpu(*this, "maincpu") { } /* devices */ required_device<okim6295_device> m_oki1; @@ -79,6 +80,7 @@ public: virtual void video_start(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_k3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/30test.c b/src/mame/drivers/30test.c index 930ca81308b..1a9f8742a41 100644 --- a/src/mame/drivers/30test.c +++ b/src/mame/drivers/30test.c @@ -52,7 +52,8 @@ class namco_30test_state : public driver_device { public: namco_30test_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_mux_data; UINT8 m_oki_bank; @@ -66,6 +67,7 @@ public: DECLARE_WRITE8_MEMBER(hc11_okibank_w); virtual void machine_start(); virtual void machine_reset(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index 4d11dc0557c..5b1868bd89d 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -32,7 +32,8 @@ class _39in1_state : public driver_device public: _39in1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_ram(*this, "ram"){ } + m_ram(*this, "ram"), + m_maincpu(*this, "maincpu") { } UINT32 m_seed; UINT32 m_magic; @@ -91,6 +92,7 @@ public: void pxa255_lcd_dma_kickoff(int channel); void pxa255_lcd_check_load_next_branch(int channel); void pxa255_start(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c index 312cd5065a9..1de5db12446 100644 --- a/src/mame/drivers/5clown.c +++ b/src/mame/drivers/5clown.c @@ -457,7 +457,8 @@ public: _5clown_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } UINT8 m_main_latch_d800; UINT8 m_snd_latch_0800; @@ -487,6 +488,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_fclown(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c index bd56b36ae2e..f40faf21107 100644 --- a/src/mame/drivers/ace.c +++ b/src/mame/drivers/ace.c @@ -52,8 +52,8 @@ public: : driver_device(mconfig, type, tag), m_scoreram(*this, "scoreram"), m_ram2(*this, "ram2"), - m_characterram(*this, "characterram") - { } + m_characterram(*this, "characterram"), + m_maincpu(*this, "maincpu") { } /* video-related */ required_shared_ptr<UINT8> m_scoreram; @@ -72,6 +72,7 @@ public: virtual void palette_init(); UINT32 screen_update_ace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void ace_postload(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index 241f4ec15d5..ed8a0497141 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -22,7 +22,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -43,6 +44,7 @@ public: INTERRUPT_GEN_MEMBER(acefruit_vblank); TIMER_CALLBACK_MEMBER(acefruit_refresh); void acefruit_update_irq(int vpos); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index e91774df44f..b8792167d01 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -68,7 +68,8 @@ public: m_ac_bgvram(*this, "ac_bgvram"), m_ac_txvram(*this, "ac_txvram"), m_spriteram(*this, "spriteram"), - m_ac_devram(*this, "ac_devram"){ } + m_ac_devram(*this, "ac_devram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_ac_bgvram; required_shared_ptr<UINT16> m_ac_txvram; @@ -96,6 +97,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(acommand_scanline); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority, int pri_mask); void draw_led(bitmap_ind16 &bitmap, int x, int y,UINT8 value); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index 34e734f255a..45e1809cc34 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -21,7 +21,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram1(*this, "spriteram1"), m_spriteram2(*this, "spriteram2"), - m_spriteram3(*this, "spriteram3"){ } + m_spriteram3(*this, "spriteram3"), + m_maincpu(*this, "maincpu") { } /* video-related */ required_shared_ptr<UINT8> m_spriteram1; @@ -36,6 +37,7 @@ public: virtual void palette_init(); UINT32 screen_update_hanaroku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index 68d67a413d7..8f2e2ad6653 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -48,7 +48,8 @@ public: : driver_device(mconfig, type, tag), m_cus_ram(*this, "cus_ram"), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_cus_ram; @@ -77,6 +78,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_yumefuda(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; TILE_GET_INFO_MEMBER(albazg_state::y_get_bg_tile_info) diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c index 10c718be08e..0044773c537 100644 --- a/src/mame/drivers/amaticmg.c +++ b/src/mame/drivers/amaticmg.c @@ -430,8 +430,8 @@ public: amaticmg_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_attr(*this, "attr"), - m_vram(*this, "vram") - { } + m_vram(*this, "vram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_attr; required_shared_ptr<UINT8> m_vram; @@ -457,6 +457,7 @@ public: INTERRUPT_GEN_MEMBER(amaticmg2_irq); void encf(UINT8 ciphertext, int address, UINT8 &plaintext, int &newaddress); void decrypt(int key1, int key2); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c index ad496e7f6d2..edabf37d74d 100644 --- a/src/mame/drivers/aristmk4.c +++ b/src/mame/drivers/aristmk4.c @@ -276,7 +276,8 @@ class aristmk4_state : public driver_device public: aristmk4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_mkiv_vram(*this, "mkiv_vram"){ } + m_mkiv_vram(*this, "mkiv_vram"), + m_maincpu(*this, "maincpu") { } int m_rtc_address_strobe; int m_rtc_data_strobe; @@ -340,6 +341,7 @@ public: TIMER_CALLBACK_MEMBER(hopper_reset); TIMER_DEVICE_CALLBACK_MEMBER(aristmk4_pf); inline void uBackgroundColour(); + required_device<cpu_device> m_maincpu; }; /* Partial Cashcade protocol */ diff --git a/src/mame/drivers/aristmk6.c b/src/mame/drivers/aristmk6.c index 819cd9bdd8b..e64c33a2238 100644 --- a/src/mame/drivers/aristmk6.c +++ b/src/mame/drivers/aristmk6.c @@ -12,13 +12,15 @@ class aristmk6_state : public driver_device { public: aristmk6_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT32 m_test_x,m_test_y,m_start_offs; UINT8 m_type; DECLARE_READ64_MEMBER(test_r); virtual void video_start(); UINT32 screen_update_aristmk6(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c index 65c036c0a4b..3e3deefbced 100644 --- a/src/mame/drivers/astrocorp.c +++ b/src/mame/drivers/astrocorp.c @@ -45,7 +45,8 @@ public: astrocorp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), - m_paletteram(*this, "paletteram"){ } + m_paletteram(*this, "paletteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -70,6 +71,7 @@ public: UINT32 screen_update_astrocorp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(skilldrp_scanline); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /*************************************************************************** diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c index b54abc838a0..fcaf320f4f3 100644 --- a/src/mame/drivers/atarisy4.c +++ b/src/mame/drivers/atarisy4.c @@ -26,7 +26,8 @@ public: atarisy4_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_m68k_ram(*this, "m68k_ram"), - m_screen_ram(*this, "screen_ram"){ } + m_screen_ram(*this, "screen_ram"), + m_maincpu(*this, "maincpu") { } UINT8 m_r_color_table[256]; UINT8 m_g_color_table[256]; @@ -66,6 +67,7 @@ public: inline UINT8 hex_to_ascii(UINT8 in); void load_ldafile(address_space &space, const UINT8 *file); void load_hexfile(address_space &space, const UINT8 *file); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/atlantis.c b/src/mame/drivers/atlantis.c index 2b0cdad8b54..3dbd4871474 100644 --- a/src/mame/drivers/atlantis.c +++ b/src/mame/drivers/atlantis.c @@ -44,11 +44,13 @@ class atlantis_state : public driver_device { public: atlantis_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_DRIVER_INIT(mwskins); virtual void machine_start(); virtual void machine_reset(); UINT32 screen_update_mwskins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/atvtrack.c b/src/mame/drivers/atvtrack.c index 090f0b48e2b..81c21e9d22c 100644 --- a/src/mame/drivers/atvtrack.c +++ b/src/mame/drivers/atvtrack.c @@ -67,7 +67,8 @@ class atvtrack_state : public driver_device { public: atvtrack_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_READ64_MEMBER(area1_r); DECLARE_WRITE64_MEMBER(area1_w); @@ -90,6 +91,7 @@ public: int m_nandcommand[4], m_nandoffset[4], m_nandaddressstep, m_nandaddress[4]; UINT32 m_area1_data[4]; + required_device<cpu_device> m_maincpu; }; void atvtrack_state::logbinary(UINT32 data,int high=31,int low=0) diff --git a/src/mame/drivers/bartop52.c b/src/mame/drivers/bartop52.c index 8b6448f010f..330f797aade 100644 --- a/src/mame/drivers/bartop52.c +++ b/src/mame/drivers/bartop52.c @@ -27,8 +27,10 @@ class bartop52_state : public driver_device { public: bartop52_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c index ccd7eb83ae3..ed2a0079b43 100644 --- a/src/mame/drivers/berzerk.c +++ b/src/mame/drivers/berzerk.c @@ -23,7 +23,8 @@ public: berzerk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -68,6 +69,7 @@ public: void create_nmi_timer(); void start_nmi_timer(); void get_pens(pen_t *pens); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index c68d2159a0d..0ed06ea355f 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -32,7 +32,8 @@ public: m_fgram(*this, "fgram"), m_txram(*this, "txram"), m_vregs(*this, "vregs"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_bgram; required_shared_ptr<UINT16> m_fgram; @@ -54,6 +55,7 @@ public: UINT32 screen_update_bestleag(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_bestleaw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index b7dce833045..f57a3acb9aa 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -235,7 +235,8 @@ class bfcobra_state : public driver_device { public: bfcobra_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_bank_data[4]; UINT8 *m_work_ram; @@ -307,6 +308,7 @@ public: inline void z80_bank(int num, int data); UINT8 exec_r_phase(void); UINT8 results_phase(void); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c index b9e9fc457e5..b6dcb46f367 100644 --- a/src/mame/drivers/bfm_sc1.c +++ b/src/mame/drivers/bfm_sc1.c @@ -109,8 +109,8 @@ class bfm_sc1_state : public driver_device public: bfm_sc1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_vfd0(*this, "vfd0") - { } + m_vfd0(*this, "vfd0"), + m_maincpu(*this, "maincpu") { } optional_device<bfm_bd1_t> m_vfd0; @@ -184,6 +184,7 @@ public: void Scorpion1_SetSwitchState(int strobe, int data, int state); int Scorpion1_GetSwitchState(int strobe, int data); int sc1_find_project_string( ); + required_device<cpu_device> m_maincpu; }; #define VFD_RESET 0x20 diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index f47f39cb789..6f06cd8f624 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -179,8 +179,8 @@ public: bfm_sc2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vfd0(*this, "vfd0"), - m_vfd1(*this, "vfd1") - { } + m_vfd1(*this, "vfd1"), + m_maincpu(*this, "maincpu") { } optional_device<bfm_bd1_t> m_vfd0; optional_device<bfm_bd1_t> m_vfd1; @@ -315,6 +315,7 @@ public: void adder2_common_init(); void sc2awp_common_init(int reels, int decrypt); void sc2awpdmd_common_init(int reels, int decrypt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/bfmsys83.c b/src/mame/drivers/bfmsys83.c index f3743b16a0d..594db2d1dd1 100644 --- a/src/mame/drivers/bfmsys83.c +++ b/src/mame/drivers/bfmsys83.c @@ -10,9 +10,11 @@ class bfmsys83_state : public driver_device { public: bfmsys83_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_codec_data[256]; + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c index 7e336b2fd01..e9e769f8ff4 100644 --- a/src/mame/drivers/bfmsys85.c +++ b/src/mame/drivers/bfmsys85.c @@ -72,8 +72,8 @@ class bfmsys85_state : public driver_device public: bfmsys85_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_vfd(*this, "vfd") - { } + m_vfd(*this, "vfd"), + m_maincpu(*this, "maincpu") { } optional_device<roc10937_t> m_vfd; int m_mmtr_latch; @@ -114,6 +114,7 @@ public: virtual void machine_reset(); INTERRUPT_GEN_MEMBER(timer_irq); int b85_find_project_string( ); + required_device<cpu_device> m_maincpu; }; #define MASTER_CLOCK (XTAL_4MHz) diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c index 00d88bab151..7c792b8ac95 100644 --- a/src/mame/drivers/big10.c +++ b/src/mame/drivers/big10.c @@ -68,7 +68,8 @@ class big10_state : public driver_device public: big10_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_v9938(*this, "v9938") { } + m_v9938(*this, "v9938") , + m_maincpu(*this, "maincpu") { } required_device<v9938_device> m_v9938; UINT8 m_mux_data; @@ -77,6 +78,7 @@ public: virtual void machine_reset(); TIMER_DEVICE_CALLBACK_MEMBER(big10_interrupt); DECLARE_WRITE_LINE_MEMBER(big10_vdp_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c index 27fb695268b..32cb52649c7 100644 --- a/src/mame/drivers/bingoc.c +++ b/src/mame/drivers/bingoc.c @@ -38,7 +38,8 @@ class bingoc_state : public driver_device { public: bingoc_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_x; DECLARE_READ16_MEMBER(bingoc_rand_r); @@ -47,6 +48,7 @@ public: DECLARE_WRITE8_MEMBER(bingoc_play_w); virtual void video_start(); UINT32 screen_update_bingoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/bingor.c b/src/mame/drivers/bingor.c index 86b85caaa5a..afbe9791977 100644 --- a/src/mame/drivers/bingor.c +++ b/src/mame/drivers/bingor.c @@ -448,7 +448,8 @@ class bingor_state : public driver_device public: bingor_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_blit_ram(*this, "blit_ram"){ } + m_blit_ram(*this, "blit_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_blit_ram; DECLARE_READ16_MEMBER(test_r); @@ -457,6 +458,7 @@ public: UINT32 screen_update_bingor(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(unk_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index ba0e296cf74..38be145fb8f 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -101,9 +101,8 @@ public: m_spriteram4(*this, "spriteram4"), m_spriteram5(*this, "spriteram5"), m_spriteram6(*this, "spriteram6"), - m_spriteram7(*this, "spriteram7") - { - } + m_spriteram7(*this, "spriteram7"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_tilemapram; required_shared_ptr<UINT16> m_spriteram0; @@ -153,6 +152,7 @@ public: UINT32 screen_update_blackt96(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_strip(bitmap_ind16 &bitmap, const rectangle &cliprect, int page, int column); void draw_page(bitmap_ind16 &bitmap, const rectangle &cliprect, int page); + required_device<cpu_device> m_maincpu; }; #define GET_INFO( ram ) \ diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c index 765f6f94996..b1a9fbf740c 100644 --- a/src/mame/drivers/blitz.c +++ b/src/mame/drivers/blitz.c @@ -298,7 +298,8 @@ public: blitz_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -314,6 +315,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_megadpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/blitz68k.c b/src/mame/drivers/blitz68k.c index eedab3f516d..3af460480ad 100644 --- a/src/mame/drivers/blitz68k.c +++ b/src/mame/drivers/blitz68k.c @@ -66,7 +66,8 @@ public: m_blit_transpen(*this, "blit_transpen"), m_leds0(*this, "leds0"), m_leds1(*this, "leds1"), - m_leds2(*this, "leds2") { } + m_leds2(*this, "leds2") , + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT16> m_nvram; UINT8 *m_blit_buffer; @@ -176,6 +177,7 @@ public: UINT32 screen_update_blitz68k(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); UINT32 screen_update_blitz68k_noblit(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(steaser_mcu_sim); + required_device<cpu_device> m_maincpu; }; /************************************************************************************************************* diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index af5431ac687..c9d049b5e4d 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -117,7 +117,8 @@ public: : driver_device(mconfig, type, tag), m_stats_ram(*this, "nvram", 16), m_vid1(*this, "vid1"), - m_vid2(*this, "vid2"){ } + m_vid2(*this, "vid2"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT8> m_stats_ram; required_shared_ptr<UINT16> m_vid1; @@ -141,6 +142,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_bmcbowl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index f32d197b45a..e6c9f99a545 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -111,7 +111,8 @@ public: m_ms32_tx0_scroll(*this, "tx0_scroll"), m_ms32_bg0_scroll(*this, "bg0_scroll"), m_ms32_tx1_scroll(*this, "tx1_scroll"), - m_ms32_bg1_scroll(*this, "bg1_scroll") { } + m_ms32_bg1_scroll(*this, "bg1_scroll") , + m_maincpu(*this, "maincpu") { } tilemap_t *m_ms32_tx_tilemap[2]; tilemap_t *m_ms32_bg_tilemap[2]; @@ -164,6 +165,7 @@ public: void irq_init(); void irq_raise(int level); IRQ_CALLBACK_MEMBER(irq_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c index 805911db847..34dc51c1d76 100644 --- a/src/mame/drivers/buster.c +++ b/src/mame/drivers/buster.c @@ -17,13 +17,15 @@ class buster_state : public driver_device public: buster_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_vram(*this, "vram"){ } + m_vram(*this, "vram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_vram; DECLARE_READ8_MEMBER(test_r); virtual void video_start(); virtual void palette_init(); UINT32 screen_update_buster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c index beed523fcc5..78a9331b00c 100644 --- a/src/mame/drivers/cabaret.c +++ b/src/mame/drivers/cabaret.c @@ -34,7 +34,8 @@ public: m_fg_tile_ram(*this, "fg_tile_ram"), m_fg_color_ram(*this, "fg_color_ram"), m_bg_scroll(*this, "bg_scroll"), - m_bg_tile_ram(*this, "bg_tile_ram"){ } + m_bg_tile_ram(*this, "bg_tile_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_fg_tile_ram; required_shared_ptr<UINT8> m_fg_color_ram; @@ -57,6 +58,7 @@ public: virtual void video_start(); UINT32 screen_update_cabaret(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(cabaret_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 513d147cbfa..caaf350eb90 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -89,7 +89,8 @@ public: calorie_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_ram(*this, "fg_ram"), - m_sprites(*this, "sprites"){ } + m_sprites(*this, "sprites"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_fg_ram; @@ -113,6 +114,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_calorie(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c index c3b3a96c855..7703d904ea7 100644 --- a/src/mame/drivers/cardline.c +++ b/src/mame/drivers/cardline.c @@ -29,7 +29,8 @@ public: cardline_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } int m_video; required_shared_ptr<UINT8> m_videoram; @@ -42,6 +43,7 @@ public: DECLARE_WRITE8_MEMBER(lamps_w); virtual void palette_init(); UINT32 screen_update_cardline(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c index 228a2ac389f..9fd89e014f5 100644 --- a/src/mame/drivers/carrera.c +++ b/src/mame/drivers/carrera.c @@ -57,12 +57,14 @@ class carrera_state : public driver_device public: carrera_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_tileram(*this, "tileram"){ } + m_tileram(*this, "tileram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_tileram; DECLARE_READ8_MEMBER(unknown_r); virtual void palette_init(); UINT32 screen_update_carrera(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c index 0618d145ecc..cac5c7ace4f 100644 --- a/src/mame/drivers/caswin.c +++ b/src/mame/drivers/caswin.c @@ -77,7 +77,8 @@ public: caswin_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_sc0_vram(*this, "sc0_vram"), - m_sc0_attr(*this, "sc0_attr"){ } + m_sc0_attr(*this, "sc0_attr"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_sc0_vram; required_shared_ptr<UINT8> m_sc0_attr; @@ -93,6 +94,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_vvillage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index 13bba34917c..7c14a90e9a2 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -52,7 +52,8 @@ public: cb2001_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram_fg(*this, "vrafg"), - m_vram_bg(*this, "vrabg"){ } + m_vram_bg(*this, "vrabg"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_vram_fg; required_shared_ptr<UINT16> m_vram_bg; @@ -73,6 +74,7 @@ public: virtual void palette_init(); UINT32 screen_update_cb2001(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c index f8e6dd44b65..ecfafaf27a5 100644 --- a/src/mame/drivers/cham24.c +++ b/src/mame/drivers/cham24.c @@ -65,7 +65,8 @@ class cham24_state : public driver_device { public: cham24_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8* m_nt_ram; UINT8* m_nt_page[4]; @@ -91,6 +92,7 @@ public: UINT32 screen_update_cham24(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void cham24_set_mirroring( int mirroring ); void ppu_irq(int *ppu_regs); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/chance32.c b/src/mame/drivers/chance32.c index 344846a03fe..c1efe35fb8a 100644 --- a/src/mame/drivers/chance32.c +++ b/src/mame/drivers/chance32.c @@ -30,9 +30,8 @@ public: chance32_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fgram(*this, "fgram"), - m_bgram(*this, "bgram") - - { } + m_bgram(*this, "bgram"), + m_maincpu(*this, "maincpu") { } DECLARE_WRITE8_MEMBER(chance32_fgram_w) { @@ -63,6 +62,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_chance32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c index 2c7ddb5bfe1..98db25f0679 100644 --- a/src/mame/drivers/chihiro.c +++ b/src/mame/drivers/chihiro.c @@ -387,7 +387,8 @@ class chihiro_state : public driver_device { public: chihiro_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_READ32_MEMBER( geforce_r ); DECLARE_WRITE32_MEMBER( geforce_w ); @@ -421,6 +422,7 @@ public: DECLARE_WRITE_LINE_MEMBER(chihiro_pit8254_out0_changed); DECLARE_WRITE_LINE_MEMBER(chihiro_pit8254_out2_changed); IRQ_CALLBACK_MEMBER(irq_callback); + required_device<cpu_device> m_maincpu; }; /* diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index 291a0be10c5..9437f42ff16 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -52,7 +52,8 @@ class chinsan_state : public driver_device public: chinsan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_video(*this, "video"){ } + m_video(*this, "video"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_video; @@ -77,6 +78,7 @@ public: virtual void palette_init(); UINT32 screen_update_chinsan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(chin_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c index b094df09916..af5bf7f5b6d 100644 --- a/src/mame/drivers/clayshoo.c +++ b/src/mame/drivers/clayshoo.c @@ -24,8 +24,8 @@ class clayshoo_state : public driver_device public: clayshoo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram") - { } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -44,6 +44,7 @@ public: TIMER_CALLBACK_MEMBER(reset_analog_bit); UINT8 difficulty_input_port_r( int bit ); void create_analog_timers( ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index 7d6a60f6c06..76b40fb6bcd 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -91,7 +91,8 @@ public: : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc"), m_port_bank(0), - m_phillips_code(0) { } + m_phillips_code(0) , + m_maincpu(*this, "maincpu") { } required_device<pioneer_pr8210_device> m_laserdisc; @@ -113,6 +114,7 @@ public: virtual void machine_start(); virtual void machine_reset(); TIMER_CALLBACK_MEMBER(cliff_irq_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c index 2fb7484d685..baa5492b502 100644 --- a/src/mame/drivers/cmmb.c +++ b/src/mame/drivers/cmmb.c @@ -53,8 +53,8 @@ class cmmb_state : public driver_device public: cmmb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram") - { } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; UINT8 m_irq_mask; @@ -68,6 +68,7 @@ public: virtual void video_start(); UINT32 screen_update_cmmb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(cmmb_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index 50c99f7df6e..49bab301d9a 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -37,7 +37,8 @@ public: m_videoram(*this, "videoram"), m_attr_ram1(*this, "attr_ram1"), m_attr_ram2(*this, "attr_ram2"), - m_attr_ram3(*this, "attr_ram3"){ } + m_attr_ram3(*this, "attr_ram3"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_attr_ram1; @@ -56,6 +57,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); UINT32 screen_update_coinmstr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c index d1a02bbd3d9..78964a702e6 100644 --- a/src/mame/drivers/coinmvga.c +++ b/src/mame/drivers/coinmvga.c @@ -224,7 +224,8 @@ class coinmvga_state : public driver_device public: coinmvga_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_vram(*this, "vram"){ } + m_vram(*this, "vram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_vram; struct { int r,g,b,offs,offs_internal; } m_bgpal, m_fgpal; @@ -238,6 +239,7 @@ public: virtual void palette_init(); UINT32 screen_update_coinmvga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/corona.c b/src/mame/drivers/corona.c index c204a48d4d3..697494ca168 100644 --- a/src/mame/drivers/corona.c +++ b/src/mame/drivers/corona.c @@ -321,7 +321,8 @@ class corona_state : public driver_device { public: corona_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_blitter_x_reg; UINT8 m_blitter_y_reg; @@ -350,6 +351,7 @@ public: virtual void palette_init(); UINT32 screen_update_winner(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_luckyrlt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 8dc6b48a17e..d369989eedd 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -95,7 +95,8 @@ public: : driver_device(mconfig, type, tag), m_txram(*this, "txram"), m_mainram(*this, "mainram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_txram; tilemap_t *m_txtilemap; @@ -121,6 +122,7 @@ public: DECLARE_MACHINE_RESET(airraid); UINT32 screen_update_cshooter(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(cshooter_scanline); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index b30ed9ebe32..54ccbdf6814 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -25,7 +25,8 @@ public: m_bg1_regs_x(*this, "bg1_regs_x"), m_bg1_regs_y(*this, "bg1_regs_y"), m_bg2_regs_x(*this, "bg2_regs_x"), - m_bg2_regs_y(*this, "bg2_regs_y"){ } + m_bg2_regs_y(*this, "bg2_regs_y"), + m_maincpu(*this, "maincpu") { } UINT8 m_paletteram[0x4000]; /* memory pointers */ @@ -58,6 +59,7 @@ public: virtual void video_start(); UINT32 screen_update_cultures(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(cultures_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index d3712dedbb3..0edff960829 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -186,8 +186,8 @@ public: m_tilemap0scroll(*this, "tilemap1_scroll"), m_tilemap1scroll(*this, "tilemap1_scroll"), m_tilemap2scroll(*this, "tilemap2_scroll"), - m_roadram(*this, "roadram") - { } + m_roadram(*this, "roadram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_tilemap0_tilemap; tilemap_t *m_tilemap1_tilemap; @@ -221,6 +221,7 @@ public: virtual void video_start(); UINT32 screen_update_cybertnk_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_cybertnk_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /* tile format diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c index a00076644f1..545692c7855 100644 --- a/src/mame/drivers/d9final.c +++ b/src/mame/drivers/d9final.c @@ -31,7 +31,8 @@ public: : driver_device(mconfig, type, tag), m_lo_vram(*this, "lo_vram"), m_hi_vram(*this, "hi_vram"), - m_cram(*this, "cram"){ } + m_cram(*this, "cram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_lo_vram; required_shared_ptr<UINT8> m_hi_vram; @@ -46,6 +47,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_d9final(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/dai3wksi.c b/src/mame/drivers/dai3wksi.c index a2640c7404e..946815de273 100644 --- a/src/mame/drivers/dai3wksi.c +++ b/src/mame/drivers/dai3wksi.c @@ -49,7 +49,8 @@ class dai3wksi_state : public driver_device public: dai3wksi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_dai3wksi_videoram(*this, "videoram"){ } + m_dai3wksi_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } /* video */ required_shared_ptr<UINT8> m_dai3wksi_videoram; @@ -68,6 +69,7 @@ public: virtual void machine_start(); virtual void machine_reset(); UINT32 screen_update_dai3wksi(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index df6b8914f17..ba296226015 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -65,7 +65,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_bgram(*this, "bgram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_mainram; @@ -109,6 +110,7 @@ public: UINT32 screen_update_ddayjlc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(ddayjlc_interrupt); INTERRUPT_GEN_MEMBER(ddayjlc_snd_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 482e5154fb9..8e93129bfb8 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -125,7 +125,8 @@ public: m_right_fg_vram_bottom(*this, "right_fg_vrabot"), m_back_vram(*this, "back_vram"), m_work_ram(*this, "work_ram"), - m_mcu_shared_ram(*this, "mcu_shared_ram"){ } + m_mcu_shared_ram(*this, "mcu_shared_ram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_vregs; @@ -159,6 +160,7 @@ public: UINT32 screen_update_ddealer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(ddealer_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(ddealer_mcu_sim); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c index f291a4d89d0..173beb29bd9 100644 --- a/src/mame/drivers/ddz.c +++ b/src/mame/drivers/ddz.c @@ -20,12 +20,14 @@ class ddz_state : public driver_device { public: ddz_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } virtual void video_start(); UINT32 screen_update_ddz(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void screen_eof_ddz(screen_device &screen, bool state); INTERRUPT_GEN_MEMBER(ddz_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c index 8caedd96228..0b30886d7cf 100644 --- a/src/mame/drivers/dgpix.c +++ b/src/mame/drivers/dgpix.c @@ -58,7 +58,8 @@ class dgpix_state : public driver_device { public: dgpix_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT32 *m_vram; int m_vbuffer; @@ -79,6 +80,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_dgpix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 9533c25476c..a2afd215e3c 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -51,7 +51,8 @@ class discoboy_state : public driver_device public: discoboy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_audiocpu(*this, "audiocpu") { } + m_audiocpu(*this, "audiocpu") , + m_maincpu(*this, "maincpu") { } /* video-related */ UINT8 m_ram_bank; @@ -91,6 +92,7 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void discoboy_setrombank( UINT8 data ); DECLARE_WRITE_LINE_MEMBER(yunsung8_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index 224a076140f..3f21e160b95 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -59,7 +59,8 @@ public: diverboy_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -73,6 +74,7 @@ public: virtual void video_start(); UINT32 screen_update_diverboy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index b27dfa8e34a..a474e031852 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -53,7 +53,8 @@ public: m_ldv1000(*this, "ld_ldv1000"), m_pr7820(*this, "ld_pr7820"), m_22vp932(*this, "ld_22vp932") , - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } void laserdisc_data_w(UINT8 data) { @@ -118,6 +119,7 @@ public: DECLARE_WRITE_LINE_MEMBER(dleuro_interrupt); DECLARE_WRITE16_MEMBER(serial_transmit); DECLARE_READ16_MEMBER(serial_receive); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index 60d7485ced7..9bc144bb817 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -64,7 +64,8 @@ public: m_scroll_ram(*this, "scroll_ram"), m_sprite_ram(*this, "sprite_ram"), m_dderby_vidchars(*this, "vidchars"), - m_dderby_vidattribs(*this, "vidattribs"){ } + m_dderby_vidattribs(*this, "vidattribs"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_scroll_ram; required_shared_ptr<UINT8> m_sprite_ram; @@ -83,6 +84,7 @@ public: UINT32 screen_update_dderby(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(dderby_irq); INTERRUPT_GEN_MEMBER(dderby_timer_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index 4cdb0320a38..09a0e63b399 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -71,7 +71,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_bgram(*this, "bgram"){ } + m_bgram(*this, "bgram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -87,6 +88,7 @@ public: virtual void video_start(); UINT32 screen_update_dominob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; void dominob_state::video_start() diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index 5a532e0d71a..6ee9de6bbe7 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -20,7 +20,8 @@ class dorachan_state : public driver_device public: dorachan_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -36,6 +37,7 @@ public: virtual void machine_start(); virtual void machine_reset(); UINT32 screen_update_dorachan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c index 9bc3e393372..91014491923 100644 --- a/src/mame/drivers/dotrikun.c +++ b/src/mame/drivers/dotrikun.c @@ -29,7 +29,8 @@ class dotrikun_state : public driver_device public: dotrikun_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_dotrikun_bitmap(*this, "dotrikun_bitmap"){ } + m_dotrikun_bitmap(*this, "dotrikun_bitmap"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_dotrikun_bitmap; @@ -40,6 +41,7 @@ public: virtual void machine_start(); virtual void machine_reset(); UINT32 screen_update_dotrikun(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 4b06ccc3c17..31f4da73aa9 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -131,7 +131,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_bg2_videoram(*this, "bg2_videoram"), m_vregs(*this, "vregs"), - m_workram(*this, "workram"){ } + m_workram(*this, "workram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT32> m_spriteram; @@ -166,6 +167,7 @@ public: UINT32 screen_update_dreamwld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_dreamwld(screen_device &screen, bool state); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index d11576a0891..ccc2274e43e 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -18,7 +18,8 @@ public: : driver_device(mconfig, type, tag), m_videoram_fg(*this, "videorafg"), m_videoram_bg(*this, "videorabg"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram_fg; @@ -42,6 +43,7 @@ public: virtual void video_start(); UINT32 screen_update_drtomy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index 05a31d08f6e..13238957d7a 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -35,7 +35,8 @@ class drw80pkr_state : public driver_device { public: drw80pkr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } tilemap_t *m_bg_tilemap; UINT8 m_t0; @@ -71,6 +72,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_drw80pkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index ed3100f8f29..7a3ad5b8a8f 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -62,7 +62,8 @@ class dunhuang_state : public driver_device { public: dunhuang_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } /* video-related */ tilemap_t *m_tmap; @@ -123,6 +124,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_dunhuang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index 5797645eb01..e6f35a3a5f1 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -43,7 +43,8 @@ class dynadice_state : public driver_device public: dynadice_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -66,6 +67,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_dynadice(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ecoinf1.c b/src/mame/drivers/ecoinf1.c index abc8016e3ef..28b0162ca1c 100644 --- a/src/mame/drivers/ecoinf1.c +++ b/src/mame/drivers/ecoinf1.c @@ -17,8 +17,10 @@ class ecoinf1_state : public driver_device { public: ecoinf1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_DRIVER_INIT(ecoinf1); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ecoinf2.c b/src/mame/drivers/ecoinf2.c index 4b5f9f3689e..37098e1fa20 100644 --- a/src/mame/drivers/ecoinf2.c +++ b/src/mame/drivers/ecoinf2.c @@ -15,9 +15,11 @@ class ecoinf2_state : public driver_device { public: ecoinf2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_WRITE8_MEMBER(ox_port5c_out_w); DECLARE_DRIVER_INIT(ecoinf2); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ecoinfr.c b/src/mame/drivers/ecoinfr.c index e6e3e346ede..610fa09d71e 100644 --- a/src/mame/drivers/ecoinfr.c +++ b/src/mame/drivers/ecoinfr.c @@ -52,7 +52,8 @@ class ecoinfr_state : public driver_device { public: ecoinfr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } int irq_toggle; int m_optic_pattern; @@ -109,6 +110,7 @@ public: UINT8 m_credsel; DECLARE_MACHINE_START(ecoinfr); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 891883d2d09..b899370ceb8 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -51,7 +51,8 @@ public: egghunt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), - m_atram(*this, "atram"){ } + m_atram(*this, "atram"), + m_maincpu(*this, "maincpu") { } /* video-related */ tilemap_t *m_bg_tilemap; @@ -82,6 +83,7 @@ public: virtual void video_start(); UINT32 screen_update_egghunt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c index 40872049e0f..cecb1208dee 100644 --- a/src/mame/drivers/embargo.c +++ b/src/mame/drivers/embargo.c @@ -13,7 +13,8 @@ class embargo_state : public driver_device public: embargo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -30,6 +31,7 @@ public: virtual void machine_start(); virtual void machine_reset(); UINT32 screen_update_embargo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index a955705f86c..fc30d23944e 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -35,7 +35,8 @@ public: : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , m_tile_ram(*this, "tile_ram"), - m_tile_control_ram(*this, "tile_ctrl_ram"){ } + m_tile_control_ram(*this, "tile_ctrl_ram"), + m_maincpu(*this, "maincpu") { } required_device<pioneer_ldv1000_device> m_laserdisc; required_shared_ptr<UINT8> m_tile_ram; @@ -52,6 +53,7 @@ public: UINT32 screen_update_esh(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_callback_esh); TIMER_CALLBACK_MEMBER(irq_stop); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index 7e040f29a89..135c7604179 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -37,7 +37,8 @@ public: ettrivia_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), - m_bg_videoram(*this, "bg_videoram"){ } + m_bg_videoram(*this, "bg_videoram"), + m_maincpu(*this, "maincpu") { } int m_palreg; int m_gfx_bank; @@ -63,6 +64,7 @@ public: UINT32 screen_update_ettrivia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(ettrivia_interrupt); inline void get_tile_info(tile_data &tileinfo, int tile_index, UINT8 *vidram, int gfx_code); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index ff69353b715..54130f393fe 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -163,8 +163,8 @@ public: m_galsnew_fg_pixram(*this, "galsnew_fgram"), m_view2_0(*this, "view2_0"), m_kaneko_spr(*this, "kan_spr"), - m_spriteram(*this, "spriteram") - { } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT16> m_galsnew_bg_pixram; optional_shared_ptr<UINT16> m_galsnew_fg_pixram; @@ -184,6 +184,7 @@ public: virtual void palette_init(); UINT32 screen_update_galsnew(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(expro02_scanline); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/extrema.c b/src/mame/drivers/extrema.c index 3d01e1496b0..29279f80ea3 100644 --- a/src/mame/drivers/extrema.c +++ b/src/mame/drivers/extrema.c @@ -18,8 +18,10 @@ class extrema_state : public driver_device { public: extrema_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/famibox.c b/src/mame/drivers/famibox.c index b4061838077..e83c7c48f9b 100644 --- a/src/mame/drivers/famibox.c +++ b/src/mame/drivers/famibox.c @@ -70,7 +70,8 @@ class famibox_state : public driver_device { public: famibox_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8* m_nt_ram; UINT8* m_nt_page[4]; @@ -116,6 +117,7 @@ public: void famicombox_bankswitch(UINT8 bank); void famicombox_reset(); void ppu_irq(int *ppu_regs); + required_device<cpu_device> m_maincpu; }; /****************************************************** diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c index c97245dc0d4..9bb08c24c2a 100644 --- a/src/mame/drivers/feversoc.c +++ b/src/mame/drivers/feversoc.c @@ -69,7 +69,8 @@ class feversoc_state : public driver_device public: feversoc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } UINT16 m_x; required_shared_ptr<UINT32> m_spriteram; @@ -80,6 +81,7 @@ public: virtual void video_start(); UINT32 screen_update_feversoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(feversoc_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index 6d268be2aa1..d504a8e37f6 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -168,7 +168,8 @@ class firebeat_state : public driver_device public: firebeat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_work_ram(*this, "work_ram"){ } + m_work_ram(*this, "work_ram"), + m_maincpu(*this, "maincpu") { } UINT8 m_extend_board_irq_enable; UINT8 m_extend_board_irq_active; @@ -260,6 +261,7 @@ public: void init_firebeat(); void init_keyboard(); DECLARE_WRITE_LINE_MEMBER(sound_irq_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 0aac2af1a45..5ae42de1644 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -44,7 +44,8 @@ public: m_tileram(*this, "tileram"), m_spriteram(*this, "spriteram"), m_sprite_palette(*this, "sprite_palette"), - m_tile_palette(*this, "tile_palette"){ } + m_tile_palette(*this, "tile_palette"), + m_maincpu(*this, "maincpu") { } required_device<phillips_22vp931_device> m_laserdisc; required_shared_ptr<unsigned char> m_tileram; @@ -102,6 +103,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(video_timer_callback); void set_rgba( int start, int index, unsigned char *palette_ram ); void firq_gen(phillips_22vp931_device &laserdisc, int state); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/forte2.c b/src/mame/drivers/forte2.c index 8b6d766f207..889c09bbd28 100644 --- a/src/mame/drivers/forte2.c +++ b/src/mame/drivers/forte2.c @@ -30,7 +30,8 @@ class forte2_state : public driver_device { public: forte2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_input_mask; DECLARE_READ8_MEMBER(forte2_ay8910_read_input); @@ -39,6 +40,7 @@ public: DECLARE_DRIVER_INIT(pesadelo); virtual void machine_start(); virtual void machine_reset(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/fresh.c b/src/mame/drivers/fresh.c index 947a820ca83..be8a4a33125 100644 --- a/src/mame/drivers/fresh.c +++ b/src/mame/drivers/fresh.c @@ -36,9 +36,8 @@ public: m_attr_videoram(*this, "attr_videoram"), m_attr_2_videoram(*this, "attr_videoram_2"), m_paletteram_1(*this, "paletteram_1"), - m_paletteram_2(*this, "paletteram_2") - - { } + m_paletteram_2(*this, "paletteram_2"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_bg_tilemap; tilemap_t *m_bg_2_tilemap; @@ -100,6 +99,7 @@ public: virtual void video_start(); UINT32 screen_update_fresh(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index be5840db961..255f5617dac 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -54,7 +54,8 @@ public: m_bg2_ram(*this, "bg2_ram"), m_bg3_ram(*this, "bg3_ram"), m_bg4_ram(*this, "bg4_ram"), - m_fg_ram(*this, "fg_ram"){ } + m_fg_ram(*this, "fg_ram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg1_ram; @@ -96,6 +97,7 @@ public: virtual void video_start(); UINT32 screen_update_galaxi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void show_out( ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/galgame.c b/src/mame/drivers/galgame.c index 8d5422ebeed..1a2ca95ef4b 100644 --- a/src/mame/drivers/galgame.c +++ b/src/mame/drivers/galgame.c @@ -18,7 +18,8 @@ class galaxygame_state : public driver_device { public: galaxygame_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT16 m_clk; @@ -50,6 +51,7 @@ public: UINT32 screen_update_galaxygame(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(galaxygame_irq); IRQ_CALLBACK_MEMBER(galaxygame_irq_callback); + required_device<cpu_device> m_maincpu; }; /************************************* diff --git a/src/mame/drivers/gambl186.c b/src/mame/drivers/gambl186.c index 990a00a7089..4266ad074fc 100644 --- a/src/mame/drivers/gambl186.c +++ b/src/mame/drivers/gambl186.c @@ -35,12 +35,14 @@ class gambl186_state : public driver_device { public: gambl186_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT32 screen_update_gambl186(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; } + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index 34e6a8269fd..fae23394014 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -80,7 +80,8 @@ class gamecstl_state : public driver_device public: gamecstl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_cga_ram(*this, "cga_ram"){ } + m_cga_ram(*this, "cga_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_cga_ram; UINT32 *m_bios_ram; @@ -123,6 +124,7 @@ public: IRQ_CALLBACK_MEMBER(irq_callback); void draw_char(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx, int ch, int att, int x, int y); void intel82439tx_init(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/gammagic.c b/src/mame/drivers/gammagic.c index 59fda7c1307..a966e0579e6 100644 --- a/src/mame/drivers/gammagic.c +++ b/src/mame/drivers/gammagic.c @@ -76,7 +76,8 @@ class gammagic_state : public driver_device { public: gammagic_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } int m_dma_channel; UINT8 m_dma_offset[2][4]; @@ -103,6 +104,7 @@ public: DECLARE_DRIVER_INIT(gammagic); IRQ_CALLBACK_MEMBER(irq_callback); + required_device<cpu_device> m_maincpu; }; //static void atapi_irq(running_machine &machine, int state); diff --git a/src/mame/drivers/gamtor.c b/src/mame/drivers/gamtor.c index 6b66239baa6..49fc9adca1b 100644 --- a/src/mame/drivers/gamtor.c +++ b/src/mame/drivers/gamtor.c @@ -32,10 +32,12 @@ class gaminator_state : public driver_device { public: gaminator_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_WRITE32_MEMBER(gamtor_unk_w); DECLARE_DRIVER_INIT(gaminator); + required_device<cpu_device> m_maincpu; }; WRITE32_MEMBER(gaminator_state::gamtor_unk_w) diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c index f61026d94cd..e61624db5ba 100644 --- a/src/mame/drivers/gei.c +++ b/src/mame/drivers/gei.c @@ -81,7 +81,8 @@ class gei_state : public driver_device { public: gei_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } virtual void video_start(); @@ -135,6 +136,7 @@ public: virtual void palette_init(); DECLARE_PALETTE_INIT(quizvid); INTERRUPT_GEN_MEMBER(vblank_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c index d8f2929cfb6..78a873c4749 100644 --- a/src/mame/drivers/ghosteo.c +++ b/src/mame/drivers/ghosteo.c @@ -84,8 +84,8 @@ public: ghosteo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_system_memory(*this, "systememory"), - m_i2cmem(*this, "i2cmem") - { } + m_i2cmem(*this, "i2cmem"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_system_memory; required_device<i2cmem_device> m_i2cmem; @@ -104,6 +104,7 @@ public: DECLARE_DRIVER_INIT(bballoon); virtual void machine_start(); virtual void machine_reset(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index e0343686942..e84e32d5223 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -41,7 +41,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), - m_soundcpu(*this, "soundcpu"){ } + m_soundcpu(*this, "soundcpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -55,6 +56,7 @@ public: virtual void machine_start(); virtual void video_start(); UINT32 screen_update_go2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/goldngam.c b/src/mame/drivers/goldngam.c index c631519e6f4..2c6af57b584 100644 --- a/src/mame/drivers/goldngam.c +++ b/src/mame/drivers/goldngam.c @@ -242,13 +242,15 @@ class goldngam_state : public driver_device public: goldngam_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_videoram; DECLARE_READ16_MEMBER(unk_r); virtual void video_start(); virtual void palette_init(); UINT32 screen_update_goldngam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 14b020013fa..4fd4da0a1dd 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -961,7 +961,8 @@ public: goldnpkr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -1005,6 +1006,7 @@ public: DECLARE_VIDEO_START(wcrdxtnd); DECLARE_PALETTE_INIT(wcrdxtnd); UINT32 screen_update_goldnpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index 0b37a914c17..b58bd97c09e 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -41,7 +41,8 @@ public: good_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_tilemapram(*this, "fg_tilemapram"), - m_bg_tilemapram(*this, "bg_tilemapram"){ } + m_bg_tilemapram(*this, "bg_tilemapram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_fg_tilemapram; @@ -58,6 +59,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); UINT32 screen_update_good(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c index c009e04d9ed..736e9488f2b 100644 --- a/src/mame/drivers/goodejan.c +++ b/src/mame/drivers/goodejan.c @@ -61,13 +61,15 @@ class goodejan_state : public driver_device { public: goodejan_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT16 m_mux_data; DECLARE_WRITE16_MEMBER(goodejan_gfxbank_w); DECLARE_READ16_MEMBER(mahjong_panel_r); DECLARE_WRITE16_MEMBER(mahjong_panel_w); INTERRUPT_GEN_MEMBER(goodejan_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index 76dee71277f..fe8cee1dc01 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -52,7 +52,8 @@ public: m_laserdisc(*this, "laserdisc") , m_sprite_ram(*this, "sprite_ram"), m_palette_ram(*this, "palette_ram"), - m_tile_ram(*this, "tile_ram"){ } + m_tile_ram(*this, "tile_ram"), + m_maincpu(*this, "maincpu") { } UINT8 m_nmi_enable; UINT8 m_start_lamp; @@ -77,6 +78,7 @@ public: void gpworld_draw_tiles(bitmap_rgb32 &bitmap,const rectangle &cliprect); inline void draw_pixel(bitmap_rgb32 &bitmap,const rectangle &cliprect,int x,int y,int color,int flip); void gpworld_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index eff26273234..3700ef5547a 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -240,8 +240,8 @@ class gticlub_state : public driver_device public: gticlub_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_work_ram(*this, "work_ram") - { } + m_work_ram(*this, "work_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_work_ram; UINT32 *m_sharc_dataram_0; @@ -268,6 +268,7 @@ public: DECLARE_MACHINE_RESET(hangplt); INTERRUPT_GEN_MEMBER(gticlub_vblank); TIMER_CALLBACK_MEMBER(irq_off); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c index edb30062b79..f3e179c8182 100644 --- a/src/mame/drivers/guab.c +++ b/src/mame/drivers/guab.c @@ -77,7 +77,8 @@ class guab_state : public driver_device public: guab_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_sn(*this, "snsnd") { } + m_sn(*this, "snsnd") , + m_maincpu(*this, "maincpu") { } /* devices */ required_device<sn76489_device> m_sn; @@ -100,6 +101,7 @@ public: virtual void video_start(); UINT32 screen_update_guab(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(fdc_data_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index ae165d00171..b825aa4a38c 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -212,7 +212,8 @@ public: halleys_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_blitter_ram(*this, "blitter_ram"), - m_io_ram(*this, "io_ram"){ } + m_io_ram(*this, "io_ram"), + m_maincpu(*this, "maincpu") { } UINT16 *m_render_layer[MAX_LAYERS]; UINT8 m_sound_fifo[MAX_SOUNDS]; @@ -276,6 +277,7 @@ public: void copy_fixed_2b(bitmap_ind16 &bitmap, UINT16 *source); void filter_bitmap(bitmap_ind16 &bitmap, int mask); void init_common(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/headonb.c b/src/mame/drivers/headonb.c index 9d78009b4fa..bba6e99912f 100644 --- a/src/mame/drivers/headonb.c +++ b/src/mame/drivers/headonb.c @@ -35,8 +35,8 @@ class headonb_state : public driver_device public: headonb_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_video_ram(*this, "video_ram") - { } + m_video_ram(*this, "video_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_video_ram; @@ -48,6 +48,7 @@ public: virtual void video_start(); UINT32 screen_update_headonb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TILE_GET_INFO_MEMBER(get_headonb_tile_info); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c index 4d38548ca37..d8d243fcbfe 100644 --- a/src/mame/drivers/highvdeo.c +++ b/src/mame/drivers/highvdeo.c @@ -107,7 +107,8 @@ class highvdeo_state : public driver_device public: highvdeo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_blit_ram(*this, "blit_ram"){ } + m_blit_ram(*this, "blit_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_blit_ram; UINT16 m_vblank_bit; @@ -141,6 +142,7 @@ public: UINT32 screen_update_tourvisn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); UINT32 screen_update_brasil(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c index 0064de9170f..8b8703ca80c 100644 --- a/src/mame/drivers/hikaru.c +++ b/src/mame/drivers/hikaru.c @@ -391,9 +391,11 @@ class hikaru_state : public driver_device { public: hikaru_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } virtual void video_start(); UINT32 screen_update_hikaru(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; void hikaru_state::video_start() diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c index b4fd7db361b..a129e2ef0a1 100644 --- a/src/mame/drivers/hitpoker.c +++ b/src/mame/drivers/hitpoker.c @@ -54,8 +54,8 @@ class hitpoker_state : public driver_device public: hitpoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_sys_regs(*this, "sys_regs") - { } + m_sys_regs(*this, "sys_regs"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_sys_regs; @@ -83,6 +83,7 @@ public: virtual void video_start(); UINT32 screen_update_hitpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(hitpoker_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index aa2a7ae5def..1df3b31f90c 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -331,7 +331,8 @@ public: : driver_device(mconfig, type, tag), m_workram(*this, "workram"), m_sharc_dataram0(*this, "sharc_dataram0"), - m_sharc_dataram1(*this, "sharc_dataram1") { } + m_sharc_dataram1(*this, "sharc_dataram1") , + m_maincpu(*this, "maincpu") { } UINT8 m_led_reg0; UINT8 m_led_reg1; @@ -375,6 +376,7 @@ public: int jvs_encode_data(UINT8 *in, int length); int jvs_decode_data(UINT8 *in, UINT8 *out, int length); void jamma_jvs_cmd_exec(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index 61a3fe967b3..ed23b83b9e8 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -50,7 +50,8 @@ class hotblock_state : public driver_device public: hotblock_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_vram(*this, "vram"){ } + m_vram(*this, "vram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_vram; @@ -69,6 +70,7 @@ public: virtual void video_start(); UINT32 screen_update_hotblock(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(hotblocks_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/hotstuff.c b/src/mame/drivers/hotstuff.c index e9601efafb2..c50532b1d25 100644 --- a/src/mame/drivers/hotstuff.c +++ b/src/mame/drivers/hotstuff.c @@ -9,7 +9,8 @@ class hotstuff_state : public driver_device public: hotstuff_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_bitmapram(*this, "bitmapram"){ } + m_bitmapram(*this, "bitmapram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_bitmapram; struct @@ -22,6 +23,7 @@ public: DECLARE_WRITE8_MEMBER(ioboard_reg_w); virtual void video_start(); UINT32 screen_update_hotstuff(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index 6b5e346d13a..a581b94618e 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -42,7 +42,8 @@ public: m_gp98_reel4_ram(*this, "gp98_reel4_ram"), m_bg_scroll2(*this, "bg_scroll2"), m_fg_tile_ram(*this, "fg_tile_ram"), - m_fg_color_ram(*this, "fg_color_ram"){ } + m_fg_color_ram(*this, "fg_color_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_bg_scroll; required_shared_ptr<UINT8> m_gp98_reel1_ram; @@ -91,6 +92,7 @@ public: DECLARE_VIDEO_START(gp98); UINT32 screen_update_jingbell(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jingbell_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index 8f665f2aec0..3779605fe7e 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -36,8 +36,8 @@ public: m_igs_cg_videoram(*this, "igs_cg_videoram"), m_igs_palette32(*this, "igs_palette32"), m_igs_tx_videoram(*this, "igs_tx_videoram"), - m_igs_bg_videoram(*this, "igs_bg_videoram") - { } + m_igs_bg_videoram(*this, "igs_bg_videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_igs_mainram; required_shared_ptr<UINT32> m_igs_cg_videoram; @@ -71,6 +71,7 @@ public: INTERRUPT_GEN_MEMBER(igs_majhong_interrupt); void sdwx_gfx_decrypt(); void pgm_create_dummy_internal_arm_region(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/igs_m036.c b/src/mame/drivers/igs_m036.c index bcecfc19029..b57046abfca 100644 --- a/src/mame/drivers/igs_m036.c +++ b/src/mame/drivers/igs_m036.c @@ -65,10 +65,12 @@ class igs_m036_state : public driver_device { public: igs_m036_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT32 screen_update_igs_m036(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_DRIVER_INIT(igs_m036); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index b850346b302..dfbd8149e72 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -33,7 +33,8 @@ public: m_laserdisc(*this, "laserdisc") , m_tile_ram(*this, "tile_ram"), m_tile_control_ram(*this, "tile_ctrl_ram"), - m_sprite_ram(*this, "sprite_ram"){ } + m_sprite_ram(*this, "sprite_ram"), + m_maincpu(*this, "maincpu") { } required_device<pioneer_ldv1000_device> m_laserdisc; required_shared_ptr<UINT8> m_tile_ram; @@ -55,6 +56,7 @@ public: virtual void palette_init(); UINT32 screen_update_istellar(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_callback_istellar); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c index 8c05af68365..6c01d89b560 100644 --- a/src/mame/drivers/itgambl2.c +++ b/src/mame/drivers/itgambl2.c @@ -61,7 +61,8 @@ class itgambl2_state : public driver_device { public: itgambl2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } int m_test_x; int m_test_y; @@ -70,6 +71,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_itgambl2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c index 17cde562b8a..aabf7408705 100644 --- a/src/mame/drivers/itgambl3.c +++ b/src/mame/drivers/itgambl3.c @@ -49,7 +49,8 @@ class itgambl3_state : public driver_device { public: itgambl3_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } int m_test_x; int m_test_y; @@ -58,6 +59,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_itgambl3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index f017d5187f9..20c647cb627 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -27,7 +27,8 @@ public: jackpool_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), - m_io(*this, "io"){ } + m_io(*this, "io"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_vram; UINT8 m_map_vreg; @@ -39,6 +40,7 @@ public: virtual void video_start(); UINT32 screen_update_jackpool(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jackpool_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index 04952577571..ba3e0ed0304 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -124,7 +124,8 @@ public: m_sc2_vram(*this, "sc2_vram"), m_sc3_vram(*this, "sc3_vram"), m_jm_shared_ram(*this, "jshared_ram"), - m_jm_mcu_code(*this, "jmcu_code"){ } + m_jm_mcu_code(*this, "jmcu_code"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_sc0_tilemap_0; tilemap_t *m_sc0_tilemap_1; @@ -217,6 +218,7 @@ public: void mjzoomin_mcu_run(); void urashima_mcu_run(); void second_mcu_run(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/jankenmn.c b/src/mame/drivers/jankenmn.c index 098faf955da..13f1b05c76c 100644 --- a/src/mame/drivers/jankenmn.c +++ b/src/mame/drivers/jankenmn.c @@ -149,12 +149,14 @@ class jankenmn_state : public driver_device { public: jankenmn_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_CUSTOM_INPUT_MEMBER(jankenmn_hopper_status_r); DECLARE_WRITE8_MEMBER(jankenmn_lamps1_w); DECLARE_WRITE8_MEMBER(jankenmn_lamps2_w); DECLARE_WRITE8_MEMBER(jankenmn_lamps3_w); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c index e77d4ea2f81..7aef014ad3c 100644 --- a/src/mame/drivers/jantotsu.c +++ b/src/mame/drivers/jantotsu.c @@ -103,7 +103,8 @@ class jantotsu_state : public driver_device { public: jantotsu_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } /* sound-related */ UINT32 m_adpcm_pos; @@ -132,6 +133,7 @@ public: virtual void palette_init(); UINT32 screen_update_jantotsu(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(jan_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c index ade025e82d0..782e3b4c7f9 100644 --- a/src/mame/drivers/jokrwild.c +++ b/src/mame/drivers/jokrwild.c @@ -103,7 +103,8 @@ public: jokrwild_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -118,6 +119,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_jokrwild(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 3f036e5a44a..07e0b7e9e76 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -111,7 +111,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_bitmap(*this, "bitmap"), - m_bulletram(*this, "bulletram"){ } + m_bulletram(*this, "bulletram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -143,6 +144,7 @@ public: UINT32 screen_update_fspider(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jollyjgr_interrupt); void draw_bitmap( bitmap_ind16 &bitmap ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index f05fadcb003..c321de8f89e 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -37,7 +37,8 @@ class jongkyo_state : public driver_device public: jongkyo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } /* misc */ UINT8 m_rom_bank; @@ -59,6 +60,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_jongkyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/jubilee.c b/src/mame/drivers/jubilee.c index 4e69f4468d8..9fb0214638d 100644 --- a/src/mame/drivers/jubilee.c +++ b/src/mame/drivers/jubilee.c @@ -95,7 +95,8 @@ class jubilee_state : public driver_device public: jubilee_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -106,6 +107,7 @@ public: virtual void palette_init(); UINT32 screen_update_jubileep(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(jubileep_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c index db9bfe215fe..a301f3a9de2 100644 --- a/src/mame/drivers/kinst.c +++ b/src/mame/drivers/kinst.c @@ -144,7 +144,8 @@ public: m_rambase(*this, "rambase"), m_rambase2(*this, "rambase2"), m_control(*this, "control"), - m_rombase(*this, "rombase"){ } + m_rombase(*this, "rombase"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_rambase; required_shared_ptr<UINT32> m_rambase2; @@ -166,6 +167,7 @@ public: UINT32 screen_update_kinst(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(irq0_start); TIMER_CALLBACK_MEMBER(irq0_stop); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index 7f817bb856a..9f2b1f55a97 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -50,7 +50,8 @@ class koikoi_state : public driver_device public: koikoi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -74,6 +75,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_koikoi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index f694e6b243b..88660d08681 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -60,7 +60,8 @@ class konamigq_state : public driver_device public: konamigq_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_am53cf96(*this, "scsi:am53cf96"){ } + m_am53cf96(*this, "scsi:am53cf96"), + m_maincpu(*this, "maincpu") { } required_device<am53cf96_device> m_am53cf96; @@ -86,6 +87,7 @@ public: DECLARE_MACHINE_RESET(konamigq); void scsi_dma_read( UINT32 *p_n_psxram, UINT32 n_address, INT32 n_size ); void scsi_dma_write( UINT32 *p_n_psxram, UINT32 n_address, INT32 n_size ); + required_device<cpu_device> m_maincpu; }; /* Sound */ diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index 9d7fa11d1ba..6ea0340baa2 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -135,7 +135,8 @@ class konamigv_state : public driver_device public: konamigv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_am53cf96(*this, "scsi:am53cf96"){ } + m_am53cf96(*this, "scsi:am53cf96"), + m_maincpu(*this, "maincpu") { } required_device<am53cf96_device> m_am53cf96; @@ -172,6 +173,7 @@ public: DECLARE_MACHINE_START(konamigv); void scsi_dma_read( UINT32 *p_n_psxram, UINT32 n_address, INT32 n_size ); void scsi_dma_write( UINT32 *p_n_psxram, UINT32 n_address, INT32 n_size ); + required_device<cpu_device> m_maincpu; }; /* EEPROM handlers */ diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c index 5f80bbb4330..c4cbbf646c3 100644 --- a/src/mame/drivers/konamim2.c +++ b/src/mame/drivers/konamim2.c @@ -205,7 +205,8 @@ class konamim2_state : public driver_device public: konamim2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_main_ram(*this, "main_ram"){ } + m_main_ram(*this, "main_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT64> m_main_ram; UINT32 m_vdl0_address; @@ -255,6 +256,7 @@ public: void cde_handle_command(); void cde_handle_reports(); void cde_dma_transfer(address_space &space, int channel, int next); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index 1125a522a6e..55184c82abf 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -534,9 +534,8 @@ public: ksys573_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_psxirq(*this, ":maincpu:irq"), - m_cr589(*this, ":cdrom") - { - } + m_cr589(*this, ":cdrom"), + m_maincpu(*this, "maincpu") { } required_device<psxirq_device> m_psxirq; @@ -667,6 +666,7 @@ public: void hyperbbc_lamp_callback( int data ); void mamboagg_output_callback( int offset, int data ); void punchmania_output_callback( int offset, int data ); + required_device<cpu_device> m_maincpu; }; void ATTR_PRINTF(3,4) ksys573_state::verboselog( int n_level, const char *s_fmt, ... ) diff --git a/src/mame/drivers/kungfur.c b/src/mame/drivers/kungfur.c index 6331e2852bc..ce2def6db2f 100644 --- a/src/mame/drivers/kungfur.c +++ b/src/mame/drivers/kungfur.c @@ -66,7 +66,8 @@ class kungfur_state : public driver_device { public: kungfur_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_latch[3]; UINT8 m_control; @@ -86,6 +87,7 @@ public: INTERRUPT_GEN_MEMBER(kungfur_irq); DECLARE_WRITE_LINE_MEMBER(kfr_adpcm1_int); DECLARE_WRITE_LINE_MEMBER(kfr_adpcm2_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/kurukuru.c b/src/mame/drivers/kurukuru.c index 918db09f06d..8d583ed160b 100644 --- a/src/mame/drivers/kurukuru.c +++ b/src/mame/drivers/kurukuru.c @@ -205,8 +205,8 @@ public: kurukuru_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), - m_v9938(*this, "v9938") - { } + m_v9938(*this, "v9938"), + m_maincpu(*this, "maincpu") { } required_device<cpu_device> m_audiocpu; required_device<v9938_device> m_v9938; @@ -230,6 +230,7 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(kurukuru_vdp_scanline); DECLARE_WRITE_LINE_MEMBER(kurukuru_msm5205_vck); DECLARE_WRITE_LINE_MEMBER(kurukuru_vdp_interrupt); + required_device<cpu_device> m_maincpu; }; #define MAIN_CLOCK XTAL_21_4772MHz diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c index c3aa6670126..f7c919a3f1c 100644 --- a/src/mame/drivers/laserbas.c +++ b/src/mame/drivers/laserbas.c @@ -40,7 +40,8 @@ class laserbas_state : public driver_device public: laserbas_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_protram(*this, "protram"){ } + m_protram(*this, "protram"), + m_maincpu(*this, "maincpu") { } /* misc */ int m_count; @@ -60,6 +61,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_laserbas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c index f0db4a33c6d..37ce0e25b4a 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -76,7 +76,8 @@ public: : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , m_tile_ram(*this, "tile_ram"), - m_tile_control_ram(*this, "tile_ctrl_ram"){ } + m_tile_control_ram(*this, "tile_ctrl_ram"), + m_maincpu(*this, "maincpu") { } required_device<pioneer_ldv1000_device> m_laserdisc; required_shared_ptr<UINT8> m_tile_ram; @@ -89,6 +90,7 @@ public: UINT32 screen_update_lgp(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_callback_lgp); TIMER_CALLBACK_MEMBER(irq_stop); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index f3a32ed836a..5e336d615b4 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -40,7 +40,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), - m_videoreg(*this, "videoreg"){ } + m_videoreg(*this, "videoreg"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_mainram; required_shared_ptr<UINT32> m_fg_videoram; @@ -90,6 +91,7 @@ public: UINT32 screen_update_limenko(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(UINT32 *sprites, const rectangle &cliprect, int count); void copy_sprites(bitmap_ind16 &bitmap, bitmap_ind16 &sprites_bitmap, bitmap_ind8 &priority_bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /***************************************************************************************************** diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index 5dae3406456..05f02e42555 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -101,7 +101,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -145,6 +146,7 @@ public: UINT32 screen_update_looping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(looping_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index 2d805571ac2..fea0a47ad47 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -24,7 +24,8 @@ public: ltcasino_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tile_num_ram(*this, "tile_nuram"), - m_tile_atr_ram(*this, "tile_atr_ram"){ } + m_tile_atr_ram(*this, "tile_atr_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_tile_num_ram; required_shared_ptr<UINT8> m_tile_atr_ram; @@ -35,6 +36,7 @@ public: TILE_GET_INFO_MEMBER(get_ltcasino_tile_info); virtual void video_start(); UINT32 screen_update_ltcasino(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c index 454affea0ab..a993763ff03 100644 --- a/src/mame/drivers/luckgrln.c +++ b/src/mame/drivers/luckgrln.c @@ -102,7 +102,8 @@ public: m_reel4_scroll(*this, "reel4_scroll"), m_luck_vram1(*this, "luck_vram1"), m_luck_vram2(*this, "luck_vram2"), - m_luck_vram3(*this, "luck_vram3"){ } + m_luck_vram3(*this, "luck_vram3"), + m_maincpu(*this, "maincpu") { } UINT8 m_nmi_enable; tilemap_t *m_reel1_tilemap; @@ -152,6 +153,7 @@ public: virtual void video_start(); UINT32 screen_update_luckgrln(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(luckgrln_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index 4fa9636f052..2788a0eb8ef 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -131,7 +131,8 @@ public: m_videoram2(*this, "videoram2"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_soundcpu(*this, "soundcpu"){ } + m_soundcpu(*this, "soundcpu"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_scrollram; @@ -188,6 +189,7 @@ public: INTERRUPT_GEN_MEMBER(snd_irq); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c index d7608458e54..735eb9e0e4f 100644 --- a/src/mame/drivers/magic10.c +++ b/src/mame/drivers/magic10.c @@ -93,7 +93,8 @@ public: m_layer0_videoram(*this, "layer0_videoram"), m_layer1_videoram(*this, "layer1_videoram"), m_layer2_videoram(*this, "layer2_videoram"), - m_vregs(*this, "vregs"){ } + m_vregs(*this, "vregs"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_layer0_tilemap; tilemap_t *m_layer1_tilemap; @@ -122,6 +123,7 @@ public: TILE_GET_INFO_MEMBER(get_layer2_tile_info); virtual void video_start(); UINT32 screen_update_magic10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c index 9e3a1b1a771..dbe284697b2 100644 --- a/src/mame/drivers/magicard.c +++ b/src/mame/drivers/magicard.c @@ -182,7 +182,8 @@ public: m_scc68070_int_irqc_regs(*this, "scc_iirqc_regs"), m_scc68070_dma_ch1_regs(*this, "scc_dma1_regs"), m_scc68070_dma_ch2_regs(*this, "scc_dma2_regs"), - m_scc68070_mmu_regs(*this, "scc_mmu_regs"){ } + m_scc68070_mmu_regs(*this, "scc_mmu_regs"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_magicram; required_shared_ptr<UINT16> m_pcab_vregs; @@ -220,6 +221,7 @@ public: virtual void video_start(); UINT32 screen_update_magicard(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(magicard_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c index 476dbdd76ef..83dddaa5c20 100644 --- a/src/mame/drivers/magicfly.c +++ b/src/mame/drivers/magicfly.c @@ -448,7 +448,8 @@ public: magicfly_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -465,6 +466,7 @@ public: DECLARE_PALETTE_INIT(bchance); DECLARE_VIDEO_START(7mezzo); UINT32 screen_update_magicfly(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c index 31d72a4398f..561a39dc2bc 100644 --- a/src/mame/drivers/magictg.c +++ b/src/mame/drivers/magictg.c @@ -131,8 +131,7 @@ public: : driver_device(mconfig, type, tag), m_mips(*this, "mips"), m_adsp(*this, "adsp"), - m_pci(*this, "pcibus") - , + m_pci(*this, "pcibus"), m_adsp_pram(*this, "adsp_pram"){ } required_device<cpu_device> m_mips; diff --git a/src/mame/drivers/magtouch.c b/src/mame/drivers/magtouch.c index d61ebaa0cbf..fc07c251d6f 100644 --- a/src/mame/drivers/magtouch.c +++ b/src/mame/drivers/magtouch.c @@ -87,8 +87,8 @@ public: magtouch_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_uart(*this, "ns16450_0"), - m_microtouch(*this, "microtouch") - { } + m_microtouch(*this, "microtouch"), + m_maincpu(*this, "maincpu") { } required_device<ns16450_device> m_uart; required_device<microtouch_serial_device> m_microtouch; @@ -100,6 +100,7 @@ public: DECLARE_WRITE_LINE_MEMBER(at_com_interrupt_1); DECLARE_DRIVER_INIT(magtouch); virtual void machine_start(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/majorpkr.c b/src/mame/drivers/majorpkr.c index cde813dce0b..9b1acac8740 100644 --- a/src/mame/drivers/majorpkr.c +++ b/src/mame/drivers/majorpkr.c @@ -462,7 +462,8 @@ class majorpkr_state : public driver_device public: majorpkr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - oki(*this, "oki") { } + oki(*this, "oki") , + m_maincpu(*this, "maincpu") { } int m_mux_data; int m_palette_bank; @@ -494,6 +495,7 @@ public: TILE_GET_INFO_MEMBER(fg_get_tile_info); virtual void video_start(); UINT32 screen_update_majorpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/manohman.c b/src/mame/drivers/manohman.c index 107d65b57d3..c57131d7e99 100644 --- a/src/mame/drivers/manohman.c +++ b/src/mame/drivers/manohman.c @@ -141,8 +141,10 @@ class _manohman_state : public driver_device { public: _manohman_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index bb9ee6c5687..1751abe96f3 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -102,7 +102,8 @@ class marinedt_state : public driver_device public: marinedt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_tx_tileram(*this, "tx_tileram"){ } + m_tx_tileram(*this, "tx_tileram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_tx_tileram; @@ -153,6 +154,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_marinedt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c index 6e606b16ac8..36405303fbc 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -448,7 +448,8 @@ public: m_nvram(*this, "nvram") , m_workram(*this, "workram"), m_tileram(*this, "tileram"), - m_colram(*this, "colram"){ } + m_colram(*this, "colram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_workram; @@ -481,6 +482,7 @@ public: UINT32 screen_update_mastboy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(mastboy_interrupt); DECLARE_WRITE_LINE_MEMBER(mastboy_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c index 79831a1374f..3f6bd593d08 100644 --- a/src/mame/drivers/maxaflex.c +++ b/src/mame/drivers/maxaflex.c @@ -26,7 +26,8 @@ class maxaflex_state : public driver_device { public: maxaflex_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_portA_in; UINT8 m_portA_out; @@ -61,6 +62,7 @@ public: DECLARE_MACHINE_RESET(supervisor_board); TIMER_DEVICE_CALLBACK_MEMBER(mcu_timer_proc); int atari_input_disabled(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/maygaysw.c b/src/mame/drivers/maygaysw.c index 0ac83fedc30..ef4def127c1 100644 --- a/src/mame/drivers/maygaysw.c +++ b/src/mame/drivers/maygaysw.c @@ -104,7 +104,9 @@ class maygayew_state : public driver_device { public: maygayew_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index 43e1fd18ce4..febd29543a3 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -217,7 +217,8 @@ class maygayv1_state : public driver_device { public: maygayv1_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } int m_vsync_latch_preset; UINT8 m_p1; @@ -246,6 +247,7 @@ public: INTERRUPT_GEN_MEMBER(vsync_interrupt); DECLARE_WRITE8_MEMBER(data_from_i8031); DECLARE_READ8_MEMBER(data_to_i8031); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 649a22e312a..b4c812c2d22 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -21,8 +21,8 @@ public: mayumi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_i8255(*this, "i8255") - { } + m_i8255(*this, "i8255"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -47,6 +47,7 @@ public: virtual void video_start(); UINT32 screen_update_mayumi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(mayumi_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index efe4b61563d..267b79cff9f 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -94,7 +94,8 @@ public: m_main_ram(*this, "main_ram"), m_cga_ram(*this, "cga_ram"), m_bios_ram(*this, "bios_ram"), - m_vram(*this, "vram"){ } + m_vram(*this, "vram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_main_ram; required_shared_ptr<UINT32> m_cga_ram; @@ -208,6 +209,7 @@ public: void report_speedups(); void install_speedups(const speedup_entry *entries, int count); void init_mediagx(); + required_device<cpu_device> m_maincpu; }; // Display controller registers diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index 2c9820bb206..38175863fb1 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -89,7 +89,8 @@ public: : driver_device(mconfig, type, tag), m_ram_attr(*this, "raattr"), m_ram_video(*this, "ravideo"), - m_backup_ram(*this, "backup_ram"){ } + m_backup_ram(*this, "backup_ram"), + m_maincpu(*this, "maincpu") { } void dodge_nvram_init(nvram_device &nvram, void *base, size_t size); pen_t m_pens[NUM_PENS]; @@ -124,6 +125,7 @@ public: DECLARE_DRIVER_INIT(dtrvwz5); virtual void machine_start(); DECLARE_MACHINE_START(casino5); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 2d9cb9b93b8..f46ef090c71 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -187,7 +187,8 @@ public: m_z80pio_1(*this, "z80pio_1"), m_v9938_0(*this, "v9938_0"), m_v9938_1(*this, "v9938_1"), - m_microtouch(*this, "microtouch") { } + m_microtouch(*this, "microtouch") , + m_maincpu(*this, "maincpu") { } DECLARE_WRITE8_MEMBER(microtouch_tx); UINT8* m_ram; @@ -253,6 +254,7 @@ public: UINT8 binary_to_BCD(UINT8 data); DECLARE_WRITE_LINE_MEMBER(meritm_vdp0_interrupt); DECLARE_WRITE_LINE_MEMBER(meritm_vdp1_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/meyc8080.c b/src/mame/drivers/meyc8080.c index f4fea18f44b..8193caaea4d 100644 --- a/src/mame/drivers/meyc8080.c +++ b/src/mame/drivers/meyc8080.c @@ -70,8 +70,8 @@ public: : driver_device(mconfig, type, tag), m_videoram_0(*this, "vram0"), m_videoram_1(*this, "vram1"), - m_videoram_2(*this, "vram2") - { } + m_videoram_2(*this, "vram2"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram_0; required_shared_ptr<UINT8> m_videoram_1; @@ -85,6 +85,7 @@ public: DECLARE_WRITE8_MEMBER(meyc8080_dac_3_w); DECLARE_WRITE8_MEMBER(meyc8080_dac_4_w); UINT32 screen_update_meyc8080(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 057c1b46914..055073d1fdc 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -62,7 +62,8 @@ class midas_state : public driver_device public: midas_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_gfxregs(*this, "gfxregs"){ } + m_gfxregs(*this, "gfxregs"), + m_maincpu(*this, "maincpu") { } UINT16 *m_gfxram; required_shared_ptr<UINT16> m_gfxregs; @@ -81,6 +82,7 @@ public: UINT32 screen_update_midas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(livequiz_irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index e49edbee162..ade12f96425 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -99,7 +99,8 @@ public: m_sc0_vram(*this, "sc0_vram"), m_sc1_vram(*this, "sc1_vram"), m_sc2_vram(*this, "sc2_vram"), - m_sc3_vram(*this, "sc3_vram"){ } + m_sc3_vram(*this, "sc3_vram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_sc0_vram; required_shared_ptr<UINT16> m_sc1_vram; @@ -123,6 +124,7 @@ public: TILE_GET_INFO_MEMBER(get_sc3_tile_info); virtual void video_start(); UINT32 screen_update_mil4000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c index af7b7672329..ee9740c972e 100644 --- a/src/mame/drivers/miniboy7.c +++ b/src/mame/drivers/miniboy7.c @@ -158,7 +158,8 @@ public: miniboy7_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -169,6 +170,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_miniboy7(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c index 7d373646ed5..a1e0c0d1950 100644 --- a/src/mame/drivers/minivadr.c +++ b/src/mame/drivers/minivadr.c @@ -19,11 +19,13 @@ class minivadr_state : public driver_device public: minivadr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; UINT32 screen_update_minivadr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /************************************* diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index 43afc29d0f8..26e913ee3b0 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -110,7 +110,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -133,6 +134,7 @@ public: INTERRUPT_GEN_MEMBER(mirax_vblank_irq); void draw_tilemap(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 draw_flag); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index babdfc9416a..a1738740eda 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -36,7 +36,8 @@ public: m_ml_tileram(*this, "ml_tileram"), m_dma_ram(*this, "dma_ram"), m_ml_dotram(*this, "ml_dotram"), - m_mecha_ram(*this, "mecha_ram"){ } + m_mecha_ram(*this, "mecha_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_g_ram; required_shared_ptr<UINT16> m_ml_tileram; @@ -81,6 +82,7 @@ public: TIMER_CALLBACK_MEMBER(dma_complete); int start_dma(); DECLARE_WRITE_LINE_MEMBER(ml_msm5205_vck); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index 8d697893ca0..bda99916b25 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -57,7 +57,8 @@ class mole_state : public driver_device { public: mole_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } /* video-related */ tilemap_t *m_bg_tilemap; @@ -75,6 +76,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_mole(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/monzagp.c b/src/mame/drivers/monzagp.c index 6fc1ffe6e41..92ed15d3491 100644 --- a/src/mame/drivers/monzagp.c +++ b/src/mame/drivers/monzagp.c @@ -35,7 +35,8 @@ class monzagp_state : public driver_device { public: monzagp_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } int m_coordx; int m_coordy; @@ -52,6 +53,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_monzagp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c index a522f7d8551..8d4d66bde24 100644 --- a/src/mame/drivers/mpoker.c +++ b/src/mame/drivers/mpoker.c @@ -179,7 +179,8 @@ class mpoker_state : public driver_device public: mpoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_video(*this, "video"){ } + m_video(*this, "video"), + m_maincpu(*this, "maincpu") { } UINT8 m_output[8]; required_shared_ptr<UINT8> m_video; @@ -198,6 +199,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_mpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mpu12wbk.c b/src/mame/drivers/mpu12wbk.c index e73bab78b5a..2b2037ef461 100644 --- a/src/mame/drivers/mpu12wbk.c +++ b/src/mame/drivers/mpu12wbk.c @@ -219,7 +219,8 @@ public: mpu12wbk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -231,6 +232,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_mpu12wbk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mpu3.c b/src/mame/drivers/mpu3.c index 55bec7d16c1..a24ad76c8c5 100644 --- a/src/mame/drivers/mpu3.c +++ b/src/mame/drivers/mpu3.c @@ -120,8 +120,8 @@ class mpu3_state : public driver_device public: mpu3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_vfd(*this, "vfd") - { } + m_vfd(*this, "vfd"), + m_maincpu(*this, "maincpu") { } optional_device<roc10937_t> m_vfd; @@ -194,6 +194,7 @@ emu_timer *m_ic21_timer; void ic21_output(mpu3_state *state,int data); void ic21_setup(mpu3_state *state); void mpu3_config_common(); + required_device<cpu_device> m_maincpu; }; #define DISPLAY_PORT 0 diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index da5ba5b0d50..22610ddffb1 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -184,7 +184,8 @@ class multfish_state : public driver_device { public: multfish_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } /* Video related */ @@ -249,6 +250,7 @@ public: virtual void video_start(); DECLARE_MACHINE_RESET(island2a); UINT32 screen_update_multfish(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; TILE_GET_INFO_MEMBER(multfish_state::get_multfish_tile_info) diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c index f614f936df1..dd1f722444a 100644 --- a/src/mame/drivers/multigam.c +++ b/src/mame/drivers/multigam.c @@ -76,7 +76,8 @@ class multigam_state : public driver_device { public: multigam_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8* m_nt_ram; UINT8* m_vram; @@ -155,6 +156,7 @@ public: void multigm3_decrypt(UINT8* mem, int memsize, const UINT8* decode_nibble); void multigam3_mmc3_scanline_cb(int scanline, int vblank, int blanked); void ppu_irq(int *ppu_regs); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c index ed3e1407e1a..69fefd1a7af 100644 --- a/src/mame/drivers/murogem.c +++ b/src/mame/drivers/murogem.c @@ -115,12 +115,14 @@ class murogem_state : public driver_device public: murogem_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; DECLARE_WRITE8_MEMBER(outport_w); virtual void palette_init(); UINT32 screen_update_murogem(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c index 6c00aec2517..7af060de54b 100644 --- a/src/mame/drivers/murogmbl.c +++ b/src/mame/drivers/murogmbl.c @@ -43,12 +43,14 @@ class murogmbl_state : public driver_device public: murogmbl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_video(*this, "video"){ } + m_video(*this, "video"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_video; virtual void video_start(); virtual void palette_init(); UINT32 screen_update_murogmbl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mw18w.c b/src/mame/drivers/mw18w.c index 5a84d6546df..90131fd75a2 100644 --- a/src/mame/drivers/mw18w.c +++ b/src/mame/drivers/mw18w.c @@ -23,7 +23,8 @@ class mw18w_state : public driver_device { public: mw18w_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_WRITE8_MEMBER(mw18w_sound0_w); DECLARE_WRITE8_MEMBER(mw18w_sound1_w); @@ -31,6 +32,7 @@ public: DECLARE_WRITE8_MEMBER(mw18w_led_display_w); DECLARE_WRITE8_MEMBER(mw18w_irq0_clear_w); DECLARE_CUSTOM_INPUT_MEMBER(mw18w_sensors_r); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index e213c4d4009..8d27b91bb7f 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -60,7 +60,8 @@ public: m_mhigh_scrollram(*this, "mhigh_scrollram"), m_vidattrram(*this, "vidattrram"), m_spriteram(*this, "spriteram"), - m_mwarr_ram(*this, "mwarr_ram"){ } + m_mwarr_ram(*this, "mwarr_ram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -101,6 +102,7 @@ public: virtual void video_start(); UINT32 screen_update_mwarr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c index cebdb9c4838..42d4c10f2b3 100644 --- a/src/mame/drivers/namcos10.c +++ b/src/mame/drivers/namcos10.c @@ -272,7 +272,8 @@ class namcos10_state : public driver_device { public: namcos10_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } // memm variant interface DECLARE_WRITE32_MEMBER(key_w); @@ -315,6 +316,7 @@ public: DECLARE_DRIVER_INIT(chocovdr); DECLARE_MACHINE_RESET(namcos10); void memn_driver_init( ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index 78f16b79876..0771d647afc 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1045,7 +1045,8 @@ public: namcos12_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_rtc(*this, "rtc"), - m_sharedram(*this, "sharedram") { } + m_sharedram(*this, "sharedram") , + m_maincpu(*this, "maincpu") { } required_device<rtc4543_device> m_rtc; required_shared_ptr<UINT32> m_sharedram; @@ -1100,6 +1101,7 @@ public: void namcos12_rom_read( UINT32 *p_n_psxram, UINT32 n_address, INT32 n_size ); void namcos12_sub_irq( screen_device &screen, bool vblank_state ); void system11gun_install( ); + required_device<cpu_device> m_maincpu; }; inline void ATTR_PRINTF(3,4) namcos12_state::verboselog( int n_level, const char *s_fmt, ... ) diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c index 33a49d8c859..ed9dab784c8 100644 --- a/src/mame/drivers/neoprint.c +++ b/src/mame/drivers/neoprint.c @@ -32,7 +32,8 @@ public: neoprint_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_npvidram(*this, "npvidram"), - m_npvidregs(*this, "npvidregs"){ } + m_npvidregs(*this, "npvidregs"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_npvidram; required_shared_ptr<UINT16> m_npvidregs; @@ -60,6 +61,7 @@ public: void draw_layer(bitmap_ind16 &bitmap,const rectangle &cliprect,int layer,int data_shift); void audio_cpu_assert_nmi(); DECLARE_WRITE_LINE_MEMBER(audio_cpu_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/nexus3d.c b/src/mame/drivers/nexus3d.c index 6f9adcbf811..d32bade75fb 100644 --- a/src/mame/drivers/nexus3d.c +++ b/src/mame/drivers/nexus3d.c @@ -24,7 +24,8 @@ class nexus3d_state : public driver_device public: nexus3d_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_mainram(*this, "mainram"){ } + m_mainram(*this, "mainram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_mainram; @@ -52,6 +53,7 @@ public: virtual void video_start(); UINT32 screen_update_nexus3d(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void nexus3d_flash_reset(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/nsmpoker.c b/src/mame/drivers/nsmpoker.c index bb19b186e9c..7831879e7cc 100644 --- a/src/mame/drivers/nsmpoker.c +++ b/src/mame/drivers/nsmpoker.c @@ -70,7 +70,8 @@ public: nsmpoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -84,6 +85,7 @@ public: virtual void palette_init(); UINT32 screen_update_nsmpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(nsmpoker_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index b0596852452..38872b970fc 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -231,7 +231,8 @@ class nwktr_state : public driver_device public: nwktr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_work_ram(*this, "work_ram"){ } + m_work_ram(*this, "work_ram"), + m_maincpu(*this, "maincpu") { } UINT8 m_led_reg0; UINT8 m_led_reg1; @@ -257,6 +258,7 @@ public: UINT32 screen_update_nwktr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(irq_off); void lanc2_init(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index f777ea2ad4d..5c58c136d9e 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -63,7 +63,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_spriteram2(*this, "spriteram2"){ } + m_spriteram2(*this, "spriteram2"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -89,6 +90,7 @@ public: UINT32 screen_update_olibochu(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(olibochu_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c index 3485aab6e7e..531a0f736c0 100644 --- a/src/mame/drivers/omegrace.c +++ b/src/mame/drivers/omegrace.c @@ -227,7 +227,8 @@ class omegrace_state : public driver_device { public: omegrace_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_READ8_MEMBER(omegrace_vg_go_r); DECLARE_READ8_MEMBER(omegrace_spinner1_r); @@ -235,6 +236,7 @@ public: DECLARE_WRITE8_MEMBER(omegrace_soundlatch_w); DECLARE_DRIVER_INIT(omegrace); virtual void machine_reset(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c index ee249e5d52e..f47ba1d4617 100644 --- a/src/mame/drivers/pachifev.c +++ b/src/mame/drivers/pachifev.c @@ -90,7 +90,8 @@ class pachifev_state : public driver_device { public: pachifev_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } /* controls related */ int m_power; @@ -108,6 +109,7 @@ public: virtual void machine_start(); virtual void machine_reset(); INTERRUPT_GEN_MEMBER(pachifev_vblank_irq); + required_device<cpu_device> m_maincpu; }; WRITE8_MEMBER(pachifev_state::controls_w) diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c index 7c589aa8963..306ebb948bc 100644 --- a/src/mame/drivers/pangofun.c +++ b/src/mame/drivers/pangofun.c @@ -106,10 +106,12 @@ class pangofun_state : public driver_device { public: pangofun_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_DRIVER_INIT(pangofun); virtual void machine_start(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index ad7aa9753a8..1613cf47c56 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -72,8 +72,8 @@ public: m_mainram(*this, "mainram"), m_spriteram(*this, "spriteram"), m_textram(*this, "textram"), - m_spritebank(*this, "spritebank") - { } + m_spritebank(*this, "spritebank"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_mainram; required_shared_ptr<UINT8> m_spriteram; @@ -101,6 +101,7 @@ public: UINT32 screen_update_panicr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(panicr_scanline); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index 9aaffc31b24..c3343e1e0f4 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -82,7 +82,8 @@ public: pasha2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_wram(*this, "wram"), - m_paletteram(*this, "paletteram"){ } + m_paletteram(*this, "paletteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_wram; @@ -110,6 +111,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_pasha2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/pcat_dyn.c b/src/mame/drivers/pcat_dyn.c index deb9f77443d..e9343ba7d1e 100644 --- a/src/mame/drivers/pcat_dyn.c +++ b/src/mame/drivers/pcat_dyn.c @@ -41,10 +41,12 @@ class pcat_dyn_state : public driver_device { public: pcat_dyn_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_DRIVER_INIT(pcat_dyn); virtual void machine_start(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c index 880b29aed9e..015f27845bb 100644 --- a/src/mame/drivers/pcat_nit.c +++ b/src/mame/drivers/pcat_nit.c @@ -98,8 +98,8 @@ public: pcat_nit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_uart(*this, "ns16450_0"), - m_microtouch(*this, "microtouch") - { } + m_microtouch(*this, "microtouch"), + m_maincpu(*this, "maincpu") { } UINT8 *m_banked_nvram; required_device<ns16450_device> m_uart; @@ -112,6 +112,7 @@ public: DECLARE_WRITE_LINE_MEMBER(at_com_interrupt_1); DECLARE_DRIVER_INIT(pcat_nit); virtual void machine_start(); + required_device<cpu_device> m_maincpu; }; WRITE_LINE_MEMBER(pcat_nit_state::microtouch_out) diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index a4018db6df7..a6937e9d852 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -74,7 +74,8 @@ public: m_pit8253(*this,"pit8253"), m_pic8259_1(*this,"pic8259_1"), m_pic8259_2(*this,"pic8259_2"), - m_dma8237_1(*this,"dma8237_1") { } + m_dma8237_1(*this,"dma8237_1") , + m_maincpu(*this, "maincpu") { } UINT8 m_bg_bank; int m_bank; @@ -129,6 +130,7 @@ public: UINT8 pcxt_speaker_get_spk(); void pcxt_speaker_set_spkrdata(UINT8 data); void pcxt_speaker_set_input(UINT8 data); + required_device<cpu_device> m_maincpu; }; UINT32 pcxt_state::screen_update_tetriskr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/pengadvb.c b/src/mame/drivers/pengadvb.c index 814c9a27fa1..f319a05ff15 100644 --- a/src/mame/drivers/pengadvb.c +++ b/src/mame/drivers/pengadvb.c @@ -32,7 +32,8 @@ class pengadvb_state : public driver_device { public: pengadvb_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 *m_main_mem; UINT8 m_mem_map; @@ -49,6 +50,7 @@ public: void pengadvb_postload(); void mem_map_banks(); void pengadvb_decrypt(const char* region); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index 2a4fd87008a..13d24b58a53 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -189,7 +189,8 @@ public: m_sb000_ram(*this, "sb000_ram"), m_sd000_ram(*this, "sd000_ram"), m_sf000_ram(*this, "sf000_ram"), - m_io_port(*this, "io_port"){ } + m_io_port(*this, "io_port"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_cmos_ram; required_shared_ptr<UINT8> m_program_ram; @@ -270,6 +271,7 @@ public: TIMER_CALLBACK_MEMBER(assert_lp_cb); void peplus_load_superdata(const char *bank_name); void peplus_init(); + required_device<cpu_device> m_maincpu; }; static const UINT8 id_022[8] = { 0x00, 0x01, 0x04, 0x09, 0x13, 0x16, 0x18, 0x00 }; diff --git a/src/mame/drivers/peyper.c b/src/mame/drivers/peyper.c index 54473f40206..1644434869c 100644 --- a/src/mame/drivers/peyper.c +++ b/src/mame/drivers/peyper.c @@ -6,7 +6,8 @@ class peyper_state : public driver_device { public: peyper_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 irq_state; @@ -21,6 +22,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(wolfman_replay_hs_r); DECLARE_DRIVER_INIT(peyper); virtual void machine_reset(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/pgm2.c b/src/mame/drivers/pgm2.c index 184c4ffa64d..3bd162f8b4e 100644 --- a/src/mame/drivers/pgm2.c +++ b/src/mame/drivers/pgm2.c @@ -50,7 +50,8 @@ class pgm2_state : public driver_device { public: pgm2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_DRIVER_INIT(kov2nl); DECLARE_DRIVER_INIT(orleg2); @@ -62,6 +63,7 @@ public: virtual void video_start(); UINT32 screen_update_pgm2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_pgm2(screen_device &screen, bool state); + required_device<cpu_device> m_maincpu; }; static ADDRESS_MAP_START( pgm2_map, AS_PROGRAM, 32, pgm2_state ) diff --git a/src/mame/drivers/photoply.c b/src/mame/drivers/photoply.c index 1e6e63641bd..9464b6c3e26 100644 --- a/src/mame/drivers/photoply.c +++ b/src/mame/drivers/photoply.c @@ -26,7 +26,8 @@ class photoply_state : public driver_device { public: photoply_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } int m_dma_channel; UINT8 m_dma_offset[2][4]; @@ -58,6 +59,7 @@ public: DECLARE_DRIVER_INIT(photoply); virtual void machine_start(); IRQ_CALLBACK_MEMBER(irq_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c index 63304322f9b..20812fb3e64 100644 --- a/src/mame/drivers/pinkiri8.c +++ b/src/mame/drivers/pinkiri8.c @@ -48,7 +48,8 @@ public: m_janshi_vram2(*this, "vram2"), m_janshi_paletteram(*this, "paletteram"), m_janshi_paletteram2(*this, "paletteram2"), - m_janshi_crtc_regs(*this, "crtc_regs"){ } + m_janshi_crtc_regs(*this, "crtc_regs"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_janshi_back_vram; required_shared_ptr<UINT8> m_janshi_vram1; @@ -77,6 +78,7 @@ public: DECLARE_DRIVER_INIT(ronjan); virtual void video_start(); UINT32 screen_update_pinkiri8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 692dd871d49..03af43121d2 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -78,7 +78,8 @@ public: pipeline_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram1(*this, "vram1"), - m_vram2(*this, "vram2"){ } + m_vram2(*this, "vram2"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_tilemap1; tilemap_t *m_tilemap2; @@ -103,6 +104,7 @@ public: virtual void palette_init(); UINT32 screen_update_pipeline(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(protection_deferred_w); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c index 7fcabf55384..0eaab1e0d46 100644 --- a/src/mame/drivers/pkscram.c +++ b/src/mame/drivers/pkscram.c @@ -24,7 +24,8 @@ public: : driver_device(mconfig, type, tag), m_pkscramble_fgtilemap_ram(*this, "fgtilemap_ram"), m_pkscramble_mdtilemap_ram(*this, "mdtilemap_ram"), - m_pkscramble_bgtilemap_ram(*this, "bgtilemap_ram"){ } + m_pkscramble_bgtilemap_ram(*this, "bgtilemap_ram"), + m_maincpu(*this, "maincpu") { } UINT16 m_out; UINT8 m_interrupt_line_active; @@ -47,6 +48,7 @@ public: UINT32 screen_update_pkscramble(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(scanline_callback); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/poker72.c b/src/mame/drivers/poker72.c index 53419876203..53f1efd4c93 100644 --- a/src/mame/drivers/poker72.c +++ b/src/mame/drivers/poker72.c @@ -21,7 +21,8 @@ public: poker72_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), - m_pal(*this, "pal"){ } + m_pal(*this, "pal"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_vram; required_shared_ptr<UINT8> m_pal; @@ -34,6 +35,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_poker72(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/potgoldu.c b/src/mame/drivers/potgoldu.c index 449664c8001..7f89797cbef 100644 --- a/src/mame/drivers/potgoldu.c +++ b/src/mame/drivers/potgoldu.c @@ -25,9 +25,11 @@ class potgold_state : public driver_device { public: potgold_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } virtual void machine_reset(); virtual void video_start(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index 17c085023d3..6d5fc4e8fdb 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -142,7 +142,8 @@ public: ppmast93_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bgram(*this, "bgram"), - m_fgram(*this, "fgram"){ } + m_fgram(*this, "fgram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_fg_tilemap; tilemap_t *m_bg_tilemap; @@ -156,6 +157,7 @@ public: TILE_GET_INFO_MEMBER(get_ppmast93_fg_tile_info); virtual void video_start(); UINT32 screen_update_ppmast93(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c index c67e0530a55..7f894e2c7f3 100644 --- a/src/mame/drivers/progolf.c +++ b/src/mame/drivers/progolf.c @@ -62,7 +62,8 @@ class progolf_state : public driver_device public: progolf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_fbram(*this, "fbram"){ } + m_fbram(*this, "fbram"), + m_maincpu(*this, "maincpu") { } UINT8 *m_videoram; UINT8 m_char_pen; @@ -86,6 +87,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_progolf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/psattack.c b/src/mame/drivers/psattack.c index b4af68261ea..4967a59dd21 100644 --- a/src/mame/drivers/psattack.c +++ b/src/mame/drivers/psattack.c @@ -83,7 +83,8 @@ class psattack_state : public driver_device { public: psattack_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_READ32_MEMBER(psattack_unk_r); DECLARE_DRIVER_INIT(psattack); @@ -93,6 +94,7 @@ public: UINT32 screen_update_psattack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_psattack(screen_device &screen, bool state); INTERRUPT_GEN_MEMBER(psattack_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index a329963bb5b..27ecb49e6ad 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -85,7 +85,8 @@ public: pturn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_fgmap; @@ -120,6 +121,7 @@ public: UINT32 screen_update_pturn(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(pturn_sub_intgen); INTERRUPT_GEN_MEMBER(pturn_main_intgen); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c index 009ba691708..86c4f0ed429 100644 --- a/src/mame/drivers/pzletime.c +++ b/src/mame/drivers/pzletime.c @@ -29,7 +29,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_mid_videoram(*this, "mid_videoram"), m_txt_videoram(*this, "txt_videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_video_regs; @@ -60,6 +61,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_pzletime(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/quakeat.c b/src/mame/drivers/quakeat.c index 2c715cec221..d6f05c03b7c 100644 --- a/src/mame/drivers/quakeat.c +++ b/src/mame/drivers/quakeat.c @@ -68,7 +68,8 @@ class quakeat_state : public driver_device { public: quakeat_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } device_t *m_pic8259_1; device_t *m_pic8259_2; @@ -78,6 +79,7 @@ public: virtual void video_start(); UINT32 screen_update_quake(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); IRQ_CALLBACK_MEMBER(irq_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c index 5157cffb4d8..7146710f504 100644 --- a/src/mame/drivers/quantum.c +++ b/src/mame/drivers/quantum.c @@ -56,12 +56,14 @@ class quantum_state : public driver_device { public: quantum_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_READ16_MEMBER(trackball_r); DECLARE_WRITE16_MEMBER(led_w); DECLARE_READ8_MEMBER(input_1_r); DECLARE_READ8_MEMBER(input_2_r); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c index 6f910b2cf62..db280b4c0f3 100644 --- a/src/mame/drivers/quizo.c +++ b/src/mame/drivers/quizo.c @@ -32,7 +32,8 @@ class quizo_state : public driver_device { public: quizo_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 *m_videoram; UINT8 m_port60; @@ -43,6 +44,7 @@ public: DECLARE_DRIVER_INIT(quizo); virtual void palette_init(); UINT32 screen_update_quizo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index 42c473df521..3d7c3e3e1bd 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -94,7 +94,8 @@ public: quizpun2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fg_ram(*this, "fg_ram"), - m_bg_ram(*this, "bg_ram"){ } + m_bg_ram(*this, "bg_ram"), + m_maincpu(*this, "maincpu") { } struct prot_t m_prot; required_shared_ptr<UINT8> m_fg_ram; @@ -113,6 +114,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_quizpun2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/quizshow.c b/src/mame/drivers/quizshow.c index 3da4e940e1d..d649d78466c 100644 --- a/src/mame/drivers/quizshow.c +++ b/src/mame/drivers/quizshow.c @@ -38,7 +38,8 @@ public: quizshow_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_main_ram(*this, "main_ram"), - m_fo_state(*this, "fo_state"){ } + m_fo_state(*this, "fo_state"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_tilemap; required_shared_ptr<UINT8> m_main_ram; @@ -65,6 +66,7 @@ public: virtual void palette_init(); UINT32 screen_update_quizshow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(quizshow_clock_timer_cb); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c index d5ac3a1dbb3..6e107b4afea 100644 --- a/src/mame/drivers/r2dtank.c +++ b/src/mame/drivers/r2dtank.c @@ -55,7 +55,8 @@ public: r2dtank_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -77,6 +78,7 @@ public: DECLARE_WRITE8_MEMBER(pia_comp_w); virtual void machine_start(); DECLARE_WRITE8_MEMBER(ttl74123_output_changed); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index 0ccbdc5e4c0..7f7bbdc6b38 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -34,8 +34,8 @@ public: m_bg_vram(*this, "bg_vram"), m_md_vram(*this, "md_vram"), m_fg_vram(*this, "fg_vram"), - m_tx_vram(*this, "tx_vram") - { } + m_tx_vram(*this, "tx_vram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; DECLARE_WRITE16_MEMBER(rdx_bg_vram_w); @@ -73,6 +73,7 @@ public: UINT32 screen_update_rdx_v33(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(rdx_v33_interrupt); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index daab71ce346..038626489d6 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -99,8 +99,8 @@ public: m_tilemap_regs(*this, "tilemap_regs"), m_spriteregs(*this, "spriteregs"), m_blitterregs(*this, "blitterregs"), - m_spriteram(*this, "spriteram") - { } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_viewregs0; required_shared_ptr<UINT32> m_viewregs6; @@ -146,6 +146,7 @@ public: void draw_sprite_bitmap( bitmap_ind16 &bitmap, const rectangle &cliprect ); void rabbit_drawtilemap( bitmap_ind16 &bitmap, const rectangle &cliprect, int whichtilemap ); void rabbit_do_blit(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index 5caa17262d4..1c1b9b9d285 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -63,7 +63,8 @@ public: rbmk_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_gms_vidram2(*this, "gms_vidram2"), - m_gms_vidram(*this, "gms_vidram"){ } + m_gms_vidram(*this, "gms_vidram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_gms_vidram2; required_shared_ptr<UINT16> m_gms_vidram; @@ -80,6 +81,7 @@ public: virtual void video_start(); UINT32 screen_update_rbmk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(mcu_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/re900.c b/src/mame/drivers/re900.c index 31932979dc5..efa831869ac 100644 --- a/src/mame/drivers/re900.c +++ b/src/mame/drivers/re900.c @@ -87,7 +87,8 @@ class re900_state : public driver_device public: re900_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_rom(*this, "rom"){ } + m_rom(*this, "rom"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_rom; UINT8 m_psg_pa; @@ -105,6 +106,7 @@ public: DECLARE_WRITE8_MEMBER(re_mux_port_B_w); DECLARE_WRITE_LINE_MEMBER(vdp_interrupt); DECLARE_DRIVER_INIT(re900); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c index 959d0d06c9c..c76e531cbc2 100644 --- a/src/mame/drivers/rgum.c +++ b/src/mame/drivers/rgum.c @@ -25,7 +25,8 @@ public: rgum_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), - m_cram(*this, "cram"){ } + m_cram(*this, "cram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_vram; required_shared_ptr<UINT8> m_cram; @@ -33,6 +34,7 @@ public: DECLARE_CUSTOM_INPUT_MEMBER(rgum_heartbeat_r); virtual void video_start(); UINT32 screen_update_royalgum(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index 838edf3a97f..f05b6af57e9 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -40,7 +40,8 @@ public: rmhaihai_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_colorram(*this, "colorram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } int m_gfxbank; required_shared_ptr<UINT8> m_colorram; @@ -60,6 +61,7 @@ public: virtual void video_start(); DECLARE_MACHINE_RESET(themj); UINT32 screen_update_rmhaihai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/roul.c b/src/mame/drivers/roul.c index 1c41395b28d..b4d91940864 100644 --- a/src/mame/drivers/roul.c +++ b/src/mame/drivers/roul.c @@ -71,7 +71,8 @@ class roul_state : public driver_device { public: roul_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_reg[0x10]; UINT8 *m_videobuf; @@ -83,6 +84,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_roul(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index 822499fd7dc..aa88bf39359 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -57,7 +57,8 @@ public: safarir_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_scroll(*this, "bg_scroll"), - m_ram(*this, "ram") { } + m_ram(*this, "ram") , + m_maincpu(*this, "maincpu") { } UINT8 *m_ram_1; UINT8 *m_ram_2; @@ -79,6 +80,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_safarir(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index 37cd98dda09..64fbd8a85b8 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -86,9 +86,8 @@ class sandscrp_state : public driver_device public: sandscrp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_view2_0(*this, "view2_0") - { - } + m_view2_0(*this, "view2_0"), + m_maincpu(*this, "maincpu") { } optional_device<kaneko_view2_tilemap_device> m_view2_0; @@ -114,6 +113,7 @@ public: INTERRUPT_GEN_MEMBER(sandscrp_interrupt); void update_irq_state(); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c index eea8fe812bc..07a32c79a3a 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -53,7 +53,8 @@ class sangho_state : public driver_device public: sangho_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_v9958(*this, "v9958") { } + m_v9958(*this, "v9958") , + m_maincpu(*this, "maincpu") { } UINT8* m_ram; UINT8 m_sexyboom_bank[8]; @@ -71,6 +72,7 @@ public: void pzlestar_map_banks(); void sexyboom_map_bank(int bank); DECLARE_WRITE_LINE_MEMBER(msx_vdp_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sanremo.c b/src/mame/drivers/sanremo.c index 5e8cda9b900..35087ac327e 100644 --- a/src/mame/drivers/sanremo.c +++ b/src/mame/drivers/sanremo.c @@ -108,7 +108,8 @@ class sanremo_state : public driver_device public: sanremo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; @@ -122,6 +123,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_sanremo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c index a919526e323..a6bc7c5adf3 100644 --- a/src/mame/drivers/sbrkout.c +++ b/src/mame/drivers/sbrkout.c @@ -42,7 +42,8 @@ class sbrkout_state : public driver_device public: sbrkout_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; emu_timer *m_scanline_timer; @@ -70,6 +71,7 @@ public: TIMER_CALLBACK_MEMBER(scanline_callback); TIMER_CALLBACK_MEMBER(pot_trigger_callback); void update_nmi_state(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c index 8a3d9a15635..1e4e45ca902 100644 --- a/src/mame/drivers/seattle.c +++ b/src/mame/drivers/seattle.c @@ -428,7 +428,8 @@ public: m_interrupt_enable(*this, "int_enable"), m_interrupt_config(*this, "int_config"), m_asic_reset(*this, "asic_reset"), - m_rombase(*this, "rombase"){ } + m_rombase(*this, "rombase"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_nvram; required_shared_ptr<UINT32> m_rambase; @@ -511,6 +512,7 @@ public: void widget_reset(); void update_widget_irq(); void init_common(int ioasic, int serialnum, int yearoffs, int config); + required_device<cpu_device> m_maincpu; }; /************************************* diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index 9cfef7f937a..84a1c3159f0 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -33,7 +33,8 @@ public: m_obj_ram(*this, "obj_ram"), m_out_ram(*this, "out_ram"), m_color_ram(*this, "color_ram"), - m_fix_ram(*this, "fix_ram"){ } + m_fix_ram(*this, "fix_ram"), + m_maincpu(*this, "maincpu") { } UINT8 m_nmi_enable; @@ -61,6 +62,7 @@ public: UINT32 screen_update_astron(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void astron_draw_characters(bitmap_rgb32 &bitmap,const rectangle &cliprect); void astron_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /* VIDEO GOODS */ diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c index 83c50df1dde..47c6d6e1c36 100644 --- a/src/mame/drivers/sengokmj.c +++ b/src/mame/drivers/sengokmj.c @@ -63,7 +63,8 @@ class sengokmj_state : public driver_device { public: sengokmj_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT16 m_sengokumj_mux_data; UINT8 m_hopper_io; @@ -72,6 +73,7 @@ public: DECLARE_WRITE16_MEMBER(sengokmj_out_w); DECLARE_READ16_MEMBER(sengokmj_system_r); INTERRUPT_GEN_MEMBER(sengokmj_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index 1b84908fb7c..9479612f8c9 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -289,7 +289,8 @@ public: m_2801_regs(*this, "2801_regs"), m_2c01_regs(*this, "2c01_regs"), m_3000_regs(*this, "3000_regs"), - m_3800_regs(*this, "3800_regs"){ } + m_3800_regs(*this, "3800_regs"), + m_maincpu(*this, "maincpu") { } bitmap_ind16 *m_temp_reel_bitmap; tilemap_t *m_tilemap; @@ -454,6 +455,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_sfbonus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index 3d29a2b564d..a9023357b34 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -63,7 +63,8 @@ class sfkick_state : public driver_device public: sfkick_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_v9938(*this, "v9938") { } + m_v9938(*this, "v9938") , + m_maincpu(*this, "maincpu") { } UINT8 *m_main_mem; int m_bank_cfg; @@ -84,6 +85,7 @@ public: void sfkick_bank_set(int num, int data); DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(sfkick_vdp_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c index 53d9b50a53c..6f28dbff760 100644 --- a/src/mame/drivers/sg1000a.c +++ b/src/mame/drivers/sg1000a.c @@ -123,12 +123,14 @@ class sg1000a_state : public driver_device { public: sg1000a_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_WRITE_LINE_MEMBER(vdp_interrupt); DECLARE_WRITE8_MEMBER(sg1000a_coin_counter_w); DECLARE_DRIVER_INIT(sg1000a); DECLARE_DRIVER_INIT(chwrestl); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c index b95b570c616..51d8cbb9743 100644 --- a/src/mame/drivers/shanghai.c +++ b/src/mame/drivers/shanghai.c @@ -32,7 +32,8 @@ class shanghai_state : public driver_device { public: shanghai_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_WRITE16_MEMBER(shanghai_coin_w); DECLARE_READ16_MEMBER(kothello_hd63484_status_r); @@ -40,6 +41,7 @@ public: DECLARE_PALETTE_INIT(shanghai); UINT32 screen_update_shanghai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(shanghai_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c index 2cafe0462bb..731eba846d5 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -92,7 +92,8 @@ class shougi_state : public driver_device public: shougi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; int m_nmi_enabled; @@ -113,6 +114,7 @@ public: virtual void palette_init(); UINT32 screen_update_shougi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(shougi_vblank_nmi); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sigmab52.c b/src/mame/drivers/sigmab52.c index c00c3903ec2..86175119d29 100644 --- a/src/mame/drivers/sigmab52.c +++ b/src/mame/drivers/sigmab52.c @@ -136,7 +136,8 @@ class sigmab52_state : public driver_device { public: sigmab52_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } int m_latch; unsigned int m_acrtc_data; @@ -151,6 +152,7 @@ public: virtual void palette_init(); UINT32 screen_update_jwildb52(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(timer_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/silvmil.c b/src/mame/drivers/silvmil.c index 2ef840e13df..3cbb86f47ac 100644 --- a/src/mame/drivers/silvmil.c +++ b/src/mame/drivers/silvmil.c @@ -31,9 +31,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), m_spriteram(*this, "spriteram"), - m_sprgen(*this, "spritegen") - { - } + m_sprgen(*this, "spritegen"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -114,6 +113,7 @@ public: virtual void video_start(); UINT32 screen_update_silvmil(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void tumblepb_gfx1_rearrange(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c index 265b31e38b1..87169c57716 100644 --- a/src/mame/drivers/skimaxx.c +++ b/src/mame/drivers/skimaxx.c @@ -47,7 +47,8 @@ public: : driver_device(mconfig, type, tag), m_blitter_regs(*this, "blitter_regs"), m_fpga_ctrl(*this, "fpga_ctrl"), - m_fg_buffer(*this, "fg_buffer"){ } + m_fg_buffer(*this, "fg_buffer"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_blitter_regs; required_shared_ptr<UINT32> m_fpga_ctrl; @@ -74,6 +75,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_skimaxx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 15e3a960dd1..5e8a8f1494a 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -37,7 +37,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_scrollram(*this, "scrollram"){ } + m_scrollram(*this, "scrollram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -55,6 +56,7 @@ public: virtual void palette_init(); UINT32 screen_update_skyarmy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(skyarmy_nmi_source); + required_device<cpu_device> m_maincpu; }; WRITE8_MEMBER(skyarmy_state::skyarmy_flip_screen_x_w) diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c index ccadb7dd6e2..eadc8ec1f6d 100644 --- a/src/mame/drivers/skylncr.c +++ b/src/mame/drivers/skylncr.c @@ -57,7 +57,8 @@ public: m_reelscroll1(*this, "reelscroll1"), m_reelscroll2(*this, "reelscroll2"), m_reelscroll3(*this, "reelscroll3"), - m_reelscroll4(*this, "reelscroll4"){ } + m_reelscroll4(*this, "reelscroll4"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_tmap; required_shared_ptr<UINT8> m_videoram; @@ -110,6 +111,7 @@ public: virtual void video_start(); UINT32 screen_update_skylncr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(skylncr_vblank_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c index d1e0e9037d1..da16bfd8aa8 100644 --- a/src/mame/drivers/slotcarn.c +++ b/src/mame/drivers/slotcarn.c @@ -37,7 +37,8 @@ public: : driver_device(mconfig, type, tag), m_backup_ram(*this, "backup_ram"), m_ram_attr(*this, "raattr"), - m_ram_video(*this, "ravideo"){ } + m_ram_video(*this, "ravideo"), + m_maincpu(*this, "maincpu") { } pen_t m_pens[NUM_PENS]; required_shared_ptr<UINT8> m_backup_ram; @@ -49,6 +50,7 @@ public: DECLARE_WRITE_LINE_MEMBER(hsync_changed); DECLARE_WRITE_LINE_MEMBER(vsync_changed); virtual void machine_start(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c index 964758ef879..4d61c64c96f 100644 --- a/src/mame/drivers/sms.c +++ b/src/mame/drivers/sms.c @@ -224,7 +224,8 @@ class smsmfg_state : public driver_device { public: smsmfg_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_communication_port[4]; UINT8 m_communication_port_status; @@ -246,6 +247,7 @@ public: virtual void palette_init(); DECLARE_MACHINE_START(sureshot); UINT32 screen_update_sms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c index 76221f650ec..df8cf31e1f1 100644 --- a/src/mame/drivers/sothello.c +++ b/src/mame/drivers/sothello.c @@ -47,7 +47,8 @@ class sothello_state : public driver_device public: sothello_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_v9938(*this, "v9938") { } + m_v9938(*this, "v9938") , + m_maincpu(*this, "maincpu") { } required_device<v9938_device> m_v9938; @@ -75,6 +76,7 @@ public: DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(adpcm_int); DECLARE_WRITE_LINE_MEMBER(sothello_vdp_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index 73a2d46bc55..1cd716f7ae7 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -181,7 +181,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_io9400(*this, "io9400"), - m_io9401(*this, "io9401"){ } + m_io9401(*this, "io9401"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_videoram; @@ -191,6 +192,7 @@ public: DECLARE_READ8_MEMBER(spaceg_colorram_r); virtual void palette_init(); UINT32 screen_update_spaceg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /************************************* diff --git a/src/mame/drivers/splus.c b/src/mame/drivers/splus.c index 10d55e2ec3e..891a682adfd 100644 --- a/src/mame/drivers/splus.c +++ b/src/mame/drivers/splus.c @@ -37,8 +37,8 @@ public: m_cmosh_ram(*this, "cmosh"), m_program_ram(*this, "program_ram"), m_reel_ram(*this, "reel_ram"), - m_io_port(*this, "io_port") - { + m_io_port(*this, "io_port"), + m_maincpu(*this, "maincpu") { m_sda_dir = 0; m_coin_state = 0; m_last_cycles = 0; @@ -102,6 +102,7 @@ public: DECLARE_WRITE8_MEMBER(i2c_nvram_w); DECLARE_READ8_MEMBER(splus_reel_optics_r); DECLARE_DRIVER_INIT(splus); + required_device<cpu_device> m_maincpu; }; /* Static Variables */ diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index 0e7cebc41d1..c5ce8193543 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -29,7 +29,8 @@ public: : driver_device(mconfig, type, tag), m_bg_tile_ram(*this, "bg_tile_ram"), m_fg_tile_ram(*this, "fg_tile_ram"), - m_fg_color_ram(*this, "fg_color_ram"){ } + m_fg_color_ram(*this, "fg_color_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_bg_tile_ram; tilemap_t *m_bg_tilemap; @@ -60,6 +61,7 @@ public: virtual void video_start(); UINT32 screen_update_spoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(spoker_interrupt); + required_device<cpu_device> m_maincpu; }; WRITE8_MEMBER(spoker_state::bg_tile_w) diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index 532941fadfe..99a1a89cb73 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -101,7 +101,8 @@ public: : driver_device(mconfig, type, tag), m_main(*this, "mainram"), m_vram(*this, "vram"), - m_cram(*this, "cram"){ } + m_cram(*this, "cram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_main; required_shared_ptr<UINT8> m_vram; @@ -118,6 +119,7 @@ public: TILE_GET_INFO_MEMBER(get_spool99_tile_info); virtual void video_start(); UINT32 screen_update_spool99(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; TILE_GET_INFO_MEMBER(spool99_state::get_spool99_tile_info) diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 266ac88f35d..1ce18d5b913 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -78,7 +78,8 @@ public: m_sprram(*this, "sprram"), m_chrram(*this, "chrram"), m_dmaram(*this, "dmaram"), - m_video_regs(*this, "video_regs"){ } + m_video_regs(*this, "video_regs"), + m_maincpu(*this, "maincpu") { } UINT16* m_tileram; required_shared_ptr<UINT16> m_sprram; @@ -108,6 +109,7 @@ public: UINT32 screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void update_palette(); UINT32 process(UINT8 b,UINT32 dst_offset); + required_device<cpu_device> m_maincpu; }; #define VERBOSE 0 diff --git a/src/mame/drivers/sshot.c b/src/mame/drivers/sshot.c index 293a61209e2..e58df1f9efd 100644 --- a/src/mame/drivers/sshot.c +++ b/src/mame/drivers/sshot.c @@ -168,7 +168,8 @@ class supershot_state : public driver_device public: supershot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_tilemap; @@ -179,6 +180,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_supershot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index 4c9f89d0d3e..2269e249f8f 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -155,7 +155,8 @@ class ssingles_state : public driver_device { public: ssingles_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_videoram[VMEM_SIZE]; UINT8 m_colorram[VMEM_SIZE]; @@ -174,6 +175,7 @@ public: DECLARE_DRIVER_INIT(ssingles); virtual void video_start(); INTERRUPT_GEN_MEMBER(atamanot_irq); + required_device<cpu_device> m_maincpu; }; //fake palette diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c index b375efd0e2c..e79dc1dbf3f 100644 --- a/src/mame/drivers/sstrangr.c +++ b/src/mame/drivers/sstrangr.c @@ -18,7 +18,8 @@ class sstrangr_state : public driver_device public: sstrangr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_ram(*this, "ram"){ } + m_ram(*this, "ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_ram; UINT8 m_flip_screen; @@ -26,6 +27,7 @@ public: DECLARE_WRITE8_MEMBER(port_w); UINT32 screen_update_sstrangr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); UINT32 screen_update_sstrngr2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index 69e8010eb0d..5814dc0f6cd 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -82,7 +82,8 @@ public: statriv2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_question_offset(*this, "question_offset"){ } + m_question_offset(*this, "question_offset"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_tilemap; @@ -111,6 +112,7 @@ public: DECLARE_VIDEO_START(vertical); UINT32 screen_update_statriv2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(statriv2_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/su2000.c b/src/mame/drivers/su2000.c index abb8c3f7a73..2f84c5a6898 100644 --- a/src/mame/drivers/su2000.c +++ b/src/mame/drivers/su2000.c @@ -68,7 +68,8 @@ class su2000_state : public driver_device { public: su2000_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } device_t *m_pit8254; device_t *m_pic8259_1; @@ -82,6 +83,7 @@ public: virtual void machine_start(); virtual void machine_reset(); IRQ_CALLBACK_MEMBER(irq_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c index 845606c0d1d..db73a444c08 100644 --- a/src/mame/drivers/sub.c +++ b/src/mame/drivers/sub.c @@ -121,7 +121,8 @@ public: m_vid(*this, "vid"), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), - m_scrolly(*this, "scrolly"){ } + m_scrolly(*this, "scrolly"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_attr; required_shared_ptr<UINT8> m_vid; @@ -135,6 +136,7 @@ public: virtual void palette_init(); UINT32 screen_update_sub(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(subm_sound_irq); + required_device<cpu_device> m_maincpu; }; void sub_state::video_start() diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index 40939f85254..f31b748c9f3 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -245,8 +245,8 @@ public: m_reel1_ram(*this, "reel1_ram"), m_reel2_ram(*this, "reel2_ram"), m_reel3_ram(*this, "reel3_ram"), - m_stisub_out_c(*this, "stisub_out_c") - { + m_stisub_out_c(*this, "stisub_out_c"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_colorram; @@ -320,6 +320,7 @@ public: UINT32 screen_update_subsino_reels(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_stisub_reels(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); virtual void machine_start(); + required_device<cpu_device> m_maincpu; }; void subsino_state::machine_start() diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c index d07cd24ab81..e898dd57e1a 100644 --- a/src/mame/drivers/subsino2.c +++ b/src/mame/drivers/subsino2.c @@ -80,7 +80,8 @@ public: : driver_device(mconfig, type, tag), m_outputs16(*this, "outputs16"), m_outputs(*this, "outputs"), - m_am188em_regs(*this, "am188em_regs"){ } + m_am188em_regs(*this, "am188em_regs"), + m_maincpu(*this, "maincpu") { } UINT8 *m_hm86171_colorram; layer_t m_layers[2]; @@ -168,6 +169,7 @@ public: INTERRUPT_GEN_MEMBER(am188em_int0_irq); TIMER_DEVICE_CALLBACK_MEMBER(am188em_timer2_irq); TIMER_DEVICE_CALLBACK_MEMBER(h8_timer_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/summit.c b/src/mame/drivers/summit.c index bfd210bd489..56ad2da1ea7 100644 --- a/src/mame/drivers/summit.c +++ b/src/mame/drivers/summit.c @@ -25,7 +25,8 @@ public: summit_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_attr(*this, "attr"), - m_vram(*this, "vram"){ } + m_vram(*this, "vram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_attr; required_shared_ptr<UINT8> m_vram; @@ -33,6 +34,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_summit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index e56ac2cd370..9b3d36db437 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -72,7 +72,8 @@ public: : driver_device(mconfig, type, tag), m_col_line(*this, "col_line"), m_videoram(*this, "videoram"), - m_char_bank(*this, "char_bank"){ } + m_char_bank(*this, "char_bank"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_col_line; required_shared_ptr<UINT8> m_videoram; @@ -91,6 +92,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_supdrapo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/supercrd.c b/src/mame/drivers/supercrd.c index 25e1a442964..cd633511f91 100644 --- a/src/mame/drivers/supercrd.c +++ b/src/mame/drivers/supercrd.c @@ -175,7 +175,8 @@ public: supercrd_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -186,6 +187,7 @@ public: DECLARE_PALETTE_INIT(supercrd); DECLARE_VIDEO_START(supercrd); UINT32 screen_update_supercrd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 7057de3b6cb..e1f156c1b3e 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -33,7 +33,8 @@ public: superdq_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_laserdisc(*this, "laserdisc") , - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_device<pioneer_ldv1000_device> m_laserdisc; UINT8 m_ld_in_latch; @@ -53,6 +54,7 @@ public: virtual void palette_init(); UINT32 screen_update_superdq(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(superdq_vblank); + required_device<cpu_device> m_maincpu; }; TILE_GET_INFO_MEMBER(superdq_state::get_tile_info) diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index 4ba7563a424..ccdaf11fa90 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -109,7 +109,8 @@ class supertnk_state : public driver_device { public: supertnk_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 *m_videoram[3]; UINT8 m_rom_bank; @@ -127,6 +128,7 @@ public: virtual void video_start(); UINT32 screen_update_supertnk(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(supertnk_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 5213c54a587..40ddaee3d90 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -31,7 +31,8 @@ class suprgolf_state : public driver_device public: suprgolf_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_tilemap; required_shared_ptr<UINT8> m_videoram; @@ -71,6 +72,7 @@ public: UINT32 screen_update_suprgolf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(adpcm_int); + required_device<cpu_device> m_maincpu; }; TILE_GET_INFO_MEMBER(suprgolf_state::get_tile_info) diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c index b2687a0f561..d2507140f91 100644 --- a/src/mame/drivers/taitogn.c +++ b/src/mame/drivers/taitogn.c @@ -336,8 +336,8 @@ public: driver_device(mconfig, type, tag), m_znsec0(*this,"maincpu:sio0:znsec0"), m_znsec1(*this,"maincpu:sio0:znsec1"), - m_zndip(*this,"maincpu:sio0:zndip") - { + m_zndip(*this,"maincpu:sio0:zndip"), + m_maincpu(*this, "maincpu") { } required_device<znsec_device> m_znsec0; @@ -398,6 +398,7 @@ public: UINT32 gen_flash_r(intelfsh16_device *device, offs_t offset, UINT32 mem_mask); void gen_flash_w(intelfsh16_device *device, offs_t offset, UINT32 data, UINT32 mem_mask); void install_handlers(int mode); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/taitopjc.c b/src/mame/drivers/taitopjc.c index 8854a975bfb..f9c9ea0ad85 100644 --- a/src/mame/drivers/taitopjc.c +++ b/src/mame/drivers/taitopjc.c @@ -69,7 +69,8 @@ class taitopjc_state : public driver_device { public: taitopjc_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_READ64_MEMBER(video_r); DECLARE_WRITE64_MEMBER(video_w); @@ -84,6 +85,7 @@ public: DECLARE_WRITE8_MEMBER(taitopjc_tlcs900_to3); virtual void video_start(); UINT32 screen_update_taitopjc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; void taitopjc_state::video_start() diff --git a/src/mame/drivers/tapatune.c b/src/mame/drivers/tapatune.c index 6af31e0b761..510f5799a91 100644 --- a/src/mame/drivers/tapatune.c +++ b/src/mame/drivers/tapatune.c @@ -40,7 +40,8 @@ class tapatune_state : public driver_device public: tapatune_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram") {} + m_videoram(*this, "videoram") , + m_maincpu(*this, "maincpu") {} UINT8 m_paletteram[0x300]; UINT16 m_palette_write_address; @@ -73,6 +74,7 @@ public: DECLARE_WRITE8_MEMBER(bsmt_reg_w); DECLARE_WRITE_LINE_MEMBER(crtc_vsync); virtual void video_start(); + required_device<cpu_device> m_maincpu; }; WRITE16_MEMBER(tapatune_state::palette_w) diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index 4c158c1c69a..c4520f6a42c 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -28,7 +28,8 @@ public: tattack_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -38,6 +39,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_tattack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c index dfe7eb6309e..87d7c80c3aa 100644 --- a/src/mame/drivers/tcl.c +++ b/src/mame/drivers/tcl.c @@ -50,11 +50,13 @@ class tcl_state : public driver_device { public: tcl_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_DRIVER_INIT(tcl); virtual void video_start(); UINT32 screen_update_tcl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c index 5bc06183e7e..366ee6b2880 100644 --- a/src/mame/drivers/tempest.c +++ b/src/mame/drivers/tempest.c @@ -286,7 +286,8 @@ class tempest_state : public driver_device { public: tempest_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_player_select; DECLARE_WRITE8_MEMBER(wdclr_w); @@ -298,6 +299,7 @@ public: DECLARE_READ8_MEMBER(input_port_1_bit_r); DECLARE_READ8_MEMBER(input_port_2_bit_r); virtual void machine_start(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/tgtpanic.c b/src/mame/drivers/tgtpanic.c index dad438c6e26..44184d8b924 100644 --- a/src/mame/drivers/tgtpanic.c +++ b/src/mame/drivers/tgtpanic.c @@ -18,12 +18,14 @@ class tgtpanic_state : public driver_device public: tgtpanic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_ram(*this, "ram"){ } + m_ram(*this, "ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_ram; UINT8 m_color; DECLARE_WRITE8_MEMBER(color_w); UINT32 screen_update_tgtpanic(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c index c41aeaf349c..036185dee4f 100644 --- a/src/mame/drivers/thayers.c +++ b/src/mame/drivers/thayers.c @@ -38,7 +38,8 @@ public: thayers_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_pr7820(*this, "laserdisc"), - m_ldv1000(*this, "ldv1000") { } + m_ldv1000(*this, "ldv1000") , + m_maincpu(*this, "maincpu") { } optional_device<pioneer_pr7820_device> m_pr7820; optional_device<pioneer_ldv1000_device> m_ldv1000; @@ -85,6 +86,7 @@ public: TIMER_CALLBACK_MEMBER(intrq_tick); TIMER_CALLBACK_MEMBER(ssi263_phoneme_tick); void check_interrupt(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c index 616beaa7f30..4c3b37dbdc0 100644 --- a/src/mame/drivers/tickee.c +++ b/src/mame/drivers/tickee.c @@ -35,7 +35,8 @@ public: : driver_device(mconfig, type, tag), m_tlc34076(*this, "tlc34076"), m_vram(*this, "vram"), - m_control(*this, "control"){ } + m_control(*this, "control"), + m_maincpu(*this, "maincpu") { } required_device<tlc34076_device> m_tlc34076; required_shared_ptr<UINT16> m_vram; @@ -61,6 +62,7 @@ public: TIMER_CALLBACK_MEMBER(trigger_gun_interrupt); TIMER_CALLBACK_MEMBER(clear_gun_interrupt); TIMER_CALLBACK_MEMBER(setup_gun_interrupts); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/timetrv.c b/src/mame/drivers/timetrv.c index 5b926199434..3a943e7fbeb 100644 --- a/src/mame/drivers/timetrv.c +++ b/src/mame/drivers/timetrv.c @@ -33,7 +33,8 @@ public: timetrv_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_led_vram_lo(*this, "led_vralo"), - m_led_vram_hi(*this, "led_vrahi"){ } + m_led_vram_hi(*this, "led_vrahi"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_led_vram_lo; required_shared_ptr<UINT8> m_led_vram_hi; @@ -45,6 +46,7 @@ public: UINT32 screen_update_timetrv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(ld_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c index ee33b06352e..91d0983ee20 100644 --- a/src/mame/drivers/tmmjprd.c +++ b/src/mame/drivers/tmmjprd.c @@ -41,7 +41,8 @@ public: : driver_device(mconfig, type, tag), m_tilemap_regs(*this, "tilemap_regs"), m_spriteregs(*this, "spriteregs"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") , + m_maincpu(*this, "maincpu") { } required_shared_ptr_array<UINT32, 4> m_tilemap_regs; required_shared_ptr<UINT32> m_spriteregs; @@ -75,6 +76,7 @@ public: void ttmjprd_draw_tile(bitmap_ind16 &bitmap, const rectangle &cliprect, int x,int y,int sizex,int sizey, UINT32 tiledata, UINT8* rom); void ttmjprd_draw_tilemap(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32*tileram, UINT32*tileregs, UINT8*rom ); void tmmjprd_do_blit(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/tmspoker.c b/src/mame/drivers/tmspoker.c index e3df28d9931..4658ff199fd 100644 --- a/src/mame/drivers/tmspoker.c +++ b/src/mame/drivers/tmspoker.c @@ -219,7 +219,8 @@ class tmspoker_state : public driver_device public: tmspoker_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -234,6 +235,7 @@ public: virtual void palette_init(); UINT32 screen_update_tmspoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(tmspoker_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c index 3949f0a1bdc..88f2b7f4235 100644 --- a/src/mame/drivers/tomcat.c +++ b/src/mame/drivers/tomcat.c @@ -42,7 +42,8 @@ public: tomcat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tms(*this, "tms"), - m_shared_ram(*this, "shared_ram"){ } + m_shared_ram(*this, "shared_ram"), + m_maincpu(*this, "maincpu") { } required_device<tms5220n_device> m_tms; int m_control_num; @@ -79,6 +80,7 @@ public: DECLARE_WRITE8_MEMBER(tomcat_nvram_w); DECLARE_WRITE8_MEMBER(soundlatches_w); virtual void machine_start(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/tonton.c b/src/mame/drivers/tonton.c index 6834d1f7e31..d1db6fb9aec 100644 --- a/src/mame/drivers/tonton.c +++ b/src/mame/drivers/tonton.c @@ -33,7 +33,8 @@ class tonton_state : public driver_device public: tonton_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_v9938(*this, "v9938") { } + m_v9938(*this, "v9938") , + m_maincpu(*this, "maincpu") { } required_device<v9938_device> m_v9938; DECLARE_WRITE8_MEMBER(tonton_outport_w); @@ -43,6 +44,7 @@ public: virtual void machine_reset(); TIMER_DEVICE_CALLBACK_MEMBER(tonton_interrupt); DECLARE_WRITE_LINE_MEMBER(tonton_vdp0_interrupt); + required_device<cpu_device> m_maincpu; }; #define MAIN_CLOCK XTAL_21_4772MHz diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c index 1291e0f2653..354611e9fe3 100644 --- a/src/mame/drivers/tourtabl.c +++ b/src/mame/drivers/tourtabl.c @@ -17,12 +17,14 @@ class tourtabl_state : public driver_device { public: tourtabl_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_WRITE8_MEMBER(tourtabl_led_w); DECLARE_READ16_MEMBER(tourtabl_read_input_port); DECLARE_READ8_MEMBER(tourtabl_get_databus_contents); DECLARE_WRITE8_MEMBER(watchdog_w); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c index 056102b1c09..9945c7d7082 100644 --- a/src/mame/drivers/triforce.c +++ b/src/mame/drivers/triforce.c @@ -412,7 +412,8 @@ class triforce_state : public driver_device { public: triforce_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_READ64_MEMBER(gc_pi_r); DECLARE_WRITE64_MEMBER(gc_pi_w); @@ -421,6 +422,7 @@ public: virtual void machine_start(); virtual void video_start(); UINT32 screen_update_triforce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; READ64_MEMBER(triforce_state::gc_pi_r) diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index ea831dbf9aa..6c8b4cdba86 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -71,7 +71,8 @@ public: trvmadns_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_gfxram(*this, "gfxram"), - m_tileram(*this, "tileram"){ } + m_tileram(*this, "tileram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_bg_tilemap; required_shared_ptr<UINT8> m_gfxram; @@ -87,6 +88,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_trvmadns(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c index 431561768ae..2d7fc58a83b 100644 --- a/src/mame/drivers/ttchamp.c +++ b/src/mame/drivers/ttchamp.c @@ -49,7 +49,8 @@ class ttchamp_state : public driver_device { public: ttchamp_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT16* m_peno_vram; UINT16* m_peno_mainram; @@ -85,6 +86,7 @@ public: virtual void video_start(); UINT32 screen_update_ttchamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(ttchamp_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c index 29665ccfb2c..930b2394378 100644 --- a/src/mame/drivers/tugboat.c +++ b/src/mame/drivers/tugboat.c @@ -33,7 +33,8 @@ class tugboat_state : public driver_device public: tugboat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_ram(*this, "ram"){ } + m_ram(*this, "ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_ram; UINT8 m_hd46505_0_reg[18]; @@ -51,6 +52,7 @@ public: virtual void palette_init(); UINT32 screen_update_tugboat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(interrupt_gen); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/twinkle.c b/src/mame/drivers/twinkle.c index c2b3f26422b..8e3358e430d 100644 --- a/src/mame/drivers/twinkle.c +++ b/src/mame/drivers/twinkle.c @@ -245,7 +245,8 @@ class twinkle_state : public driver_device public: twinkle_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_am53cf96(*this, "scsi:am53cf96"){ } + m_am53cf96(*this, "scsi:am53cf96"), + m_maincpu(*this, "maincpu") { } required_device<am53cf96_device> m_am53cf96; @@ -272,6 +273,7 @@ public: DECLARE_WRITE16_MEMBER(twinkle_ide_w); DECLARE_WRITE_LINE_MEMBER(ide_interrupt); DECLARE_DRIVER_INIT(twinkle); + required_device<cpu_device> m_maincpu; }; /* RTC */ diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c index 025b60724ea..461ec472d5d 100644 --- a/src/mame/drivers/twins.c +++ b/src/mame/drivers/twins.c @@ -58,7 +58,8 @@ class twins_state : public driver_device public: twins_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_videoram; UINT16 *m_pal; @@ -73,6 +74,7 @@ public: DECLARE_VIDEO_START(twinsa); UINT32 screen_update_twins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_twinsa(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index b9c006f4f57..c6198ef5c9b 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -23,7 +23,8 @@ public: ultrsprt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vram(*this, "vram"), - m_workram(*this, "workram"){ } + m_workram(*this, "workram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_vram; required_shared_ptr<UINT32> m_workram; @@ -37,6 +38,7 @@ public: virtual void machine_start(); UINT32 screen_update_ultrsprt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(ultrsprt_vblank); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/umipoker.c b/src/mame/drivers/umipoker.c index b6979e7bc9f..b4befadede8 100644 --- a/src/mame/drivers/umipoker.c +++ b/src/mame/drivers/umipoker.c @@ -31,7 +31,8 @@ public: m_vram_1(*this, "vra1"), m_vram_2(*this, "vra2"), m_vram_3(*this, "vra3"), - m_z80_wram(*this, "z80_wram"){ } + m_z80_wram(*this, "z80_wram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_vram_0; required_shared_ptr<UINT16> m_vram_1; @@ -68,6 +69,7 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_umipoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_0) diff --git a/src/mame/drivers/unkfr.c b/src/mame/drivers/unkfr.c index 345d1703267..e7e4e31b0df 100644 --- a/src/mame/drivers/unkfr.c +++ b/src/mame/drivers/unkfr.c @@ -20,7 +20,9 @@ class unkfr_state : public driver_device { public: unkfr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } + required_device<cpu_device> m_maincpu; }; static INPUT_PORTS_START( unkfr ) diff --git a/src/mame/drivers/unkhorse.c b/src/mame/drivers/unkhorse.c index 216cb6b1243..c661e221f19 100644 --- a/src/mame/drivers/unkhorse.c +++ b/src/mame/drivers/unkhorse.c @@ -29,8 +29,8 @@ public: horse_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), - m_color_ram(*this, "color_ram") - { } + m_color_ram(*this, "color_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_video_ram; required_shared_ptr<UINT8> m_color_ram; @@ -41,6 +41,7 @@ public: virtual void palette_init(); UINT32 screen_update_horse(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(horse_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 1e5dd8ed5dc..e493b2429fc 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -76,8 +76,8 @@ public: m_tiles(*this,"tiles"), m_wram(*this,"wram"), m_tiles32(*this,"tiles32"), - m_wram32(*this,"wram32") - { + m_wram32(*this,"wram32"), + m_maincpu(*this, "maincpu") { m_has_extra_gfx = 0; } @@ -166,6 +166,7 @@ public: DECLARE_DRIVER_INIT(luplup); UINT32 screen_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_aoh(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; READ16_MEMBER(vamphalf_state::eeprom_r) diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c index d3ea52b6208..3c5cd3c73af 100644 --- a/src/mame/drivers/vcombat.c +++ b/src/mame/drivers/vcombat.c @@ -98,7 +98,8 @@ public: m_tlc34076(*this, "tlc34076"), m_vid_0_shared_ram(*this, "vid_0_ram"), m_vid_1_shared_ram(*this, "vid_1_ram"), - m_framebuffer_ctrl(*this, "fb_control"){ } + m_framebuffer_ctrl(*this, "fb_control"), + m_maincpu(*this, "maincpu") { } UINT16* m_m68k_framebuffer[2]; UINT16* m_i860_framebuffer[2][2]; @@ -128,6 +129,7 @@ public: DECLARE_MACHINE_RESET(shadfgtr); UINT32 screen_update_vcombat_main(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); UINT32 screen_update_vcombat_aux(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; static UINT32 update_screen(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int index) diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c index aa06b084e91..00b568fad86 100644 --- a/src/mame/drivers/vegas.c +++ b/src/mame/drivers/vegas.c @@ -463,7 +463,8 @@ public: m_timekeeper(*this, "timekeeper") , m_rambase(*this, "rambase"), m_nile_regs(*this, "nile_regs"), - m_rombase(*this, "rombase"){ } + m_rombase(*this, "rombase"), + m_maincpu(*this, "maincpu") { } required_device<m48t37_device> m_timekeeper; required_shared_ptr<UINT32> m_rambase; @@ -511,6 +512,7 @@ public: inline void _add_dynamic_device_address(device_t *device, offs_t start, offs_t end, read32_device_func read, write32_device_func write, const char *rdname, const char *wrname); void init_common(int ioasic, int serialnum); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c index ef2bca93011..513dbff719c 100644 --- a/src/mame/drivers/videopkr.c +++ b/src/mame/drivers/videopkr.c @@ -300,7 +300,8 @@ class videopkr_state : public driver_device { public: videopkr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 m_data_ram[0x100]; UINT8 m_video_ram[0x0400]; @@ -365,6 +366,7 @@ public: DECLARE_PALETTE_INIT(fortune1); UINT32 screen_update_videopkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(sound_t1_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c index 793eb43edc0..1bd420f5df8 100644 --- a/src/mame/drivers/viper.c +++ b/src/mame/drivers/viper.c @@ -308,7 +308,8 @@ class viper_state : public driver_device { public: viper_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT32 m_epic_iack; @@ -358,6 +359,7 @@ public: void mpc8240_epic_reset(void); int ds2430_insert_cmd_bit(int bit); void DS2430_w(int bit); + required_device<cpu_device> m_maincpu; }; UINT32 viper_state::screen_update_viper(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c index cf5a26eeb39..98bb78a2877 100644 --- a/src/mame/drivers/vpoker.c +++ b/src/mame/drivers/vpoker.c @@ -116,7 +116,8 @@ class vpoker_state : public driver_device { public: vpoker_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } UINT8 *m_videoram; UINT8 m_blit_ram[8]; @@ -126,6 +127,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_vpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c index edb8de5ab77..41291f0ef6c 100644 --- a/src/mame/drivers/vroulet.c +++ b/src/mame/drivers/vroulet.c @@ -48,7 +48,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_ball(*this, "ball"){ } + m_ball(*this, "ball"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -63,6 +64,7 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); UINT32 screen_update_vroulet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index 06f3a1fab7a..105470cb874 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -58,7 +58,8 @@ class wallc_state : public driver_device public: wallc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -70,6 +71,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_wallc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/warpsped.c b/src/mame/drivers/warpsped.c index de9bf038764..5e5eda134f8 100644 --- a/src/mame/drivers/warpsped.c +++ b/src/mame/drivers/warpsped.c @@ -92,7 +92,8 @@ public: warpspeed_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_workram(*this, "workram"){ } + m_workram(*this, "workram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_text_tilemap; @@ -107,6 +108,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_warpspeed(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; WRITE8_MEMBER(warpspeed_state::warpspeed_hardware_w) diff --git a/src/mame/drivers/whitestar.c b/src/mame/drivers/whitestar.c index 76d560fa1e8..84b8fc77dd6 100644 --- a/src/mame/drivers/whitestar.c +++ b/src/mame/drivers/whitestar.c @@ -16,8 +16,7 @@ public: m_maincpu(*this, "maincpu"), m_dmdcpu(*this, "dmdcpu"), m_mc6845(*this, "mc6845"), - m_decobsmt(*this, "decobsmt") - , + m_decobsmt(*this, "decobsmt"), m_vram(*this, "vram"){ } required_device<cpu_device> m_maincpu; diff --git a/src/mame/drivers/wildpkr.c b/src/mame/drivers/wildpkr.c index 4a91603ca8a..3f875621038 100644 --- a/src/mame/drivers/wildpkr.c +++ b/src/mame/drivers/wildpkr.c @@ -170,13 +170,15 @@ class wildpkr_state : public driver_device { public: wildpkr_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag) { } + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu") { } DECLARE_DRIVER_INIT(wildpkr); virtual void machine_start(); virtual void video_start(); virtual void palette_init(); UINT32 screen_update_wildpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index 82341fd6e59..503bb46526e 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -22,7 +22,8 @@ class wink_state : public driver_device public: wink_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; tilemap_t *m_bg_tilemap; @@ -44,6 +45,7 @@ public: virtual void video_start(); UINT32 screen_update_wink(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(wink_sound); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 9cb3e3a2c1c..af5401adc72 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -234,7 +234,8 @@ public: m_gfx0_cram(*this, "gfx0_cram"), m_gfx1_vram(*this, "gfx1_vram"), m_gfx1_cram(*this, "gfx1_cram"), - m_sprite_ram(*this, "sprite_ram"){ } + m_sprite_ram(*this, "sprite_ram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_gfx0a_tilemap; tilemap_t *m_gfx0b_tilemap; @@ -271,6 +272,7 @@ public: INTERRUPT_GEN_MEMBER(witch_main_interrupt); INTERRUPT_GEN_MEMBER(witch_sub_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c index 7e28f373d7e..629d5f43cb6 100644 --- a/src/mame/drivers/xtheball.c +++ b/src/mame/drivers/xtheball.c @@ -23,8 +23,8 @@ public: m_vram_bg(*this, "vrabg"), m_vram_fg(*this, "vrafg"), m_analog_x(*this, "ANALOGX"), - m_analog_y(*this, "ANALOGY") - { } + m_analog_y(*this, "ANALOGY"), + m_maincpu(*this, "maincpu") { } required_device<tlc34076_device> m_tlc34076; required_shared_ptr<UINT16> m_vram_bg; @@ -35,6 +35,7 @@ public: DECLARE_WRITE16_MEMBER(bit_controls_w); DECLARE_READ16_MEMBER(analogx_r); DECLARE_READ16_MEMBER(analogy_watchdog_r); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 382777a556d..22805089dab 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -37,8 +37,8 @@ public: m_gpu(*this, "gpu"), m_znsec0(*this,"maincpu:sio0:znsec0"), m_znsec1(*this,"maincpu:sio0:znsec1"), - m_zndip(*this,"maincpu:sio0:zndip") - { + m_zndip(*this,"maincpu:sio0:zndip"), + m_maincpu(*this, "maincpu") { } required_device<psxgpu_device> m_gpu; @@ -132,6 +132,7 @@ public: void atpsx_dma_write(UINT32 *p_n_psxram, UINT32 n_address, INT32 n_size ); void jdredd_vblank(screen_device &screen, bool vblank_state); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; inline void ATTR_PRINTF(3,4) zn_state::verboselog( int n_level, const char *s_fmt, ... ) diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 983635dc6f0..331e910470d 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -182,7 +182,8 @@ class zr107_state : public driver_device public: zr107_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_workram(*this, "workram"){ } + m_workram(*this, "workram"), + m_maincpu(*this, "maincpu") { } UINT8 m_led_reg0; UINT8 m_led_reg1; @@ -210,6 +211,7 @@ public: UINT32 screen_update_jetwave(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(zr107_vblank); TIMER_CALLBACK_MEMBER(irq_off); + required_device<cpu_device> m_maincpu; }; |