diff options
author | 2013-04-10 09:01:10 +0000 | |
---|---|---|
committer | 2013-04-10 09:01:10 +0000 | |
commit | 1da9a7259b83e14d86abe8e66828ad1a6b5cc87c (patch) | |
tree | d4f610caed37d03ff0d9a412aec8e017ea713e24 | |
parent | 9be192b9a41faf1f4f9d9b719440440d88671887 (diff) |
added m_maincpu to the rest of drivers in mame (nw)
395 files changed, 1182 insertions, 441 deletions
diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c index 9b682181d9f..9b6b805041f 100644 --- a/src/mame/drivers/gal3.c +++ b/src/mame/drivers/gal3.c @@ -588,7 +588,7 @@ static const c140_interface C140_interface = }; static MACHINE_CONFIG_START( gal3, gal3_state ) - MCFG_CPU_ADD("cpumst", M68020, 49152000/2) + MCFG_CPU_ADD("maincpu", M68020, 49152000/2) MCFG_CPU_PROGRAM_MAP(cpu_mst_map) MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gal3_state, irq1_line_hold) @@ -773,7 +773,7 @@ GLC1-SND-DATA1 4/5H 27c1000 DATA1.BIN ROM_START( gal3 ) /********* CPU-MST board x1 *********/ - ROM_REGION( 0x200000, "cpumst", 0 ) /* 68020 Code */ + ROM_REGION( 0x200000, "maincpu", 0 ) /* 68020 Code */ ROM_LOAD32_BYTE( "glc1-mst-prg0e.6b", 0x00003, 0x80000, CRC(5deccd72) SHA1(8d50779221538cc171469a691fabb17b62a8e664) ) ROM_LOAD32_BYTE( "glc1-mst-prg1e.10b", 0x00002, 0x80000, CRC(b6144e3b) SHA1(33f63d881e7012db7f971b074bc5f876a66198b7) ) ROM_LOAD32_BYTE( "glc1-mst-prg2e.14b", 0x00001, 0x80000, CRC(13381084) SHA1(486c1e136e6594ba68858e40246c5fb9bef1c0d2) ) diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 3fdacb144f5..e5d1b158ef2 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram"), m_fg_videoram(*this, "fg_videoram"), m_bg_videoram(*this, "bg_videoram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -43,4 +44,5 @@ public: UINT32 screen_update_1942(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(c1942_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index e678db303f7..7890f9c5c1c 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -14,7 +14,8 @@ public: m_scrollx(*this, "scrollx"), m_scrolly(*this, "scrolly"), m_bgscrollx(*this, "bgscrollx"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -48,4 +49,5 @@ public: virtual void palette_init(); UINT32 screen_update_1943(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h index 96488b617b6..a676c6ee39f 100644 --- a/src/mame/includes/40love.h +++ b/src/mame/includes/40love.h @@ -9,7 +9,8 @@ public: m_colorram(*this, "colorram"), m_spriteram2(*this, "spriteram2"), m_mcu_ram(*this, "mcu_ram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -103,4 +104,5 @@ public: void fortyl_plot_pix( int offset ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_pixram( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index a840ef6954b..de6fc883bdf 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -12,8 +12,8 @@ public: _4enraya_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ay(*this, "aysnd"), - m_snd_latch_bit(4) - { } + m_snd_latch_bit(4), + m_maincpu(*this, "maincpu") { } required_device<ay8910_device> m_ay; @@ -46,4 +46,5 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_4enraya(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index 6768fc477a6..2f4c00a4cf0 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -12,7 +12,8 @@ public: m_banked_rom(*this, "banked_rom"), m_paletteram_1000(*this, "paletteram_1000"), m_ram(*this, "ram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_banked_rom; @@ -49,6 +50,7 @@ public: virtual void machine_reset(); UINT32 screen_update_88games(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(k88games_interrupt); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/88games.c -----------*/ diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index 0418f2fcbeb..d9a31488f89 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -17,7 +17,8 @@ public: m_vscroll(*this, "vscroll"), m_starx(*this, "starx"), m_stary(*this, "stary"), - m_bgcolor(*this, "bgcolor"){ } + m_bgcolor(*this, "bgcolor"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_mainram; @@ -61,4 +62,5 @@ public: UINT32 screen_update_aeroboto(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(aeroboto_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 36620f4403b..9887052cf64 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -17,8 +17,8 @@ public: m_spr(*this, "vsystem_spr"), m_spr_old(*this, "vsystem_spr_old"), m_spr_old2(*this, "vsystem_spr_ol2"), - m_audiocpu(*this, "audiocpu") - { } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg1videoram; @@ -120,4 +120,5 @@ public: void aerfboot_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void wbbc97_draw_bitmap( bitmap_rgb32 &bitmap ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 634a582309b..a9144836c39 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -13,7 +13,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_paletteram(*this, "paletteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ optional_shared_ptr<UINT16> m_shared_ram; @@ -116,6 +117,7 @@ public: void kyros_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int c, int d ); void sstingry_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int c, int d ); DECLARE_WRITE_LINE_MEMBER(ym3812_irq); + required_device<cpu_device> m_maincpu; }; /* game_id - used to deal with a few game specific situations */ diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h index cb4a070efdc..070b643a21d 100644 --- a/src/mame/includes/ambush.h +++ b/src/mame/includes/ambush.h @@ -13,7 +13,8 @@ public: m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), m_scrollram(*this, "scrollram"), - m_colorbank(*this, "colorbank"){ } + m_colorbank(*this, "colorbank"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -27,4 +28,5 @@ public: virtual void palette_init(); UINT32 screen_update_ambush(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_chars( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h index 1459f7b18d9..3bacb1bd46e 100644 --- a/src/mame/includes/ampoker2.h +++ b/src/mame/includes/ampoker2.h @@ -3,7 +3,8 @@ class ampoker2_state : public driver_device public: ampoker2_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; @@ -24,4 +25,5 @@ public: virtual void palette_init(); DECLARE_VIDEO_START(sigma2k); UINT32 screen_update_ampoker2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 13d70c30640..e37c09d733d 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -47,4 +48,5 @@ public: UINT32 screen_update_amspdwy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); UINT8 amspdwy_wheel_r( int index ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index 62bf76a181f..52d38b5a9f9 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -14,7 +14,8 @@ public: m_txvideoram(*this, "txvideoram"), m_spriteram(*this, "spriteram"), m_paletteram(*this, "paletteram"), - m_subcpu(*this, "sub"){ } + m_subcpu(*this, "sub"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgtopvideoram; @@ -63,4 +64,5 @@ public: UINT32 screen_update_angelkds(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int enable_n); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 74595070742..279272ce124 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -10,7 +10,8 @@ public: m_fg_colorram(*this, "fg_colorram"), m_spriteram_2(*this, "spriteram_2"), m_bg_videoram(*this, "bg_videoram"), - m_bg_colorram(*this, "bg_colorram"){ } + m_bg_colorram(*this, "bg_colorram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -56,6 +57,7 @@ public: void appoooh_draw_sprites( bitmap_ind16 &dest_bmp, const rectangle &cliprect, gfx_element *gfx, UINT8 *sprite ); void robowres_draw_sprites( bitmap_ind16 &dest_bmp, const rectangle &cliprect, gfx_element *gfx, UINT8 *sprite ); DECLARE_WRITE_LINE_MEMBER(appoooh_adpcm_int); + required_device<cpu_device> m_maincpu; }; #define CHR1_OFST 0x00 /* palette page of char set #1 */ diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index 97c4e2d44b1..200275c67c5 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -11,7 +11,8 @@ public: m_txt_videoram(*this, "txt_videoram"), m_spriteram(*this, "spriteram"), m_scroll(*this, "scroll"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_mid_videoram; @@ -50,4 +51,5 @@ public: UINT32 screen_update_aquarium(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int y_offs ); UINT8 aquarium_snd_bitswap( UINT8 scrambled_data ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index 69a784809f1..c3031795b47 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -12,7 +12,8 @@ public: arabian_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_custom_cpu_ram(*this, "custom_cpu_ram"), - m_blitter(*this, "blitter"){ } + m_blitter(*this, "blitter"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_custom_cpu_ram; @@ -44,4 +45,5 @@ public: virtual void palette_init(); UINT32 screen_update_arabian(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void blit_area( UINT8 plane, UINT16 src, UINT8 x, UINT8 y, UINT8 sx, UINT8 sy ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h index 5ce11925357..e50775a4ee7 100644 --- a/src/mame/includes/argus.h +++ b/src/mame/includes/argus.h @@ -11,7 +11,8 @@ public: m_txram(*this, "txram"), m_bg1ram(*this, "bg1ram"), m_spriteram(*this, "spriteram"), - m_butasan_bg1ram(*this, "butasan_bg1ram"){ } + m_butasan_bg1ram(*this, "butasan_bg1ram"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT8> m_bg0_scrollx; optional_shared_ptr<UINT8> m_bg0_scrolly; @@ -97,4 +98,5 @@ public: void butasan_draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); void butasan_log_vram(); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index 7549498d049..cd8af962e9a 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -17,8 +17,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this,"videoram"), m_spriteram(*this,"spriteram"), - m_protram(*this,"protram") - { } + m_protram(*this,"protram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -87,4 +87,5 @@ public: TIMER_CALLBACK_MEMBER(test); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void arkanoid_bootleg_init( ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index a612b8a77e1..7516fe7e3b4 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -8,8 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_spr_pal_clut(*this, "spr_pal_clut"), m_fg_videoram(*this, "fg_videoram"), - m_bg_videoram(*this, "bg_videoram") - { } + m_bg_videoram(*this, "bg_videoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ UINT8 * m_text_videoram; @@ -86,6 +86,7 @@ public: UINT32 code,UINT32 color, UINT32 clut,int flipx,int flipy,int offsx,int offsy, int transparent_color); + required_device<cpu_device> m_maincpu; }; class bigfghtr_state : public armedf_state diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h index 75c8c9a83fc..1ce35ea01f2 100644 --- a/src/mame/includes/artmagic.h +++ b/src/mame/includes/artmagic.h @@ -12,7 +12,8 @@ public: m_tlc34076(*this, "tlc34076"), m_control(*this, "control"), m_vram0(*this, "vram0"), - m_vram1(*this, "vram1"){ } + m_vram1(*this, "vram1"), + m_maincpu(*this, "maincpu") { } required_device<tlc34076_device> m_tlc34076; required_shared_ptr<UINT16> m_control; @@ -52,6 +53,7 @@ public: virtual void machine_reset(); virtual void video_start(); TIMER_CALLBACK_MEMBER(irq_off); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 5a67e95c82d..bf4338a1423 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -17,7 +17,8 @@ public: m_tileram_7(*this, "tileram_7"), m_tileram(*this, "tileram"), m_tilemap_reg(*this, "tilemap_reg"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ UINT16 * m_tileram_1; @@ -77,4 +78,5 @@ public: UINT32 screen_update_ashnojoe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(ym2203_irq_handler); DECLARE_WRITE_LINE_MEMBER(ashnojoe_vclk_cb); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/asteroid.h b/src/mame/includes/asteroid.h index 1353366b711..38f64884281 100644 --- a/src/mame/includes/asteroid.h +++ b/src/mame/includes/asteroid.h @@ -13,7 +13,8 @@ public: : driver_device(mconfig, type, tag), m_ram1(*this, "ram1"), m_ram2(*this, "ram2"), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete") , + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT8> m_ram1; optional_shared_ptr<UINT8> m_ram2; @@ -41,6 +42,7 @@ public: DECLARE_WRITE8_MEMBER(asteroid_noise_reset_w); DECLARE_WRITE8_MEMBER(llander_snd_reset_w); DECLARE_WRITE8_MEMBER(llander_sounds_w); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/asteroid.c -----------*/ diff --git a/src/mame/includes/astrocde.h b/src/mame/includes/astrocde.h index a4be20ea557..d1dd44728d3 100644 --- a/src/mame/includes/astrocde.h +++ b/src/mame/includes/astrocde.h @@ -20,7 +20,8 @@ public: astrocde_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_protected_ram(*this, "protected_ram"){ } + m_protected_ram(*this, "protected_ram"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT8> m_videoram; UINT8 m_video_config; @@ -132,6 +133,7 @@ public: inline void increment_dest(UINT8 curwidth); void execute_blit(address_space &space); void init_sparklestar(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/wow.c -----------*/ diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h index 81e92344bf5..1d38efb1076 100644 --- a/src/mame/includes/atetris.h +++ b/src/mame/includes/atetris.h @@ -10,7 +10,8 @@ public: atetris_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_nvram(*this, "nvram") , - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_videoram; @@ -34,4 +35,5 @@ public: UINT32 screen_update_atetris(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(interrupt_gen); void reset_bank(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h index 9dc0edd3e7c..91256799205 100644 --- a/src/mame/includes/avalnche.h +++ b/src/mame/includes/avalnche.h @@ -13,8 +13,8 @@ public: avalnche_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_discrete(*this, "discrete") - { } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; optional_device<discrete_device> m_discrete; @@ -33,6 +33,7 @@ public: DECLARE_WRITE8_MEMBER(avalnche_attract_enable_w); DECLARE_WRITE8_MEMBER(avalnche_audio_w); DECLARE_WRITE8_MEMBER(catch_audio_w); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/aztarac.h b/src/mame/includes/aztarac.h index 64e498c0b6b..67d7c18a98c 100644 --- a/src/mame/includes/aztarac.h +++ b/src/mame/includes/aztarac.h @@ -10,7 +10,8 @@ public: aztarac_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_nvram(*this, "nvram") , - m_vectorram(*this, "vectorram"){ } + m_vectorram(*this, "vectorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_nvram; int m_sound_status; @@ -30,4 +31,5 @@ public: INTERRUPT_GEN_MEMBER(aztarac_snd_timed_irq); IRQ_CALLBACK_MEMBER(aztarac_irq_callback); inline void read_vectorram(UINT16 *vectorram, int addr, int *x, int *y, int *c); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h index 74514536f7e..c90ecc6668f 100644 --- a/src/mame/includes/bagman.h +++ b/src/mame/includes/bagman.h @@ -7,7 +7,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_video_enable(*this, "video_enable"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } UINT8 m_ls259_buf[8]; UINT8 m_p1_res; @@ -50,6 +51,7 @@ public: UINT32 screen_update_bagman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /*----------- timings -----------*/ diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index 48aa2077b5e..d47439e9aa5 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -42,7 +42,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_shrike_io(*this, "shrike_io"), - m_shrike_shared(*this, "shrike_shared"){ } + m_shrike_shared(*this, "shrike_shared"), + m_maincpu(*this, "maincpu") { } required_device<timer_device> m_scanline_timer; @@ -208,6 +209,7 @@ public: void update_grudge_steering(); void expand_roms(UINT8 cd_rom_mask); inline void config_shooter_adc(UINT8 shooter, UINT8 adc_shift); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 6370fe6f002..adedf1bbf40 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), - m_colorram2(*this, "colorram2"){ } + m_colorram2(*this, "colorram2"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -40,4 +41,5 @@ public: virtual void palette_init(); UINT32 screen_update_bankp(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/includes/baraduke.h b/src/mame/includes/baraduke.h index 36cbbcc1b90..a146502f31c 100644 --- a/src/mame/includes/baraduke.h +++ b/src/mame/includes/baraduke.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_textram(*this, "textram"){ } + m_textram(*this, "textram"), + m_maincpu(*this, "maincpu") { } int m_inputport_selected; int m_counter; @@ -43,4 +44,5 @@ public: void scroll_w(address_space &space, int layer, int offset, int data); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int sprite_priority); void set_scroll(int layer); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index 6d26d4467ff..e4f1e9c2f92 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -10,7 +10,8 @@ public: battlex_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") { } UINT8 m_in0_b4; @@ -38,4 +39,5 @@ public: UINT32 screen_update_battlex(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(battlex_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index f9c9d30167b..2b3f0bc495b 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -9,7 +9,8 @@ class battlnts_state : public driver_device public: battlnts_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") { } /* memory pointers */ // UINT8 * paletteram; // this currently uses generic palette handling @@ -31,6 +32,7 @@ public: virtual void machine_reset(); UINT32 screen_update_battlnts(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(battlnts_interrupt); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/battlnts.c -----------*/ diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h index ad49b1a31fa..4201ffac867 100644 --- a/src/mame/includes/bbusters.h +++ b/src/mame/includes/bbusters.h @@ -13,7 +13,8 @@ public: m_pf1_data(*this, "pf1_data"), m_pf2_data(*this, "pf2_data"), m_pf1_scroll_data(*this, "pf1_scroll_data"), - m_pf2_scroll_data(*this, "pf2_scroll_data"){ } + m_pf2_scroll_data(*this, "pf2_scroll_data"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT16> m_eprom_data; required_device<buffered_spriteram16_device> m_spriteram; @@ -61,4 +62,5 @@ public: void bbusters_draw_block(bitmap_ind16 &dest,int x,int y,int size,int flipx,int flipy,UINT32 sprite,int color,int bank,int block); void draw_sprites(bitmap_ind16 &bitmap, const UINT16 *source, int bank, int colval, int colmask); DECLARE_WRITE_LINE_MEMBER(sound_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index e3aae52d6d4..c4428ef7dbf 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -7,7 +7,8 @@ public: m_paletteram(*this, "paletteram"), m_spriteram1(*this, "spriteram1"), m_spriteram2(*this, "spriteram2"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -95,4 +96,5 @@ public: TIMER_CALLBACK_MEMBER(nmi_callback); TIMER_CALLBACK_MEMBER(deferred_ls74_w); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index ed077916119..52ad03ea750 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -8,7 +8,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_vidreg1(*this, "vidreg1"), - m_vidreg2(*this, "vidreg2"){ } + m_vidreg2(*this, "vidreg2"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_tilemap; tilemap_t *m_tilemap2; @@ -32,4 +33,5 @@ public: virtual void video_start(); UINT32 screen_update_bigstrkb(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/includes/bionicc.h b/src/mame/includes/bionicc.h index c1da8571c44..ebc64e55f4c 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -15,7 +15,8 @@ public: m_txvideoram(*this, "txvideoram"), m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), - m_paletteram(*this, "paletteram"){ } + m_paletteram(*this, "paletteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_device<buffered_spriteram16_device> m_spriteram; @@ -53,4 +54,5 @@ public: UINT32 screen_update_bionicc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(bionicc_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index bdd76d7f006..37059c6c997 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -10,7 +10,8 @@ public: bladestl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_paletteram(*this, "paletteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -37,6 +38,7 @@ public: virtual void palette_init(); UINT32 screen_update_bladestl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(bladestl_scanline); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/bladestl.c -----------*/ diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index 79f7d07717e..94bdfa7e69f 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -13,7 +13,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_txvideoram(*this, "txvideoram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -66,4 +67,5 @@ public: UINT32 screen_update_blktiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index a3cbc387faf..fb22aed7212 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -14,7 +14,8 @@ public: m_scroll_1(*this, "scroll_1"), m_scroll_0(*this, "scroll_0"), m_paletteram(*this, "paletteram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_vram_1; @@ -51,4 +52,5 @@ public: DECLARE_MACHINE_RESET(watrball); UINT32 screen_update_blmbycar(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/includes/blockade.h b/src/mame/includes/blockade.h index f114b67b2c8..d99369b4613 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -7,7 +7,8 @@ public: blockade_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_device<discrete_device> m_discrete; @@ -30,6 +31,7 @@ public: UINT32 screen_update_blockade(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(blockade_interrupt); DECLARE_WRITE8_MEMBER(blockade_sound_freq_w); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/blockade.c -----------*/ diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h index 0a421852d8b..3b90cdc7250 100644 --- a/src/mame/includes/bloodbro.h +++ b/src/mame/includes/bloodbro.h @@ -7,7 +7,8 @@ public: m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), m_txvideoram(*this, "txvideoram"), - m_scroll(*this, "scroll"){ } + m_scroll(*this, "scroll"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_bgvideoram; @@ -31,4 +32,5 @@ public: UINT32 screen_update_skysmash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void bloodbro_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void weststry_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index e96f8c9e8b2..4f1f46670b5 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -13,8 +13,8 @@ public: m_videoram(*this, "videoram"), m_scrollram(*this, "scrollram"), m_spriteram(*this, "spriteram"), - m_colorram(*this, "colorram") - { } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } /* device/memory pointers */ required_device<cpu_device> m_audiocpu; @@ -45,4 +45,5 @@ public: virtual void palette_init(); UINT32 screen_update_blueprnt(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/includes/bogeyman.h b/src/mame/includes/bogeyman.h index 0a3a33741b5..ce73cc58242 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -13,7 +13,8 @@ public: m_videoram2(*this, "videoram2"), m_colorram(*this, "colorram"), m_colorram2(*this, "colorram2"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -47,4 +48,5 @@ public: virtual void palette_init(); UINT32 screen_update_bogeyman(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/includes/bombjack.h b/src/mame/includes/bombjack.h index 0cca6c8dba4..7b56abe70b6 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -11,7 +11,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; @@ -43,4 +44,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); TIMER_CALLBACK_MEMBER(soundlatch_callback); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index d42e7e3d45d..ee9b9146b3c 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -20,7 +20,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_motion(*this, "motion"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -63,6 +64,7 @@ public: DECLARE_WRITE8_MEMBER(bsktball_note_w); DECLARE_WRITE8_MEMBER(bsktball_noise_reset_w); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/bsktball.c -----------*/ diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h index 2b47c4723e4..8c7f13735c0 100644 --- a/src/mame/includes/btoads.h +++ b/src/mame/includes/btoads.h @@ -26,7 +26,8 @@ public: m_vram_bg0(*this, "vram_bg0"), m_vram_bg1(*this, "vram_bg1"), m_sprite_scale(*this, "sprite_scale"), - m_sprite_control(*this, "sprite_control") { } + m_sprite_control(*this, "sprite_control") , + m_maincpu(*this, "maincpu") { } // in drivers/btoads DECLARE_WRITE16_MEMBER( main_sound_w ); @@ -111,4 +112,5 @@ protected: UINT16 m_sprite_dest_offs; UINT16 m_misc_control; int m_xcount; + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index 2f214b2dbe8..229f3cdde1f 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram"), m_scrollv(*this, "scrollv"), m_scrollh(*this, "scrollh"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_charram; @@ -62,4 +63,5 @@ public: void draw_bg( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_fg( 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/includes/bwidow.h b/src/mame/includes/bwidow.h index 23f98d3bc8b..c96c00093ce 100644 --- a/src/mame/includes/bwidow.h +++ b/src/mame/includes/bwidow.h @@ -10,13 +10,15 @@ class bwidow_state : public driver_device { public: bwidow_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_lastdata; DECLARE_READ8_MEMBER(spacduel_IN3_r); DECLARE_WRITE8_MEMBER(bwidow_misc_w); DECLARE_WRITE8_MEMBER(irq_ack_w); DECLARE_CUSTOM_INPUT_MEMBER(clock_r); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h index 6a7c8bccee8..6e1dbcbcdfa 100644 --- a/src/mame/includes/bzone.h +++ b/src/mame/includes/bzone.h @@ -14,7 +14,8 @@ class bzone_state : public driver_device public: bzone_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_discrete(*this, "discrete") { } + m_discrete(*this, "discrete") , + m_maincpu(*this, "maincpu") { } optional_device<discrete_device> m_discrete; @@ -31,6 +32,7 @@ public: DECLARE_MACHINE_START(redbaron); INTERRUPT_GEN_MEMBER(bzone_interrupt); DECLARE_WRITE8_MEMBER(bzone_sounds_w); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index a6c3a935833..083b09710e1 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_colorram; @@ -37,4 +38,5 @@ public: UINT32 screen_update_cabal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void seibu_sound_bootleg(const char *cpu,int length); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h index 15b0e570a60..5d44ea21d45 100644 --- a/src/mame/includes/calomega.h +++ b/src/mame/includes/calomega.h @@ -4,7 +4,8 @@ public: calomega_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_tx_line; UINT8 m_rx_line; @@ -44,4 +45,5 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_calomega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 82befb6c0fa..334d3752f35 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -23,7 +23,8 @@ public: canyon_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -46,6 +47,7 @@ public: DECLARE_WRITE8_MEMBER(canyon_whistle_w); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_bombs( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index 1d0626ef9a6..0dfe8405cd4 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -10,7 +10,8 @@ public: carjmbre_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -33,4 +34,5 @@ public: virtual void palette_init(); UINT32 screen_update_carjmbre(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/includes/carpolo.h b/src/mame/includes/carpolo.h index 02d78165416..97a00bfc615 100644 --- a/src/mame/includes/carpolo.h +++ b/src/mame/includes/carpolo.h @@ -15,7 +15,8 @@ public: carpolo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_alpharam(*this, "alpharam"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_alpharam; required_shared_ptr<UINT8> m_spriteram; @@ -99,6 +100,7 @@ public: int x2, int y2, int code2, int flipy2, int *col_x, int *col_y); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index 1886e56bc92..f78c18dacbf 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -9,7 +9,8 @@ class cbasebal_state : public driver_device public: cbasebal_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -50,4 +51,5 @@ public: virtual void video_start(); UINT32 screen_update_cbasebal(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/includes/cchasm.h b/src/mame/includes/cchasm.h index 2b5d7e8a7c5..26dcf3b62ac 100644 --- a/src/mame/includes/cchasm.h +++ b/src/mame/includes/cchasm.h @@ -11,7 +11,8 @@ class cchasm_state : public driver_device public: cchasm_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") { } int m_sound_flags; int m_coin_flag; @@ -36,6 +37,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ctc_timer_1_w); DECLARE_WRITE_LINE_MEMBER(ctc_timer_2_w); void cchasm_refresh (); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/cchasm.c -----------*/ diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h index c4d015b5898..c22e64df621 100644 --- a/src/mame/includes/cclimber.h +++ b/src/mame/includes/cclimber.h @@ -14,7 +14,8 @@ public: m_swimmer_palettebank(*this, "palettebank"), m_swimmer_background_color(*this, "bgcolor"), m_toprollr_bg_videoram(*this, "bg_videoram"), - m_toprollr_bg_coloram(*this, "bg_coloram"){ } + m_toprollr_bg_coloram(*this, "bg_coloram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_bigsprite_videoram; required_shared_ptr<UINT8> m_videoram; @@ -81,4 +82,5 @@ public: void swimmer_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx); void cclimber_decode(const UINT8 convtable[8][16]); void cannonb_patch(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h index c513a0b012b..0ce7339dc38 100644 --- a/src/mame/includes/centiped.h +++ b/src/mame/includes/centiped.h @@ -12,8 +12,8 @@ public: m_rambase(*this, "rambase"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_bullsdrt_tiles_bankram(*this, "bullsdrt_bank") - { } + m_bullsdrt_tiles_bankram(*this, "bullsdrt_bank"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT8> m_rambase; required_shared_ptr<UINT8> m_videoram; @@ -84,4 +84,5 @@ public: void init_common(); void milliped_set_color(offs_t offset, UINT8 data); inline int read_trackball(int idx, int switch_port); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index aecbc90b147..1d2b16d3a61 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -11,7 +11,8 @@ public: m_mcu_ram(*this, "mcu_ram"), m_tx_ram(*this, "tx_ram"), m_attr_ram(*this, "attr_ram"), - m_spr_ram(*this, "spr_ram"){ } + m_spr_ram(*this, "spr_ram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_mcu_ram; @@ -57,4 +58,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_bitmap( bitmap_ind16 &bitmap, const rectangle &cliprect ); void mcu_update_seed( UINT8 data ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index 6744410bb72..1429707c231 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -7,7 +7,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -96,4 +97,5 @@ public: void draw_obj1( bitmap_ind16 &bitmap ); void draw_river( bitmap_ind16 &bitmap, int sy ); void draw_tree( bitmap_ind16 &bitmap, int sy, int tree_num ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h index 8127420dd9f..d3519171a50 100644 --- a/src/mame/includes/cinemat.h +++ b/src/mame/includes/cinemat.h @@ -10,7 +10,8 @@ class cinemat_state : public driver_device public: cinemat_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_rambase(*this, "rambase"){ } + m_rambase(*this, "rambase"), + m_maincpu(*this, "maincpu") { } UINT8 m_sound_control; void (*m_sound_handler)(running_machine &,UINT8 sound_val, UINT8 bits_changed); @@ -70,6 +71,7 @@ public: DECLARE_READ8_MEMBER(sound_portb_r); DECLARE_WRITE8_MEMBER(sound_portb_w); DECLARE_WRITE8_MEMBER(sound_output_w); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/cinemat.c -----------*/ diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index c4b89605091..7e61ee0d8a5 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -21,7 +21,8 @@ public: m_audiocpu(*this, "audiocpu"), m_sn_1(*this, "sn1"), m_sn_2(*this, "sn2"), - m_discrete(*this, "fltdisc"){ } + m_discrete(*this, "fltdisc"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spritebank; @@ -62,4 +63,5 @@ public: UINT32 screen_update_circusc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); 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/includes/cloak.h b/src/mame/includes/cloak.h index ccab9841bd2..414a2dcc757 100644 --- a/src/mame/includes/cloak.h +++ b/src/mame/includes/cloak.h @@ -10,7 +10,8 @@ public: cloak_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; required_shared_ptr<UINT8> m_spriteram; @@ -44,4 +45,5 @@ public: void set_pens(); void draw_bitmap(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/includes/clshroad.h b/src/mame/includes/clshroad.h index a32d6e1eeac..35ca7275f4a 100644 --- a/src/mame/includes/clshroad.h +++ b/src/mame/includes/clshroad.h @@ -6,7 +6,8 @@ public: m_spriteram(*this, "spriteram"), m_vram_1(*this, "vram_1"), m_vregs(*this, "vregs"), - m_vram_0(*this, "vram_0"){ } + m_vram_0(*this, "vram_0"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_vram_1; @@ -32,4 +33,5 @@ public: DECLARE_PALETTE_INIT(clshroad); UINT32 screen_update_clshroad(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/includes/combatsc.h b/src/mame/includes/combatsc.h index 84d53aad53c..5d8b2b0f5e4 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -10,7 +10,8 @@ public: combatsc_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_paletteram(*this, "paletteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ UINT8 * m_videoram; @@ -85,4 +86,5 @@ public: void set_pens( ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, const UINT8 *source, int circuit, UINT32 pri_mask ); void bootleg_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, const UINT8 *source, int circuit ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 7c65c69a9e5..25582bdcc70 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -16,7 +16,8 @@ public: m_colorram2(*this, "colorram2"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -50,4 +51,5 @@ public: UINT32 screen_update_commando(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(commando_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 4e639253eae..9a3597be702 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_bg_ram(*this, "bg_ram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -45,4 +46,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void compgolf_expand_bg(); DECLARE_WRITE_LINE_MEMBER(sound_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index 07e632e3f00..69f405546e9 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -17,7 +17,8 @@ public: m_spriteram(*this, "spriteram"), m_bg_cram(*this, "bg_cram"), m_bg_vram(*this, "bg_vram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ UINT8 * m_buffered_spriteram; @@ -65,4 +66,5 @@ public: INTERRUPT_GEN_MEMBER(contra_interrupt); void set_pens( ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int bank ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index 5be2e432951..1c5b57a3c38 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -18,7 +18,8 @@ public: m_carimage(*this, "carimage"), m_cary(*this, "cary"), m_videoram(*this, "videoram"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_trucky; @@ -38,6 +39,7 @@ public: virtual void machine_reset(); virtual void palette_init(); UINT32 screen_update_copsnrob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/copsnrob.c -----------*/ diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 00c8bcb8bc2..4419dc30f5d 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -17,7 +17,8 @@ public: cosmic_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -81,4 +82,5 @@ public: void cosmica_draw_starfield( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void devzone_draw_grid( bitmap_ind16 &bitmap, const rectangle &cliprect ); void nomnlnd_draw_background( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index 2f6021f1d1e..d8ee535e101 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -19,7 +19,8 @@ public: m_tilemap40_regs_base(*this, "tmap40_regs"), m_tilemap50_regs_base(*this, "tmap50_regs"), m_fullscreenzoom(*this, "fullscreenzoom"), - m_0xc0000000_ram(*this, "0xc0000000_ram"){ } + m_0xc0000000_ram(*this, "0xc0000000_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_mainram; required_shared_ptr<UINT32> m_spriteram; @@ -127,6 +128,7 @@ public: int transparency, int transparent_color, int scalex, int scaley, bitmap_ind8 *pri_buffer, UINT32 pri_mask); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h index d1832b583bb..f39aae685a2 100644 --- a/src/mame/includes/crbaloon.h +++ b/src/mame/includes/crbaloon.h @@ -18,7 +18,8 @@ public: m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), m_pc3092_data(*this, "pc3092_data"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -50,6 +51,7 @@ public: void pc3092_reset(void); void pc3092_update(); void pc3259_update(void); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index dc46996bf50..1bdc718584d 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -15,8 +15,8 @@ public: m_bg_videoram(*this, "bg_videoram"), m_spriteram(*this, "spriteram"), m_sprgen(*this, "spritegen"), - m_audiocpu(*this, "audiocpu") - { } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_fg_videoram; @@ -53,4 +53,5 @@ public: UINT32 screen_update_crospang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void tumblepb_gfx1_rearrange(); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index d45caa7fad2..da7002555fd 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -13,8 +13,8 @@ public: m_k053936(*this, "k053936"), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), - m_spr(*this, "vsystem_spr") - { } + m_spr(*this, "vsystem_spr"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram1; @@ -62,4 +62,5 @@ public: void draw_fg(bitmap_ind16 &bitmap, const rectangle &cliprect); void crshrace_patch_code( UINT16 offset ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h index e186eba80c8..fec31857d47 100644 --- a/src/mame/includes/darkmist.h +++ b/src/mame/includes/darkmist.h @@ -7,7 +7,8 @@ public: m_scroll(*this, "scroll"), m_videoram(*this, "videoram"), m_workram(*this, "workram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spritebank; required_shared_ptr<UINT8> m_scroll; @@ -32,4 +33,5 @@ public: void set_pens(); void decrypt_gfx(); void decrypt_snd(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/darkseal.h b/src/mame/includes/darkseal.h index d3c61a55823..bef82c2e869 100644 --- a/src/mame/includes/darkseal.h +++ b/src/mame/includes/darkseal.h @@ -13,8 +13,8 @@ public: m_ram(*this, "ram"), m_pf1_rowscroll(*this, "pf1_rowscroll"), m_pf3_rowscroll(*this, "pf3_rowscroll"), - m_sprgen(*this, "spritegen") - { } + m_sprgen(*this, "spritegen"), + m_maincpu(*this, "maincpu") { } required_device<deco16ic_device> m_deco_tilegen1; required_device<deco16ic_device> m_deco_tilegen2; @@ -36,4 +36,5 @@ public: virtual void video_start(); UINT32 screen_update_darkseal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void update_24bitcol(int offset); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h index 53fe6377108..3351536cdf1 100644 --- a/src/mame/includes/dc.h +++ b/src/mame/includes/dc.h @@ -15,7 +15,8 @@ class dc_state : public driver_device dc_framebuffer_ram(*this, "frameram"), dc_texture_ram(*this, "dc_texture_ram"), dc_sound_ram(*this, "dc_sound_ram"), - dc_ram(*this, "dc_ram"){ } + dc_ram(*this, "dc_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT64> dc_framebuffer_ram; // '32-bit access area' required_shared_ptr<UINT64> dc_texture_ram; // '64-bit access area' @@ -111,6 +112,7 @@ class dc_state : public driver_device DECLARE_READ64_MEMBER( dc_rtc_r ); DECLARE_WRITE64_MEMBER( dc_rtc_w ); + required_device<cpu_device> m_maincpu; }; /*--------- Ch2-DMA Control Registers ----------*/ diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h index b44b3bbc740..ca53d0fd2f6 100644 --- a/src/mame/includes/dcon.h +++ b/src/mame/includes/dcon.h @@ -8,7 +8,8 @@ public: m_mid_data(*this, "mid_data"), m_textram(*this, "textram"), m_spriteram(*this, "spriteram"), - m_scroll_ram(*this, "scroll_ram"){ } + m_scroll_ram(*this, "scroll_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_back_data; required_shared_ptr<UINT16> m_fore_data; @@ -40,4 +41,5 @@ public: UINT32 screen_update_dcon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_sdgndmps(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/includes/dday.h b/src/mame/includes/dday.h index 307ca96dec2..195c3a6d1f8 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -13,7 +13,8 @@ public: m_textvideoram(*this, "textvideoram"), m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_textvideoram; @@ -53,4 +54,5 @@ public: UINT32 screen_update_dday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(countdown_timer_callback); void start_countdown_timer(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index 4a5f6223815..ec208fc54e7 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -15,7 +15,8 @@ public: m_sharedram(*this, "sharedram"), m_bg_videoram(*this, "bg_videoram"), m_spriteram_2(*this, "spriteram_2"), - m_snd_sharedram(*this, "snd_sharedram"){ } + m_snd_sharedram(*this, "snd_sharedram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -64,4 +65,5 @@ public: INTERRUPT_GEN_MEMBER(ddribble_interrupt_1); void set_pens( ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8* source, int lenght, int gfxset, int flipscreen ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h index 068f0f56d39..f5948192520 100644 --- a/src/mame/includes/deadang.h +++ b/src/mame/includes/deadang.h @@ -6,7 +6,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_scroll_ram(*this, "scroll_ram"), - m_video_data(*this, "video_data"){ } + m_video_data(*this, "video_data"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_videoram; @@ -36,4 +37,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(deadang_main_scanline); TIMER_DEVICE_CALLBACK_MEMBER(deadang_sub_scanline); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/dec0.h b/src/mame/includes/dec0.h index c1ef2f518ab..f27779d9c97 100644 --- a/src/mame/includes/dec0.h +++ b/src/mame/includes/dec0.h @@ -12,8 +12,8 @@ public: m_tilegen1(*this, "tilegen1"), m_tilegen2(*this, "tilegen2"), m_tilegen3(*this, "tilegen3"), - m_spritegen(*this, "spritegen") - { } + m_spritegen(*this, "spritegen"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_ram; required_shared_ptr<UINT16> m_spriteram; @@ -91,6 +91,7 @@ public: void slyspy_set_protection_map( int type); DECLARE_WRITE_LINE_MEMBER(sound_irq); DECLARE_WRITE_LINE_MEMBER(sound_irq2); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index 1ce799a3780..a43ac5b0b16 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -6,9 +6,8 @@ public: m_mlc_ram(*this, "mlc_ram"), m_irq_ram(*this, "irq_ram"), m_mlc_clip_ram(*this, "mlc_clip_ram"), - m_mlc_vram(*this, "mlc_vram") - - { } + m_mlc_vram(*this, "mlc_vram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_mlc_ram; required_shared_ptr<UINT32> m_irq_ram; @@ -60,4 +59,5 @@ public: void blitRaster(bitmap_rgb32 &bitmap, int rasterMode); void draw_sprites( const rectangle &cliprect, int scanline, UINT32* dest); void descramble_sound( ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index 2642705ac5c..99485da5e37 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -13,7 +13,8 @@ public: m_videoram(*this, "videoram"), m_textram(*this, "textram"), m_spriteram(*this, "spriteram"), - m_paletteram(*this, "paletteram"){ } + m_paletteram(*this, "paletteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -66,4 +67,5 @@ public: void set_bg_page( int page, int value ); void set_fg_page( int page, int value ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/djmain.h b/src/mame/includes/djmain.h index 4e2c9312df9..8b598b0fe25 100644 --- a/src/mame/includes/djmain.h +++ b/src/mame/includes/djmain.h @@ -3,7 +3,8 @@ class djmain_state : public driver_device public: djmain_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_obj_ram(*this, "obj_ram"){ } + m_obj_ram(*this, "obj_ram"), + m_maincpu(*this, "maincpu") { } int m_sndram_bank; UINT8 *m_sndram; @@ -58,6 +59,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ide_interrupt); void sndram_set_bank(); void draw_sprites( bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/djmain.c -----------*/ diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index c29280ef79c..f31c25ac410 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -83,8 +83,8 @@ public: m_video_ram(*this,"video_ram"), m_sprite_ram(*this,"sprite_ram"), m_vidhw(DKONG_BOARD), - m_discrete(*this, "discrete") - { } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_video_ram; @@ -234,6 +234,7 @@ public: void dkong_init_device_driver_data( ); void braze_decrypt_rom(UINT8 *dest); void drakton_decrypt_rom(UINT8 mod, int offs, int *bs); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/dkong.c -----------*/ diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index 8763c4b350c..0ef6e32f913 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -11,7 +11,8 @@ public: m_bgvideoram(*this, "bgvideoram"), m_spriteram(*this, "spriteram"), m_sharedram(*this, "sharedram"), - m_subcpu(*this, "sub") { } + m_subcpu(*this, "sub") , + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgvideoram; @@ -55,4 +56,5 @@ public: virtual void palette_init(); UINT32 screen_update_dogfgt(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/includes/dooyong.h b/src/mame/includes/dooyong.h index 73a07f9f063..fee0f94d0ab 100644 --- a/src/mame/includes/dooyong.h +++ b/src/mame/includes/dooyong.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_spriteram16(*this, "spriteram16") , m_txvideoram(*this, "txvideoram"), - m_paletteram_flytiger(*this, "flytiger_palram"){ } + m_paletteram_flytiger(*this, "flytiger_palram"), + m_maincpu(*this, "maincpu") { } optional_device<buffered_spriteram8_device> m_spriteram; optional_device<buffered_spriteram16_device> m_spriteram16; @@ -93,4 +94,5 @@ public: void rshark_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_1); DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_2); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index 939bcdb03d3..bd2b1060fb5 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -29,7 +29,8 @@ public: : driver_device(mconfig, type, tag), m_playfield_ram(*this, "playfield_ram"), m_position_ram(*this, "position_ram"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_playfield_ram; @@ -57,6 +58,7 @@ public: UINT32 screen_update_dragrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(dragrace_frame_callback); void dragrace_update_misc_flags( address_space &space ); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/dragrace.c -----------*/ diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index d8ced4200fb..43eb0d4b16c 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -14,7 +14,8 @@ public: m_vidregs2(*this, "vidregs2"), m_spriteram(*this, "spriteram"), m_oki_1(*this, "oki1"), - m_oki_2(*this, "oki2") { } + m_oki_2(*this, "oki2") , + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_vidregs; @@ -69,4 +70,5 @@ public: UINT32 screen_update_drgnmst(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); UINT8 drgnmst_asciitohex( UINT8 data ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index b7ba3c441b6..36ed9646951 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -9,7 +9,8 @@ class drmicro_state : public driver_device { public: drmicro_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") { } /* memory pointers */ UINT8 * m_videoram; @@ -37,4 +38,5 @@ public: UINT32 screen_update_drmicro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(drmicro_interrupt); DECLARE_WRITE_LINE_MEMBER(pcm_w); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h index 96fbb4f5692..9d46f90513d 100644 --- a/src/mame/includes/dynduke.h +++ b/src/mame/includes/dynduke.h @@ -9,7 +9,8 @@ public: m_scroll_ram(*this, "scroll_ram"), m_videoram(*this, "videoram"), m_back_data(*this, "back_data"), - m_fore_data(*this, "fore_data"){ } + m_fore_data(*this, "fore_data"), + m_maincpu(*this, "maincpu") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_scroll_ram; @@ -44,4 +45,5 @@ public: INTERRUPT_GEN_MEMBER(dynduke_interrupt); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri); void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index 5e8db1ba5dc..5b5a023028a 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -9,7 +9,8 @@ class epos_state : public driver_device public: epos_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; @@ -28,4 +29,5 @@ public: DECLARE_MACHINE_START(dealer); UINT32 screen_update_epos(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void get_pens( pen_t *pens ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 0626300d549..365c93eea65 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -14,7 +14,8 @@ public: m_spriteram(*this, "spriteram"), m_workram(*this, "workram"), m_spriteram_2(*this, "spriteram_2"), - m_mcu_ram(*this, "mcu_ram"){ } + m_mcu_ram(*this, "mcu_ram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -118,4 +119,5 @@ public: void equites_update_dac( ); void unpack_block( const char *region, int offset, int size ); void unpack_region( const char *region ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 4b6403ff96b..fe359bb75f3 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -20,8 +20,8 @@ public: m_head_layersize(*this, "head_layersize"), m_headpanic_platform_x(*this, "platform_x"), m_headpanic_platform_y(*this, "platform_y"), - m_sprgen(*this, "spritegen") - { + m_sprgen(*this, "spritegen"), + m_maincpu(*this, "maincpu") { m_tilemap0_color = 0; m_tilemap1_color = 0; } @@ -68,4 +68,5 @@ public: virtual void video_start(); UINT32 screen_update_hedpanic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); static UINT16 hedpanic_pri_callback(UINT16 x); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index 064bbe5c14c..f72afc111e4 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -16,7 +16,8 @@ public: m_colorram(*this, "colorram"), m_nbg_yscroll(*this, "nbg_yscroll"), m_nbg_xscroll(*this, "nbg_xscroll"), - m_bg_scroll(*this, "bg_scroll"){ } + m_bg_scroll(*this, "bg_scroll"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -51,4 +52,5 @@ public: UINT32 screen_update_exedexes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(exedexes_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h index 134edc243a3..5b7ca041bd4 100644 --- a/src/mame/includes/exidy.h +++ b/src/mame/includes/exidy.h @@ -32,7 +32,8 @@ public: m_spriteno(*this, "spriteno"), m_sprite_enable(*this, "sprite_enable"), m_color_latch(*this, "color_latch"), - m_characterram(*this, "characterram"){ } + m_characterram(*this, "characterram"), + m_maincpu(*this, "maincpu") { } UINT8 m_last_dial; required_shared_ptr<UINT8> m_videoram; @@ -78,6 +79,7 @@ public: inline int sprite_1_enabled(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void check_collision(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/exidy.c -----------*/ diff --git a/src/mame/includes/exidy440.h b/src/mame/includes/exidy440.h index 606420e38d3..da5d60fc2e4 100644 --- a/src/mame/includes/exidy440.h +++ b/src/mame/includes/exidy440.h @@ -14,7 +14,8 @@ public: : driver_device(mconfig, type, tag), m_imageram(*this, "imageram"), m_spriteram(*this, "spriteram"), - m_scanline(*this, "scanline"){ } + m_scanline(*this, "scanline"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_imageram; required_shared_ptr<UINT8> m_spriteram; @@ -75,6 +76,7 @@ public: TIMER_CALLBACK_MEMBER(collide_firq_callback); void exidy440_update_firq(); void exidy440_bank_select(UINT8 bank); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h index 54f8f05537c..cf2fb30779b 100644 --- a/src/mame/includes/exterm.h +++ b/src/mame/includes/exterm.h @@ -10,7 +10,8 @@ public: exterm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_master_videoram(*this, "master_videoram"), - m_slave_videoram(*this, "slave_videoram"){ } + m_slave_videoram(*this, "slave_videoram"), + m_maincpu(*this, "maincpu") { } UINT8 m_aimpos[2]; UINT8 m_trackball_old[2]; @@ -37,6 +38,7 @@ public: virtual void palette_init(); TIMER_CALLBACK_MEMBER(sound_delayed_w); TIMER_DEVICE_CALLBACK_MEMBER(master_sound_nmi_callback); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/exterm.c -----------*/ diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 11a383b56b0..b0514de58f5 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -21,8 +21,8 @@ public: m_spr_old(*this, "vsystem_spr_old"), m_spr_old2(*this, "vsystem_spr_ol2"), m_spr(*this, "vsystem_spr"), - m_audiocpu(*this, "audiocpu") - { } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_sharedram; @@ -95,4 +95,5 @@ public: UINT32 screen_update_f1gp2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void f1gpb_draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index 9c967bfa801..c5c6c744814 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -6,7 +6,8 @@ public: fantland_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram", 0), - m_spriteram2(*this, "spriteram2", 0){ } + m_spriteram2(*this, "spriteram2", 0), + m_maincpu(*this, "maincpu") { } /* memory pointers */ // UINT8 * m_spriteram; // currently directly used in a 16bit map... @@ -59,4 +60,5 @@ public: void borntofi_adpcm_start( device_t *device, int voice ); void borntofi_adpcm_stop( device_t *device, int voice ); void borntofi_adpcm_int( device_t *device, int voice ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index 3fdb5186189..09dc06fbdcc 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -15,7 +15,8 @@ public: m_colorram2(*this, "colorram2"), m_videoram2(*this, "videoram2"), m_spriteram(*this, "spriteram"), - m_spriteram_2(*this, "spriteram_2"){ } + m_spriteram_2(*this, "spriteram_2"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_scroll; @@ -55,4 +56,5 @@ public: virtual void palette_init(); UINT32 screen_update_finalizr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(finalizr_scanline); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h index 3e5ee17400b..377f36c6137 100644 --- a/src/mame/includes/firetrk.h +++ b/src/mame/includes/firetrk.h @@ -44,7 +44,8 @@ public: m_drone_x(*this, "drone_x"), m_drone_y(*this, "drone_y"), m_drone_rot(*this, "drone_rot"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } UINT8 m_in_service_mode; UINT32 m_dial[2]; @@ -121,6 +122,7 @@ public: void montecar_draw_car(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element **gfx, int which, int is_collision_detection); void check_collision(firetrk_state *state, int which); void set_service_mode(int enable); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index b83096c6f12..b7ac54ceba0 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -13,7 +13,8 @@ public: m_fof_bak_tileram(*this, "fof_bak_tileram"), m_fof_mid_tileram(*this, "fof_mid_tileram"), m_fof_txt_tileram(*this, "fof_txt_tileram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_fof_100000; @@ -64,4 +65,5 @@ public: UINT32 screen_update_fitfight(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(snd_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int layer ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index bebffe3a5b6..97242128e92 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -10,7 +10,8 @@ public: flkatck_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_k007121_ram(*this, "k007121_ram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_k007121_ram; @@ -42,4 +43,5 @@ public: UINT32 screen_update_flkatck(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(flkatck_interrupt); DECLARE_WRITE8_MEMBER(volume_callback0); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/flower.h b/src/mame/includes/flower.h index ef0e0acc80e..5c4374b7a19 100644 --- a/src/mame/includes/flower.h +++ b/src/mame/includes/flower.h @@ -11,7 +11,8 @@ public: m_bg0ram(*this, "bg0ram"), m_bg1ram(*this, "bg1ram"), m_bg0_scroll(*this, "bg0_scroll"), - m_bg1_scroll(*this, "bg1_scroll"){ } + m_bg1_scroll(*this, "bg1_scroll"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_sn_nmi_enable; required_shared_ptr<UINT8> m_spriteram; @@ -42,6 +43,7 @@ public: virtual void palette_init(); UINT32 screen_update_flower(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/includes/freekick.h b/src/mame/includes/freekick.h index fdccafeecd6..6efb3be4770 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -6,7 +6,8 @@ public: freekick_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -55,4 +56,5 @@ public: void gigas_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void pbillrd_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void freekick_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index e260581956c..994833831dd 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -5,7 +5,8 @@ public: fromanc2_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), - m_subcpu(*this, "sub") { } + m_subcpu(*this, "sub") , + m_maincpu(*this, "maincpu") { } /* memory pointers */ UINT16 *m_paletteram[2]; @@ -116,4 +117,5 @@ public: void fromancr_gfxbank_w( int data ); inline void fromanc4_vram_w( offs_t offset, UINT16 data, UINT16 mem_mask, int layer ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 31197692c8a..f310112d857 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -17,8 +17,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_spr_old(*this, "vsystem_spr_old"), - m_subcpu(*this, "sub") - { } + m_subcpu(*this, "sub"), + m_maincpu(*this, "maincpu") { } /* memory pointers (used by pipedrm) */ optional_shared_ptr<UINT8> m_videoram; @@ -95,4 +95,5 @@ public: inline void get_nekkyoku_tile_info( tile_data &tileinfo, int tile_index, int layer ); void init_common( ); DECLARE_WRITE_LINE_MEMBER(fromance_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index 83808119bdb..a8b5e0a0a2f 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -6,7 +6,8 @@ public: funkybee_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -31,4 +32,5 @@ public: UINT32 screen_update_funkybee(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_columns( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h index 79e954711ed..dd9615f443c 100644 --- a/src/mame/includes/funworld.h +++ b/src/mame/includes/funworld.h @@ -4,7 +4,8 @@ public: funworld_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; @@ -32,4 +33,5 @@ public: DECLARE_PALETTE_INIT(funworld); DECLARE_VIDEO_START(magicrd2); UINT32 screen_update_funworld(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index d71dbda8fdb..1eccc0b818b 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -6,7 +6,8 @@ public: funybubl_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_paletteram(*this, "paletteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -25,4 +26,5 @@ public: virtual void video_start(); UINT32 screen_update_funybubl(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/includes/gaelco.h b/src/mame/includes/gaelco.h index f6f31c5c004..2afab97fb3b 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -13,7 +13,8 @@ public: m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), m_screen(*this, "screen"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -43,4 +44,5 @@ public: UINT32 screen_update_bigkarnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_maniacsq(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/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h index 343069cac44..b1da9fa0bbf 100644 --- a/src/mame/includes/gaelco3d.h +++ b/src/mame/includes/gaelco3d.h @@ -56,7 +56,8 @@ public: m_m68k_ram_base(*this,"m68k_ram_base",0), m_tms_comm_base(*this,"tms_comm_base",0), m_adsp_control_regs(*this,"adsp_regs"), - m_adsp_fastram_base(*this,"adsp_fastram") { } + m_adsp_fastram_base(*this,"adsp_fastram") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_adsp_ram_base; required_shared_ptr<UINT16> m_m68k_ram_base; @@ -120,4 +121,5 @@ public: TIMER_CALLBACK_MEMBER(delayed_sound_w); TIMER_DEVICE_CALLBACK_MEMBER(adsp_autobuffer_irq); void gaelco3d_render(screen_device &screen); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index 0470f8d83c6..b0437842b05 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -15,7 +15,8 @@ public: m_videoram2(*this, "videoram2"), m_videoram3(*this, "videoram3"), m_spriteram(*this, "spriteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -95,4 +96,5 @@ public: void blendbitmaps(bitmap_rgb32 &dest,bitmap_ind16 &src1,bitmap_ind16 &src2,bitmap_ind16 &src3, int sx,int sy,const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h index 232b159a880..d25117334eb 100644 --- a/src/mame/includes/galaga.h +++ b/src/mame/includes/galaga.h @@ -9,8 +9,8 @@ public: m_galaga_ram1(*this, "galaga_ram1"), m_galaga_ram2(*this, "galaga_ram2"), m_galaga_ram3(*this, "galaga_ram3"), - m_galaga_starcontrol(*this, "starcontrol") - { } + m_galaga_starcontrol(*this, "starcontrol"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ optional_shared_ptr<UINT8> m_videoram; @@ -71,6 +71,7 @@ public: }; static struct star m_star_seed_tab[]; + required_device<cpu_device> m_maincpu; }; class xevious_state : public galaga_state diff --git a/src/mame/includes/galastrm.h b/src/mame/includes/galastrm.h index 0629515045b..8dd664f5ff7 100644 --- a/src/mame/includes/galastrm.h +++ b/src/mame/includes/galastrm.h @@ -16,7 +16,8 @@ public: galastrm_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this,"ram"), - m_spriteram(*this,"spriteram") { } + m_spriteram(*this,"spriteram") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_ram; required_shared_ptr<UINT32> m_spriteram; @@ -54,4 +55,5 @@ public: void draw_sprites_pre(int x_offs, int y_offs); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, const int *primasks, int priority); void tc0610_rotate_draw(bitmap_ind16 &bitmap, bitmap_ind16 &srcbitmap, const rectangle &clip); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h index a37d0daba4d..f2fba283d79 100644 --- a/src/mame/includes/galaxian.h +++ b/src/mame/includes/galaxian.h @@ -37,7 +37,8 @@ public: m_ppi8255_1(*this, "ppi8255_1"), m_ppi8255_2(*this, "ppi8255_2"), m_spriteram(*this, "spriteram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } optional_device<i8255_device> m_ppi8255_0; optional_device<i8255_device> m_ppi8255_1; @@ -284,4 +285,5 @@ public: void mshuttle_decode(const UINT8 convtable[8][16]); void common_init(galaxian_draw_bullet_func draw_bullet,galaxian_draw_background_func draw_background, galaxian_extend_tile_info_func extend_tile_info,galaxian_extend_sprite_info_func extend_sprite_info); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h index 08a23e46dcb..070190583bd 100644 --- a/src/mame/includes/galaxold.h +++ b/src/mame/includes/galaxold.h @@ -31,8 +31,8 @@ public: m_attributesram(*this,"attributesram"), m_bulletsram(*this,"bulletsram"), m_rockclim_videoram(*this,"rockclim_vram"), - m_racknrol_tiles_bank(*this,"racknrol_tbank") - { } + m_racknrol_tiles_bank(*this,"racknrol_tbank"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -237,6 +237,7 @@ public: void bagmanmc_modify_spritecode(UINT8 *spriteram, int *code, int *flipx, int *flipy, int offs); void machine_reset_common(int line); UINT8 decode_mooncrst(UINT8 data,offs_t addr); + required_device<cpu_device> m_maincpu; }; #define galaxold_coin_counter_0_w galaxold_coin_counter_w diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 8f92cfc9f63..a4de39fa5de 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -10,7 +10,8 @@ public: galivan_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -59,4 +60,5 @@ public: UINT32 screen_update_galivan(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_ninjemak(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/includes/galspnbl.h b/src/mame/includes/galspnbl.h index dc22dfa82f2..81b92c09947 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -17,7 +17,8 @@ public: m_videoram(*this, "videoram"), m_bgvideoram(*this, "bgvideoram"), m_scroll(*this, "scroll"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_spriteram; @@ -35,4 +36,5 @@ public: UINT32 screen_update_galspnbl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h index 5c70100ca3b..1498db3fcac 100644 --- a/src/mame/includes/gaplus.h +++ b/src/mame/includes/gaplus.h @@ -13,7 +13,8 @@ public: : driver_device(mconfig, type, tag), m_customio_3(*this,"customio_3"), m_videoram(*this,"videoram"), - m_spriteram(*this,"spriteram") { } + m_spriteram(*this,"spriteram") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_customio_3; required_shared_ptr<UINT8> m_videoram; @@ -54,4 +55,5 @@ public: void starfield_init(); void starfield_render(bitmap_ind16 &bitmap); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h index ee89d4d81f6..f14d2f56465 100644 --- a/src/mame/includes/gatron.h +++ b/src/mame/includes/gatron.h @@ -3,7 +3,8 @@ class gatron_state : public driver_device public: gatron_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; @@ -14,4 +15,5 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_gat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index 16012e75e26..45151291634 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -17,7 +17,8 @@ public: m_spriteram(*this, "spriteram"), m_scrollram(*this, "scrollram"), m_soundlatch(*this, "soundlatch"), - m_sn(*this, "snsnd") { } + m_sn(*this, "snsnd") , + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -60,4 +61,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(gberet_interrupt_tick); void gberet_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void gberetb_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index 6c7ab9053e2..81aed6b9a0c 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -13,7 +13,8 @@ public: m_spriteram(*this, "spriteram"), m_vregs(*this, "vregs"), m_fgram(*this, "fgram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_txtram; @@ -48,4 +49,5 @@ public: virtual void video_start(); UINT32 screen_update_ginganin(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/includes/gladiatr.h b/src/mame/includes/gladiatr.h index 49610a2f382..06204f4d713 100644 --- a/src/mame/includes/gladiatr.h +++ b/src/mame/includes/gladiatr.h @@ -7,7 +7,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_textram(*this, "textram"){ } + m_textram(*this, "textram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_spriteram; @@ -69,4 +70,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void swap_block(UINT8 *src1,UINT8 *src2,int len); DECLARE_WRITE_LINE_MEMBER(gladiator_ym_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index dd8713aed2b..4177bf3f7a5 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -12,8 +12,8 @@ public: m_videoram(*this, "videoram"), m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), - m_mainram(*this, "mainram") - { } + m_mainram(*this, "mainram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_videoram; @@ -50,4 +50,5 @@ public: INTERRUPT_GEN_MEMBER(glass_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void glass_ROM16_split_gfx( const char *src_reg, const char *dst_reg, int start, int length, int dest1, int dest2 ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index 424acfdc98e..a7145a36584 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -13,7 +13,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_fgvideoram(*this, "fgvideoram"), - m_bgvideoram(*this, "bgvideoram"){ } + m_bgvideoram(*this, "bgvideoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -44,4 +45,5 @@ public: virtual void video_start(); UINT32 screen_update_gng(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/includes/goal92.h b/src/mame/includes/goal92.h index 838e8e126e6..da50b6dbd3e 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -14,7 +14,8 @@ public: m_tx_data(*this, "tx_data"), m_spriteram(*this, "spriteram"), m_scrollram(*this, "scrollram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_data; @@ -57,4 +58,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(goal92_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index 3d35b8ba8da..c24db97e318 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -15,7 +15,8 @@ public: m_spriteram(*this, "spriteram"), m_bg_videoram(*this, "bg_videoram"), m_spriteram2(*this, "spriteram2"), - m_fg_videoram(*this, "fg_videoram"){ } + m_fg_videoram(*this, "fg_videoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_ram; @@ -49,4 +50,5 @@ public: virtual void video_start(); UINT32 screen_update_goindol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int gfxbank, UINT8 *sprite_ram ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index aa7ea0242d0..1b6093a6fc0 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -13,7 +13,8 @@ public: m_reel3_scroll(*this, "reel3_scroll"), m_reel1_attrram(*this, "reel1_attrram"), m_reel2_attrram(*this, "reel2_attrram"), - m_reel3_attrram(*this, "reel3_attrram"){ } + m_reel3_attrram(*this, "reel3_attrram"), + m_maincpu(*this, "maincpu") { } int m_dataoffset; @@ -154,4 +155,5 @@ public: void dump_to_file( UINT8* ROM); UINT8 decrypt(UINT8 cipherText, UINT16 address); UINT8 chry10_decrypt(UINT8 cipherText); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h index 8cacd9612d8..eff633f6508 100644 --- a/src/mame/includes/gomoku.h +++ b/src/mame/includes/gomoku.h @@ -6,7 +6,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_bgram(*this, "bgram"){ } + m_bgram(*this, "bgram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_colorram; @@ -25,6 +26,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_gomoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index 83fe195fa6f..fe7d645ca1b 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -15,8 +15,8 @@ public: m_bgvideoram(*this, "bgvideoram"), m_spriteram(*this, "spriteram"), m_sprgen(*this, "spritegen"), - m_audiocpu(*this, "audiocpu") - { } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_fgvideoram; @@ -49,4 +49,5 @@ public: virtual void video_start(); UINT32 screen_update_gotcha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); inline void get_tile_info( tile_data &tileinfo, int tile_index ,UINT16 *vram, int color_offs); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index f752fd6f825..3e8b65438ec 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -9,7 +9,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_scroll; @@ -41,4 +42,5 @@ public: void draw_status_row( bitmap_ind16 &bitmap, const rectangle &cliprect, int sx, int col ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_status( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index 92cbe72d2b9..a0e4d517b61 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -16,7 +16,8 @@ public: m_spriteram(*this, "spriteram"), m_leftram(*this, "leftram"), m_rightram(*this, "rightram"), - m_centerram(*this, "centerram"){ } + m_centerram(*this, "centerram"), + m_maincpu(*this, "maincpu") { } UINT8 m_cpu0_out[16]; UINT8 m_cpu1_out[16]; @@ -76,6 +77,7 @@ public: INTERRUPT_GEN_MEMBER(grchamp_cpu1_interrupt); TIMER_CALLBACK_MEMBER(main_to_sub_comm_sync_w); void draw_objects(int y, UINT8 *objdata); + required_device<cpu_device> m_maincpu; }; /* Discrete Sound Input Nodes */ diff --git a/src/mame/includes/groundfx.h b/src/mame/includes/groundfx.h index f17d9a895ab..3ac782f1b28 100644 --- a/src/mame/includes/groundfx.h +++ b/src/mame/includes/groundfx.h @@ -14,7 +14,8 @@ public: groundfx_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this,"ram"), - m_spriteram(*this,"spriteram") { } + m_spriteram(*this,"spriteram") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_ram; required_shared_ptr<UINT32> m_spriteram; @@ -41,4 +42,5 @@ public: INTERRUPT_GEN_MEMBER(groundfx_interrupt); TIMER_CALLBACK_MEMBER(groundfx_interrupt5); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int do_hack,int x_offs,int y_offs); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h index bddc367c63e..ccf760d8c0c 100644 --- a/src/mame/includes/gstriker.h +++ b/src/mame/includes/gstriker.h @@ -43,8 +43,8 @@ public: m_VS920A_vram(*this, "vs920a_vram"), m_work_ram(*this, "work_ram"), m_lineram(*this, "lineram"), - m_spr(*this, "vsystem_spr") - { } + m_spr(*this, "vsystem_spr"), + m_maincpu(*this, "maincpu") { } virtual void machine_start() { @@ -111,6 +111,7 @@ public: tilemap_t* MB60553_get_tilemap(int numchip); void mcu_init( ); DECLARE_WRITE_LINE_MEMBER(gs_ym2610_irq); + required_device<cpu_device> m_maincpu; }; #endif diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h index 37c70b9aa95..691716bef05 100644 --- a/src/mame/includes/gsword.h +++ b/src/mame/includes/gsword.h @@ -7,7 +7,8 @@ public: m_spritexy_ram(*this, "spritexy_ram"), m_spriteattrib_ram(*this, "spriteattram"), m_videoram(*this, "videoram"), - m_cpu2_ram(*this, "cpu2_ram"){ } + m_cpu2_ram(*this, "cpu2_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spritetile_ram; required_shared_ptr<UINT8> m_spritexy_ram; @@ -49,4 +50,5 @@ public: INTERRUPT_GEN_MEMBER(gsword_snd_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); int gsword_coins_in(void); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index 79b3f180f4e..18508398713 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -10,7 +10,8 @@ public: gumbo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), - m_fg_videoram(*this, "fg_videoram"){ } + m_fg_videoram(*this, "fg_videoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -26,4 +27,5 @@ public: TILE_GET_INFO_MEMBER(get_gumbo_fg_tile_info); virtual void video_start(); UINT32 screen_update_gumbo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index fdde0725a2b..274ac6b7d84 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -12,7 +12,8 @@ public: m_paletteram(*this, "paletteram"), m_bg_videoram(*this, "bg_videoram"), m_fg_videoram(*this, "fg_videoram"), - m_rambase(*this, "rambase"){ } + m_rambase(*this, "rambase"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -44,4 +45,5 @@ public: UINT32 screen_update_gundealr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(gundealr_scanline); TIMER_DEVICE_CALLBACK_MEMBER(yamyam_mcu_sim); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index dfbd2cd6b64..140ffdb8f3d 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -13,7 +13,8 @@ public: m_colorram(*this, "colorram"), m_scrollx(*this, "scrollx"), m_scrolly(*this, "scrolly"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -42,4 +43,5 @@ public: virtual void palette_init(); UINT32 screen_update_gunsmoke(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/includes/hanaawas.h b/src/mame/includes/hanaawas.h index 9aeeba0ca8a..64f359ec216 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -10,7 +10,8 @@ public: hanaawas_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -32,4 +33,5 @@ public: virtual void palette_init(); UINT32 screen_update_hanaawas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER(hanaawas_portB_w); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index e388a52fb40..98af52633bd 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -16,7 +16,8 @@ public: m_paletteram(*this, "paletteram"), m_pf1_videoram(*this, "pf1_videoram"), m_pf2_videoram(*this, "pf2_videoram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } required_device<buffered_spriteram8_device> m_spriteram; required_device<buffered_spriteram8_device> m_spriteram2; @@ -61,4 +62,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *sbank, int bank ); DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE8_MEMBER(volume_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h index a09e900c675..5c81cc72ac9 100644 --- a/src/mame/includes/hexion.h +++ b/src/mame/includes/hexion.h @@ -2,7 +2,8 @@ class hexion_state : public driver_device { public: hexion_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_vram[2]; UINT8 *m_unkram; @@ -25,4 +26,5 @@ public: UINT32 screen_update_hexion(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(hexion_scanline); inline void get_tile_info(tile_data &tileinfo,int tile_index,UINT8 *ram); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 4615b638653..8894ef865ee 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -11,7 +11,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; @@ -29,4 +30,5 @@ public: UINT32 screen_update_higemaru(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(higemaru_scanline); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 97be2bb78b1..44dc39e290a 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_bg_ram(*this, "bg_ram"), m_spriteram(*this, "spriteram"), - m_subcpu(*this, "sub"){ } + m_subcpu(*this, "sub"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_bg_ram; @@ -36,4 +37,5 @@ public: virtual void video_start(); UINT32 screen_update_himesiki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void himesiki_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index 87c5919037a..25471a8e185 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -17,7 +17,8 @@ class hitme_state : public driver_device public: hitme_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; @@ -43,6 +44,7 @@ public: UINT32 screen_update_barricad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT8 read_port_and_t0( int port ); UINT8 read_port_and_t0_and_hblank( int port ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index 0f4f6c87842..c63db8ed5b9 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -8,7 +8,8 @@ class hnayayoi_state : public driver_device { public: hnayayoi_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 */ UINT8 *m_pixmap[8]; @@ -41,4 +42,5 @@ public: void copy_pixel( int x, int y, int pen ); void draw_layer_interleaved( bitmap_ind16 &bitmap, const rectangle &cliprect, int left_pixmap, int right_pixmap, int palbase, int transp ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index acbc3d7cff1..e96b7b7f1c9 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -11,7 +11,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; @@ -35,4 +36,5 @@ public: UINT32 screen_update_crzrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void holeland_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void crzrally_draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h index 37b75529c76..3d27706e1e6 100644 --- a/src/mame/includes/hyhoo.h +++ b/src/mame/includes/hyhoo.h @@ -3,7 +3,8 @@ class hyhoo_state : public driver_device public: hyhoo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_clut(*this, "clut"){ } + m_clut(*this, "clut"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_clut; int m_blitter_destx; @@ -26,4 +27,5 @@ public: UINT32 screen_update_hyhoo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(blitter_timer_callback); void hyhoo_gfxdraw(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h index 2e7cd89c3ad..88d6f87c680 100644 --- a/src/mame/includes/hyperspt.h +++ b/src/mame/includes/hyperspt.h @@ -10,8 +10,8 @@ public: m_scroll(*this, "scroll"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_sn(*this, "snsnd") - { } + m_sn(*this, "snsnd"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -45,4 +45,5 @@ public: UINT32 screen_update_hyperspt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); 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/includes/inufuku.h b/src/mame/includes/inufuku.h index 1a5ef6c82ab..907c0b1dde6 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -10,8 +10,8 @@ public: m_spriteram1(*this, "spriteram1"), m_spriteram2(*this, "spriteram2"), m_spr(*this, "vsystem_spr"), - m_audiocpu(*this, "audiocpu") - { } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_bg_videoram; @@ -58,4 +58,5 @@ public: UINT32 screen_update_inufuku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_inufuku(screen_device &screen, bool state); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h index 09926f58cd8..5ad1116ad1c 100644 --- a/src/mame/includes/irobot.h +++ b/src/mame/includes/irobot.h @@ -27,7 +27,8 @@ public: irobot_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_nvram(*this, "nvram") , - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_videoram; @@ -91,4 +92,5 @@ public: void irmb_dout(const irmb_ops *curop, UINT32 d); void load_oproms(); void irmb_run(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/itech32.h b/src/mame/includes/itech32.h index e420fd05f11..93363c8984d 100644 --- a/src/mame/includes/itech32.h +++ b/src/mame/includes/itech32.h @@ -26,7 +26,8 @@ public: m_drivedge_zbuf_control(*this, "drivedge_zctl"), m_tms1_boot(*this, "tms1_boot"), m_tms1_ram(*this, "tms1_ram"), - m_tms2_ram(*this, "tms2_ram"){ } + m_tms2_ram(*this, "tms2_ram"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT16> m_main_ram; optional_shared_ptr<UINT16> m_nvram; @@ -183,4 +184,5 @@ public: void init_shuffle_bowl_common(int prot_addr); void install_timekeeper(); void init_gt_common(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index 86f1e1bfb9b..b047208dbd0 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -16,7 +16,8 @@ public: itech8_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_tlc34076(*this, "tlc34076"), - m_visarea(0, 0, 0, 0){ } + m_visarea(0, 0, 0, 0), + m_maincpu(*this, "maincpu") { } required_device<tlc34076_device> m_tlc34076; @@ -132,4 +133,5 @@ public: UINT16 *sens0, UINT16 *sens1, UINT16 *sens2, UINT16 *sens3); void compute_sensors(); TIMER_CALLBACK_MEMBER( delayed_z80_control_w ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h index 362d4d48032..ec0e32ff1ec 100644 --- a/src/mame/includes/jaguar.h +++ b/src/mame/includes/jaguar.h @@ -51,7 +51,8 @@ public: m_main_gpu_wait(NULL), m_joystick_data(0), m_eeprom_bit_count(0), - m_protection_check(0) { } + m_protection_check(0) , + m_maincpu(*this, "maincpu") { } // devices required_device<cpu_device> m_main_cpu; @@ -314,4 +315,5 @@ protected: emu_file *jaguar_nvram_fopen( UINT32 openflags); void jaguar_nvram_load(); void jaguar_nvram_save(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 258e0a71e2d..5223ee5e7e7 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -16,7 +16,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_scroll_x(*this, "scroll_x"), - m_scroll_dir(*this, "scroll_dir"){ } + m_scroll_dir(*this, "scroll_dir"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -46,4 +47,5 @@ public: INTERRUPT_GEN_MEMBER(jb_interrupt); INTERRUPT_GEN_MEMBER(jb_interrupt_nmi); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index 6755839a6be..4a8f686f023 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -28,7 +28,8 @@ public: m_spriteram(*this, "spriteram"), m_smoothing_table(*this, "smoothing_table"), m_audio_comm_stat(*this, "audio_comm_stat"), - m_speech_data(*this, "speech_data") { } + m_speech_data(*this, "speech_data") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_nvram; @@ -82,6 +83,7 @@ public: void do_pen_lookup(bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_background_and_text(bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/jedi.c -----------*/ diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h index 988cec04d00..4edc883c5fb 100644 --- a/src/mame/includes/jpmimpct.h +++ b/src/mame/includes/jpmimpct.h @@ -57,7 +57,8 @@ public: jpmimpct_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_vfd(*this, "vfd"), - m_vram(*this, "vram") { } + m_vram(*this, "vram") , + m_maincpu(*this, "maincpu") { } UINT8 m_tms_irq; UINT8 m_duart_1_irq; @@ -111,6 +112,7 @@ public: DECLARE_MACHINE_RESET(impctawp); TIMER_DEVICE_CALLBACK_MEMBER(duart_1_timer_event); void update_irqs(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h index c16d1d4fbab..e703b9e5af5 100644 --- a/src/mame/includes/jpmsys5.h +++ b/src/mame/includes/jpmsys5.h @@ -15,8 +15,8 @@ class jpmsys5_state : public driver_device public: jpmsys5_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") { } UINT8 m_palette[16][3]; int m_pal_addr; @@ -74,4 +74,5 @@ public: DECLARE_MACHINE_RESET(jpmsys5); UINT32 screen_update_jpmsys5v(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(touch_cb); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index 2e7f993a8ea..a79ff16b748 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -11,7 +11,8 @@ class kangaroo_state : public driver_device public: kangaroo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_video_control(*this, "video_control"){ } + m_video_control(*this, "video_control"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_video_control; @@ -33,4 +34,5 @@ public: UINT32 screen_update_kangaroo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void videoram_write( UINT16 offset, UINT8 data, UINT8 mask ); void blitter_execute( ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index db58c6c895a..d7f56fd06ec 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -57,4 +58,5 @@ public: void kchampvs_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); UINT8 *decrypt_code(); DECLARE_WRITE_LINE_MEMBER(msmint); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index fff205a98fe..97742b127e4 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -18,7 +18,8 @@ public: m_scrram(*this, "scrram"), m_spriteram(*this, "spriteram"), m_adpcm(*this, "oki"), - m_eeprom(*this, "eeprom") { } + m_eeprom(*this, "eeprom") , + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_fgram; @@ -78,4 +79,5 @@ public: INTERRUPT_GEN_MEMBER(kickgoal_interrupt); void kickgoal_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void kickgoal_play(okim6295_device *oki, int melody, int data); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index 2550057b071..ad2ae3659a2 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -14,7 +14,8 @@ public: m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_scroll_y; @@ -64,4 +65,5 @@ public: void ringking_get_rgb_data( const UINT8 *color_prom, int i, int *r_data, int *g_data, int *b_data ); void kingofb_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void ringking_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index dc21000d9f7..deed0ec5266 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_scrollregs(*this, "scrollregs"), m_spriteram(*this, "spriteram"), - m_soundcpu(*this, "soundcpu"){ } + m_soundcpu(*this, "soundcpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -49,4 +50,5 @@ public: UINT32 screen_update_kncljoe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(sound_nmi); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index 781447b17d7..c667347522b 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -10,7 +10,8 @@ public: ksayakyu_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -41,4 +42,5 @@ public: virtual void palette_init(); UINT32 screen_update_ksayakyu(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/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index ddeebb0799e..518a157f22a 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_scrlram(*this, "scrlram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -62,4 +63,5 @@ public: UINT32 screen_update_ladyfrog(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(nmi_callback); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h index d725693f9c0..e46dcf7d307 100644 --- a/src/mame/includes/legionna.h +++ b/src/mame/includes/legionna.h @@ -7,7 +7,8 @@ public: m_back_data(*this, "back_data"), m_fore_data(*this, "fore_data"), m_mid_data(*this, "mid_data"), - m_textram(*this, "textram"){ } + m_textram(*this, "textram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_back_data; @@ -54,6 +55,7 @@ public: UINT32 screen_update_grainbow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void descramble_legionnaire_gfx(UINT8* src); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/legionna.c -----------*/ diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index bd3e1551389..091eb663444 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -16,8 +16,8 @@ public: m_pixel_0_data(*this, "pixel_0_data"), m_pixel_1_data(*this, "pixel_1_data"), m_sprgen(*this, "spritegen"), - m_sprgen2(*this, "spritegen2") - { } + m_sprgen2(*this, "spritegen2"), + m_maincpu(*this, "maincpu") { } /* video-related */ bitmap_ind16 m_bitmap0; @@ -53,4 +53,5 @@ public: UINT32 screen_update_lemmings(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void screen_eof_lemmings(screen_device &screen, bool state); void lemmings_copy_bitmap(bitmap_rgb32& bitmap, bitmap_ind16& srcbitmap, int* xscroll, int* yscroll, const rectangle& cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/lethalj.h b/src/mame/includes/lethalj.h index 6bb8e918a15..8b623dc8439 100644 --- a/src/mame/includes/lethalj.h +++ b/src/mame/includes/lethalj.h @@ -8,7 +8,8 @@ class lethalj_state : public driver_device { public: lethalj_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_blitter_data[8]; UINT16 *m_screenram; @@ -31,6 +32,7 @@ public: virtual void video_start(); TIMER_CALLBACK_MEMBER(gen_ext1_int); inline void get_crosshair_xy(int player, int *x, int *y); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/lethalj.c -----------*/ diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 9046cf9de49..a20f6435bac 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -20,7 +20,8 @@ public: m_spriteram(*this, "spriteram"), m_vram(*this, "vram"), m_scroll_x(*this, "scroll_x"), - m_scroll_y(*this, "scroll_y") { } + m_scroll_y(*this, "scroll_y") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_priority_ram; required_shared_ptr<UINT16> m_scrollram; @@ -74,6 +75,7 @@ public: void lordgun_update_gun(int i); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(soundirq); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/lordgun.c -----------*/ diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h index 225e30002e7..5d3f3f69b1d 100644 --- a/src/mame/includes/lucky74.h +++ b/src/mame/includes/lucky74.h @@ -6,7 +6,8 @@ public: m_fg_videoram(*this, "fg_videoram"), m_fg_colorram(*this, "fg_colorram"), m_bg_videoram(*this, "bg_videoram"), - m_bg_colorram(*this, "bg_colorram"){ } + m_bg_colorram(*this, "bg_colorram"), + m_maincpu(*this, "maincpu") { } UINT8 m_ym2149_portb; UINT8 m_usart_8251; @@ -42,4 +43,5 @@ public: UINT32 screen_update_lucky74(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(nmi_interrupt); DECLARE_WRITE_LINE_MEMBER(lucky74_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h index 1706f35b9f9..10386d52e82 100644 --- a/src/mame/includes/lvcards.h +++ b/src/mame/includes/lvcards.h @@ -4,7 +4,8 @@ public: lvcards_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_payout; UINT8 m_pulse; @@ -24,4 +25,5 @@ public: DECLARE_MACHINE_RESET(lvpoker); DECLARE_PALETTE_INIT(ponttehk); UINT32 screen_update_lvcards(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 2fdf6290a25..bcf549266ca 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -8,7 +8,8 @@ public: m_spriteram(*this, "spriteram") , m_fgvideoram(*this, "fgvideoram"), m_bg1videoram(*this, "bg1videoram"), - m_soundlatch2(*this, "soundlatch2"){ } + m_soundlatch2(*this, "soundlatch2"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_device<buffered_spriteram8_device> m_spriteram; @@ -66,4 +67,5 @@ public: void lwings_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); void trojan_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); int avengers_fetch_paldata( ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h index 416b3b3756b..147c77933a8 100644 --- a/src/mame/includes/m52.h +++ b/src/mame/includes/m52.h @@ -5,7 +5,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; @@ -36,4 +37,5 @@ public: virtual void palette_init(); UINT32 screen_update_m52(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int xpos, int ypos, int image); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h index f53ecef0d6d..5666051c32d 100644 --- a/src/mame/includes/m57.h +++ b/src/mame/includes/m57.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_scrollram(*this, "scrollram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -23,4 +24,5 @@ public: UINT32 screen_update_m57(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background(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/includes/m58.h b/src/mame/includes/m58.h index dc86c89cbba..2617eb7763b 100644 --- a/src/mame/includes/m58.h +++ b/src/mame/includes/m58.h @@ -8,7 +8,8 @@ public: m_yard_scroll_x_low(*this, "scroll_x_low"), m_yard_scroll_x_high(*this, "scroll_x_high"), m_yard_scroll_y_low(*this, "scroll_y_low"), - m_yard_score_panel_disabled(*this, "score_disable"){ } + m_yard_score_panel_disabled(*this, "score_disable"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -33,4 +34,5 @@ public: UINT32 screen_update_yard(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_panel( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index c472fc10fb3..1ae491cdee5 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -6,7 +6,8 @@ public: m_spriteram(*this, "spriteram"), m_m62_tileram(*this, "m62_tileram"), m_m62_textram(*this, "m62_textram"), - m_scrollram(*this, "scrollram"){ } + m_scrollram(*this, "scrollram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -111,4 +112,5 @@ public: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int colormask, int prioritymask, int priority ); void m62_start( tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ); void m62_textlayer( tilemap_get_info_delegate tile_get_info, int rows, int cols, int x1, int y1, int x2, int y2 ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h index 351e14f4cdc..6b5be293904 100644 --- a/src/mame/includes/m72.h +++ b/src/mame/includes/m72.h @@ -14,7 +14,8 @@ public: m_videoram2(*this, "videoram2"), m_majtitle_rowscrollram(*this, "majtitle_rowscr"), m_spriteram2(*this, "spriteram2"), - m_soundram(*this, "soundram"){ } + m_soundram(*this, "soundram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_videoram1; @@ -132,4 +133,5 @@ public: int find_sample(int num); void copy_le(UINT16 *dest, const UINT8 *src, UINT8 bytes); void install_protection_handler(const UINT8 *code,const UINT8 *crc); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/m79amb.h b/src/mame/includes/m79amb.h index 059cbd66d6a..076c71d07d5 100644 --- a/src/mame/includes/m79amb.h +++ b/src/mame/includes/m79amb.h @@ -7,7 +7,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_mask(*this, "mask"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -27,6 +28,7 @@ public: INTERRUPT_GEN_MEMBER(m79amb_interrupt); DECLARE_WRITE8_MEMBER(m79amb_8000_w); DECLARE_WRITE8_MEMBER(m79amb_8003_w); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/m79amb.c -----------*/ diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h index 7daa8e11cc9..0c71d2a8336 100644 --- a/src/mame/includes/m90.h +++ b/src/mame/includes/m90.h @@ -4,7 +4,8 @@ public: m90_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_data(*this, "video_data"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_video_data; optional_shared_ptr<UINT16> m_spriteram; @@ -55,4 +56,5 @@ public: void bomblord_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void dynablsb_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void markdirty(tilemap_t *tmap,int page,offs_t offset); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h index 8a2ced3495d..f39b73df1f1 100644 --- a/src/mame/includes/madalien.h +++ b/src/mame/includes/madalien.h @@ -26,7 +26,8 @@ public: m_headlight_pos(*this, "headlight_pos"), m_edge1_pos(*this, "edge1_pos"), m_edge2_pos(*this, "edge2_pos"), - m_scroll(*this, "scroll"){ } + m_scroll(*this, "scroll"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_charram; @@ -68,6 +69,7 @@ public: void draw_headlight(bitmap_ind16 &bitmap, const rectangle &cliprect, int flip); void draw_foreground(bitmap_ind16 &bitmap, const rectangle &cliprect, int flip); inline UINT8 shift_common(UINT8 hi, UINT8 lo); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/madalien.c -----------*/ diff --git a/src/mame/includes/magmax.h b/src/mame/includes/magmax.h index 69447500efa..38c6b991259 100644 --- a/src/mame/includes/magmax.h +++ b/src/mame/includes/magmax.h @@ -7,7 +7,8 @@ public: m_spriteram(*this, "spriteram"), m_vreg(*this, "vreg"), m_scroll_x(*this, "scroll_x"), - m_scroll_y(*this, "scroll_y"){ } + m_scroll_y(*this, "scroll_y"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_spriteram; @@ -35,4 +36,5 @@ public: virtual void palette_init(); UINT32 screen_update_magmax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(scanline_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h index ae8d8eb34df..bb7bb482322 100644 --- a/src/mame/includes/mainsnk.h +++ b/src/mame/includes/mainsnk.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_bgram(*this, "bgram"), m_spriteram(*this, "spriteram"), - m_fgram(*this, "fgram"){ } + m_fgram(*this, "fgram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_tx_tilemap; tilemap_t *m_bg_tilemap; @@ -29,4 +30,5 @@ public: virtual void palette_init(); UINT32 screen_update_mainsnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int scrollx, int scrolly ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index b51ee8c27a8..076ae4f75a6 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -12,8 +12,8 @@ public: malzak_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_trom(*this, "saa5050"), - m_videoram(*this, "videoram") - { } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_device<saa5050_device> m_trom; required_shared_ptr<UINT8> m_videoram; @@ -43,4 +43,5 @@ public: virtual void machine_reset(); virtual void palette_init(); UINT32 screen_update_malzak(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index 69355887d0c..8056ac6bc52 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -4,7 +4,8 @@ public: mappy_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; required_shared_ptr<UINT8> m_spriteram; @@ -64,4 +65,5 @@ public: TIMER_CALLBACK_MEMBER(mappy_io_run); void mappy_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *spriteram_base); void phozon_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *spriteram_base); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index c5fb908ed48..153ccba8bab 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -39,7 +39,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ @@ -91,6 +92,7 @@ public: DECLARE_WRITE8_MEMBER(mario_sh1_w); DECLARE_WRITE8_MEMBER(mario_sh2_w); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/mario.c -----------*/ diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index b55c31403c4..5ba74c740f4 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_xscroll(*this, "xscroll"){ } + m_xscroll(*this, "xscroll"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -28,4 +29,5 @@ public: virtual void palette_init(); UINT32 screen_update_markham(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/includes/maygay1b.h b/src/mame/includes/maygay1b.h index e11c392b577..e94d959d71f 100644 --- a/src/mame/includes/maygay1b.h +++ b/src/mame/includes/maygay1b.h @@ -41,8 +41,8 @@ class maygay1b_state : public driver_device public: maygay1b_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") { m_NMIENABLE = 0; } @@ -83,4 +83,5 @@ public: virtual void machine_reset(); void update_outputs(i8279_state *chip, UINT16 which); void m1_stepper_reset(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h index 736a4b35813..6cfa5999f9b 100644 --- a/src/mame/includes/mcr68.h +++ b/src/mame/includes/mcr68.h @@ -22,7 +22,8 @@ public: m_turbo_chip_squeak(*this, "tcs"), m_cvsd_sound(*this, "cvsd"), m_videoram(*this, "videoram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") , + m_maincpu(*this, "maincpu") { } optional_device<midway_chip_squeak_deluxe_device> m_chip_squeak_deluxe; optional_device<midway_sounds_good_device> m_sounds_good; @@ -116,6 +117,7 @@ public: inline void update_interrupts(); void subtract_from_counter(int counter, int count); void mcr68_common_init(int clip, int xoffset); + required_device<cpu_device> m_maincpu; }; /*----------- defined in machine/mcr68.c -----------*/ diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h index 2aa463548d6..fb45ae515c2 100644 --- a/src/mame/includes/meadows.h +++ b/src/mame/includes/meadows.h @@ -12,7 +12,8 @@ public: meadows_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -50,6 +51,7 @@ public: INTERRUPT_GEN_MEMBER(minferno_interrupt); INTERRUPT_GEN_MEMBER(audio_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index 7e0a4d704d2..4331f428321 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -19,8 +19,8 @@ public: : driver_device(mconfig, type, tag), m_shared_ram(*this, "shared_ram"), m_mac_sram(*this, "mac_sram"), - m_micro3d_sprite_vram(*this, "sprite_vram") - { } + m_micro3d_sprite_vram(*this, "sprite_vram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_shared_ram; device_t *m_duart68681; @@ -120,6 +120,7 @@ public: DECLARE_WRITE8_MEMBER(micro3d_upd7759_w); DECLARE_WRITE8_MEMBER(data_from_i8031); DECLARE_READ8_MEMBER(data_to_i8031); + required_device<cpu_device> m_maincpu; }; struct micro3d_vtx diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h index abbcbae26d6..b784eeee4aa 100644 --- a/src/mame/includes/midtunit.h +++ b/src/mame/includes/midtunit.h @@ -15,7 +15,8 @@ public: m_nvram(*this, "nvram"), m_gfxrom(*this, "gfxrom"), m_cvsd_sound(*this, "cvsd"), - m_adpcm_sound(*this, "adpcm") { } + m_adpcm_sound(*this, "adpcm") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_nvram; required_memory_region m_gfxrom; @@ -66,6 +67,7 @@ public: DECLARE_MACHINE_RESET(midtunit); DECLARE_VIDEO_START(midtunit); TIMER_CALLBACK_MEMBER(dma_callback); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/midtunit.c -----------*/ extern UINT8 midtunit_gfx_rom_large; diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h index 92c90584a29..a51710158fb 100644 --- a/src/mame/includes/midvunit.h +++ b/src/mame/includes/midvunit.h @@ -45,7 +45,8 @@ public: m_tms32031_control(*this, "32031_control"), m_midvplus_misc(*this, "midvplus_misc"), m_videoram(*this, "videoram", 32), - m_textureram(*this, "textureram") { } + m_textureram(*this, "textureram") , + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT32> m_nvram; required_shared_ptr<UINT32> m_ram_base; @@ -122,4 +123,5 @@ public: UINT32 screen_update_midvunit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(adc_ready); TIMER_CALLBACK_MEMBER(scanline_timer_cb); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h index 635fac5ff49..2388c840794 100644 --- a/src/mame/includes/midyunit.h +++ b/src/mame/includes/midyunit.h @@ -36,7 +36,8 @@ public: m_narc_sound(*this, "narcsnd"), m_cvsd_sound(*this, "cvsd"), m_adpcm_sound(*this, "adpcm"), - m_gfx_rom(*this, "gfx_rom", 16) { } + m_gfx_rom(*this, "gfx_rom", 16) , + m_maincpu(*this, "maincpu") { } optional_device<williams_narc_sound_device> m_narc_sound; optional_device<williams_cvsd_sound_device> m_cvsd_sound; @@ -109,6 +110,7 @@ public: DECLARE_VIDEO_START(common); TIMER_CALLBACK_MEMBER(dma_callback); TIMER_CALLBACK_MEMBER(autoerase_line); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/midyunit.c -----------*/ void midyunit_to_shiftreg(address_space &space, UINT32 address, UINT16 *shiftreg); diff --git a/src/mame/includes/midzeus.h b/src/mame/includes/midzeus.h index f14a8ed7289..8ef7d85e372 100644 --- a/src/mame/includes/midzeus.h +++ b/src/mame/includes/midzeus.h @@ -15,7 +15,8 @@ public: m_ram_base(*this, "ram_base"), m_linkram(*this, "linkram"), m_tms32031_control(*this, "tms32031_ctl"), - m_zeusbase(*this, "zeusbase") { } + m_zeusbase(*this, "zeusbase") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_nvram; required_shared_ptr<UINT32> m_ram_base; @@ -63,6 +64,7 @@ public: TIMER_CALLBACK_MEMBER(invasn_gun_callback); void exit_handler(); void exit_handler2(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/midzeus2.c -----------*/ diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index 4f172bc82d6..397b0ee774c 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -7,7 +7,8 @@ public: m_spriteram1(*this, "spriteram1"), m_spriteram2(*this, "spriteram2"), m_spriteram3(*this, "spriteram3"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_nvram; required_shared_ptr<UINT8> m_spriteram1; @@ -31,4 +32,5 @@ public: UINT32 screen_update_mjkjidai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); 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/includes/momoko.h b/src/mame/includes/momoko.h index c11f004f2f7..183a0252574 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), m_bg_scrolly(*this, "bg_scrolly"), - m_bg_scrollx(*this, "bg_scrollx"){ } + m_bg_scrollx(*this, "bg_scrollx"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -47,4 +48,5 @@ public: virtual void machine_reset(); UINT32 screen_update_momoko(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void momoko_draw_bg_pri( bitmap_ind16 &bitmap, int chr, int col, int flipx, int flipy, int x, int y, int pri ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index 1df018a731b..2f8c037cb28 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -10,7 +10,8 @@ public: mosaic_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_fgvideoram(*this, "fgvideoram"), - m_bgvideoram(*this, "bgvideoram"){ } + m_bgvideoram(*this, "bgvideoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_fgvideoram; @@ -35,4 +36,5 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_mosaic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index 2a73bf91e41..348aa328d83 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgvideoram; @@ -34,4 +35,5 @@ public: virtual void palette_init(); UINT32 screen_update_mrdo(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/includes/mrjong.h b/src/mame/includes/mrjong.h index d8e4d204d3d..56614b90a36 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -10,7 +10,8 @@ public: mrjong_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -27,4 +28,5 @@ public: virtual void palette_init(); UINT32 screen_update_mrjong(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/includes/ms32.h b/src/mame/includes/ms32.h index 664205c92c4..bb791ad2ddd 100644 --- a/src/mame/includes/ms32.h +++ b/src/mame/includes/ms32.h @@ -7,7 +7,8 @@ public: m_roz_ctrl(*this, "roz_ctrl"), m_tx_scroll(*this, "tx_scroll"), m_bg_scroll(*this, "bg_scroll"), - m_mahjong_input_select(*this, "mahjong_select"){ } + m_mahjong_input_select(*this, "mahjong_select"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_mainram; required_shared_ptr<UINT32> m_roz_ctrl; @@ -96,4 +97,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, bitmap_ind8 &bitmap_pri, const rectangle &cliprect, UINT16 *sprram_top, size_t sprram_size, int gfxnum, int reverseorder); void draw_roz(bitmap_ind16 &bitmap, const rectangle &cliprect,int priority); void configure_banks(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h index fa7b7603972..fca3cf60550 100644 --- a/src/mame/includes/msisaac.h +++ b/src/mame/includes/msisaac.h @@ -10,7 +10,8 @@ public: m_videoram(*this, "videoram"), m_videoram3(*this, "videoram3"), m_videoram2(*this, "videoram2"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -76,4 +77,5 @@ public: UINT32 screen_update_msisaac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(nmi_callback); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index dc2e7b13c22..18669727522 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -4,7 +4,8 @@ public: mustache_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_bg_tilemap; @@ -20,4 +21,5 @@ public: UINT32 screen_update_mustache(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(mustache_scanline); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 63f41b05f87..89290f4deeb 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -22,7 +22,8 @@ public: m_spriteram(*this, "spriteram"), m_paletteram(*this, "paletteram"), m_scroll(*this, "scroll"), - m_video_control(*this, "video_control") { } + m_video_control(*this, "video_control") , + m_maincpu(*this, "maincpu") { } /* machine state */ required_shared_ptr<UINT8> m_ay8910_data; @@ -51,6 +52,7 @@ public: void set_palette(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx, int flip); void mystston_on_scanline_interrupt(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/mystston.c -----------*/ diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h index 55650601767..5954eb795de 100644 --- a/src/mame/includes/n64.h +++ b/src/mame/includes/n64.h @@ -14,7 +14,8 @@ class n64_state : public driver_device { public: n64_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 */ n64_rdp *m_rdp; @@ -25,6 +26,7 @@ public: void n64_machine_stop(); UINT32 screen_update_n64(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /*----------- devices -----------*/ diff --git a/src/mame/includes/namcond1.h b/src/mame/includes/namcond1.h index f4b9ffe59fc..55df8c8a19b 100644 --- a/src/mame/includes/namcond1.h +++ b/src/mame/includes/namcond1.h @@ -11,7 +11,8 @@ class namcond1_state : public driver_device public: namcond1_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_shared_ram(*this, "shared_ram"){ } + m_shared_ram(*this, "shared_ram"), + m_maincpu(*this, "maincpu") { } UINT8 m_h8_irq5_enabled; required_shared_ptr<UINT16> m_shared_ram; @@ -28,4 +29,5 @@ public: virtual void machine_start(); virtual void machine_reset(); INTERRUPT_GEN_MEMBER(mcu_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index 3f2376bf8c1..dfcbac1b9ac 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -13,7 +13,8 @@ class namcos1_state : public driver_device { public: namcos1_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_dac0_value; int m_dac1_value; @@ -95,6 +96,7 @@ public: virtual void video_start(); UINT32 screen_update_namcos1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_namcos1(screen_device &screen, bool state); + required_device<cpu_device> m_maincpu; }; /*----------- defined in drivers/namcos1.c -----------*/ diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h index 49c192eba30..4ef7fd390b4 100644 --- a/src/mame/includes/namcos2.h +++ b/src/mame/includes/namcos2.h @@ -101,8 +101,8 @@ public: m_c169_roz_gfxbank(0), m_c169_roz_mask(NULL), m_c355_obj_gfxbank(0), - m_c355_obj_palxor(0) - { } + m_c355_obj_palxor(0), + m_maincpu(*this, "maincpu") { } optional_device<m37450_device> m_c68; @@ -208,6 +208,7 @@ public: /* TODO: this should belong to namcos21_state */ DECLARE_WRITE16_MEMBER( namcos21_68k_gpu_C148_w ); DECLARE_READ16_MEMBER( namcos21_68k_gpu_C148_r ); + required_device<cpu_device> m_maincpu; }; class namcos2_state : public namcos2_shared_state diff --git a/src/mame/includes/naughtyb.h b/src/mame/includes/naughtyb.h index f9055b8baef..93df2e24ff7 100644 --- a/src/mame/includes/naughtyb.h +++ b/src/mame/includes/naughtyb.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), - m_scrollreg(*this, "scrollreg"){ } + m_scrollreg(*this, "scrollreg"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; UINT8 m_popflame_prot_seed; @@ -32,4 +33,5 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_naughtyb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h index 4e0266a022b..ce26c05e3ca 100644 --- a/src/mame/includes/nbmj8688.h +++ b/src/mame/includes/nbmj8688.h @@ -2,7 +2,8 @@ class nbmj8688_state : public driver_device { public: nbmj8688_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_mjsikaku_scrolly; int m_blitter_destx; @@ -98,4 +99,5 @@ public: void common_video_start(); void nbmj8688_HD61830B_instr_w(address_space &space,int offset,int data,int chip); void nbmj8688_HD61830B_data_w(address_space &space,int offset,int data,int chip); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h index 0b36405b6fd..1b3990e60d7 100644 --- a/src/mame/includes/nbmj8891.h +++ b/src/mame/includes/nbmj8891.h @@ -2,7 +2,8 @@ class nbmj8891_state : public driver_device { public: nbmj8891_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_scrolly; int m_blitter_destx; @@ -79,4 +80,5 @@ public: void update_pixel0(int x, int y); void update_pixel1(int x, int y); void nbmj8891_gfxdraw(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h index 88a8ead5816..6cb7a9984ae 100644 --- a/src/mame/includes/nbmj8900.h +++ b/src/mame/includes/nbmj8900.h @@ -2,7 +2,8 @@ class nbmj8900_state : public driver_device { public: nbmj8900_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_scrolly; int m_blitter_destx; @@ -50,4 +51,5 @@ public: void update_pixel0(int x, int y); void update_pixel1(int x, int y); void nbmj8900_gfxdraw(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h index 639a2c66096..9f976c26e4a 100644 --- a/src/mame/includes/nbmj8991.h +++ b/src/mame/includes/nbmj8991.h @@ -2,7 +2,8 @@ class nbmj8991_state : public driver_device { public: nbmj8991_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_scrollx; int m_scrolly; @@ -57,4 +58,5 @@ public: void nbmj8991_vramflip(); void update_pixel(int x, int y); void nbmj8991_gfxdraw(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h index 265c6ee5806..4b1c866d60b 100644 --- a/src/mame/includes/nbmj9195.h +++ b/src/mame/includes/nbmj9195.h @@ -8,7 +8,8 @@ class nbmj9195_state : public driver_device { public: nbmj9195_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_inputport; int m_dipswbitsel; @@ -125,4 +126,5 @@ public: int nbmj9195_dipsw_r(); void nbmj9195_dipswbitsel_w(int data); void mscoutm_inputportsel_w(int data); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h index 03f28757959..47b553db2a1 100644 --- a/src/mame/includes/news.h +++ b/src/mame/includes/news.h @@ -5,7 +5,8 @@ public: news_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_bgram; @@ -25,4 +26,5 @@ public: virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_news(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h index 7d4c11d9fea..e5728548700 100644 --- a/src/mame/includes/niyanpai.h +++ b/src/mame/includes/niyanpai.h @@ -4,7 +4,8 @@ class niyanpai_state : public driver_device { public: niyanpai_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_musobana_inputport; int m_musobana_outcoin_flag; @@ -90,4 +91,5 @@ public: void update_pixel(int vram, int x, int y); void niyanpai_gfxdraw(int vram); void niyanpai_soundbank_w(int data); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h index 58df2015a2e..7cd1f8bb610 100644 --- a/src/mame/includes/nmk16.h +++ b/src/mame/includes/nmk16.h @@ -14,7 +14,8 @@ public: m_nmk_bgvideoram2(*this, "nmk_bgvideoram2"), m_nmk_bgvideoram3(*this, "nmk_bgvideoram3"), m_afega_scroll_0(*this, "afega_scroll_0"), - m_afega_scroll_1(*this, "afega_scroll_1"){ } + m_afega_scroll_1(*this, "afega_scroll_1"), + m_maincpu(*this, "maincpu") { } int mask[4*2]; required_shared_ptr<UINT16> m_nmk_bgvideoram0; @@ -173,4 +174,5 @@ public: void decode_tdragonb(); void decode_ssmissin(); DECLARE_WRITE_LINE_MEMBER(ym2203_irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/norautp.h b/src/mame/includes/norautp.h index 226fbe14477..d631ba22c75 100644 --- a/src/mame/includes/norautp.h +++ b/src/mame/includes/norautp.h @@ -10,7 +10,8 @@ class norautp_state : public driver_device { public: norautp_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_np_vram; UINT16 m_np_addr; @@ -28,6 +29,7 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_norautp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/norautp.c -----------*/ diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h index bfcaf268cbb..87200f8d4fe 100644 --- a/src/mame/includes/nova2001.h +++ b/src/mame/includes/nova2001.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), m_bg_videoram(*this, "bg_videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } UINT8 m_ninjakun_io_a002_ctrl; optional_shared_ptr<UINT8> m_fg_videoram; @@ -47,4 +48,5 @@ public: void nova2001_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void pkunwar_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void lineswap_gfx_roms(const char *region, const int bit); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index d2a7dd13cfa..6abd79e232a 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -10,7 +10,8 @@ public: ohmygod_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") { } /* memory pointers */ @@ -39,4 +40,5 @@ public: virtual void video_start(); UINT32 screen_update_ohmygod(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/includes/othldrby.h b/src/mame/includes/othldrby.h index 2a2059f2ed3..8985a584b70 100644 --- a/src/mame/includes/othldrby.h +++ b/src/mame/includes/othldrby.h @@ -10,7 +10,8 @@ class othldrby_state : public driver_device { public: othldrby_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") { } /* memory pointers */ UINT16 * m_vram; @@ -45,4 +46,5 @@ public: void screen_eof_othldrby(screen_device &screen, bool state); inline void get_tile_info( tile_data &tileinfo, int tile_index, int plane ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h index 5f1d766360e..96cbd9b6c2c 100644 --- a/src/mame/includes/pacland.h +++ b/src/mame/includes/pacland.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_videoram2; @@ -43,4 +44,5 @@ public: void switch_palette(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int whichmask); void draw_fg(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h index 883a49ec114..7dbe230ad91 100644 --- a/src/mame/includes/paradise.h +++ b/src/mame/includes/paradise.h @@ -9,7 +9,8 @@ public: m_vram_2(*this, "vram_2"), m_videoram(*this, "videoram"), m_paletteram(*this, "paletteram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_vram_0; @@ -57,4 +58,5 @@ public: INTERRUPT_GEN_MEMBER(paradise_irq); void update_pix_palbank(); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index d1263401a16..85bb70d886b 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -4,7 +4,8 @@ public: pass_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bg_videoram(*this, "bg_videoram"), - m_fg_videoram(*this, "fg_videoram"){ } + m_fg_videoram(*this, "fg_videoram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; @@ -17,4 +18,5 @@ public: TILE_GET_INFO_MEMBER(get_pass_fg_tile_info); virtual void video_start(); UINT32 screen_update_pass(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h index 699870f3031..1b8f2f639f1 100644 --- a/src/mame/includes/pastelg.h +++ b/src/mame/includes/pastelg.h @@ -2,7 +2,8 @@ class pastelg_state : public driver_device { public: pastelg_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; int m_blitter_destx; @@ -39,6 +40,7 @@ public: int pastelg_blitter_src_addr_r(address_space &space); void pastelg_vramflip(); void pastelg_gfxdraw(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/pastelg.c -----------*/ diff --git a/src/mame/includes/pcktgal.h b/src/mame/includes/pcktgal.h index 7b2ae48041f..bf82f188d7a 100644 --- a/src/mame/includes/pcktgal.h +++ b/src/mame/includes/pcktgal.h @@ -3,7 +3,8 @@ class pcktgal_state : public driver_device public: pcktgal_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") { } int m_msm5205next; int m_toggle; @@ -20,4 +21,5 @@ public: UINT32 screen_update_pcktgalb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(pcktgal_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h index 17126af9e7d..520a695aea3 100644 --- a/src/mame/includes/phoenix.h +++ b/src/mame/includes/phoenix.h @@ -7,7 +7,8 @@ class phoenix_state : public driver_device { public: phoenix_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_pg[2]; UINT8 m_videoram_pg_index; @@ -38,6 +39,7 @@ public: UINT32 screen_update_phoenix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_READ8_MEMBER(survival_protection_r); DECLARE_READ_LINE_MEMBER(survival_sid_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h index bb5378d80f5..484ea22899c 100644 --- a/src/mame/includes/pirates.h +++ b/src/mame/includes/pirates.h @@ -7,7 +7,8 @@ public: m_scroll(*this, "scroll"), m_tx_tileram(*this, "tx_tileram"), m_fg_tileram(*this, "fg_tileram"), - m_bg_tileram(*this, "bg_tileram"){ } + m_bg_tileram(*this, "bg_tileram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_scroll; @@ -35,4 +36,5 @@ public: void pirates_decrypt_p(); void pirates_decrypt_s(); void pirates_decrypt_oki(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h index fc06722e9e7..304c99937af 100644 --- a/src/mame/includes/pitnrun.h +++ b/src/mame/includes/pitnrun.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_videoram2(*this, "videoram2"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; int m_nmi; @@ -59,4 +60,5 @@ public: TIMER_CALLBACK_MEMBER(pitnrun_mcu_status_real_w); void pitnrun_spotlights(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/pk8000.h b/src/mame/includes/pk8000.h index f1f8ccad317..47037ad6e5d 100644 --- a/src/mame/includes/pk8000.h +++ b/src/mame/includes/pk8000.h @@ -2,7 +2,8 @@ class pk8000_base_state : public driver_device { public: pk8000_base_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(pk8000_video_color_r); DECLARE_WRITE8_MEMBER(pk8000_video_color_w); @@ -33,4 +34,5 @@ protected: UINT8 m_pk8000_video_color; UINT8 m_pk8000_color[32]; UINT8 m_pk8000_video_enable; + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h index 3ecfe4942ea..5e05d6d8e01 100644 --- a/src/mame/includes/playch10.h +++ b/src/mame/includes/playch10.h @@ -12,7 +12,8 @@ public: m_ram_8w(*this, "ram_8w"), m_videoram(*this, "videoram"), m_timedata(*this, "timedata"), - m_work_ram(*this, "work_ram"){ } + m_work_ram(*this, "work_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_ram_8w; required_shared_ptr<UINT8> m_videoram; @@ -124,6 +125,7 @@ public: void gboard_scanline_cb( int scanline, int vblank, int blanked ); void ppu_irq(int *ppu_regs); void mapper9_latch(offs_t offset); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/playch10.c -----------*/ diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h index c2f98a1be99..edb501be4b9 100644 --- a/src/mame/includes/playmark.h +++ b/src/mame/includes/playmark.h @@ -11,7 +11,8 @@ public: m_videoram2(*this, "videoram2"), m_videoram3(*this, "videoram3"), m_spriteram(*this, "spriteram"), - m_rowscroll(*this, "rowscroll"){ } + m_rowscroll(*this, "rowscroll"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ optional_shared_ptr<UINT16> m_bgvideoram; @@ -100,4 +101,5 @@ public: void bigtwinb_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int codeshift ); void draw_bitmap( bitmap_ind16 &bitmap, const rectangle &cliprect ); UINT8 playmark_asciitohex(UINT8 data); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h index 71b43c24265..3ee7ac5e8f5 100644 --- a/src/mame/includes/plygonet.h +++ b/src/mame/includes/plygonet.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_shared_ram(*this, "shared_ram"), m_dsp56k_p_mirror(*this, "dsp56k_p_mirror"), - m_dsp56k_p_8000(*this, "dsp56k_p_8000"){ } + m_dsp56k_p_8000(*this, "dsp56k_p_8000"), + m_maincpu(*this, "maincpu") { } /* 68k-side shared ram */ required_shared_ptr<UINT32> m_shared_ram; @@ -76,4 +77,5 @@ public: INTERRUPT_GEN_MEMBER(polygonet_interrupt); INTERRUPT_GEN_MEMBER(audio_interrupt); void reset_sound_region(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h index 0a4fe5fdc1e..92d9fabbc5e 100644 --- a/src/mame/includes/pokechmp.h +++ b/src/mame/includes/pokechmp.h @@ -4,7 +4,8 @@ public: pokechmp_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_bg_tilemap; @@ -19,4 +20,5 @@ public: virtual void video_start(); UINT32 screen_update_pokechmp(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/includes/polepos.h b/src/mame/includes/polepos.h index cb29b2b1613..95719c3578e 100644 --- a/src/mame/includes/polepos.h +++ b/src/mame/includes/polepos.h @@ -18,7 +18,8 @@ public: m_sprite16_memory(*this, "sprite16_memory"), m_road16_memory(*this, "road16_memory"), m_alpha16_memory(*this, "alpha16_memory"), - m_view16_memory(*this, "view16_memory"){ } + m_view16_memory(*this, "view16_memory"), + m_maincpu(*this, "maincpu") { } optional_device<tms5220n_device> m_tms; UINT8 m_steer_last; @@ -87,6 +88,7 @@ public: void draw_road(bitmap_ind16 &bitmap); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void zoom_sprite(bitmap_ind16 &bitmap,int big,UINT32 code,UINT32 color,int flipx,int sx,int sy,int sizex,int sizey); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/policetr.h b/src/mame/includes/policetr.h index 432ae1bb672..7fdd2a5c1e5 100644 --- a/src/mame/includes/policetr.h +++ b/src/mame/includes/policetr.h @@ -9,7 +9,8 @@ class policetr_state : public driver_device public: policetr_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_rambase(*this, "rambase"){ } + m_rambase(*this, "rambase"), + m_maincpu(*this, "maincpu") { } UINT32 m_control_data; UINT32 m_bsmt_data_bank; @@ -50,4 +51,5 @@ public: INTERRUPT_GEN_MEMBER(irq4_gen); TIMER_CALLBACK_MEMBER(irq5_gen); void render_display_list(offs_t offset); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/polyplay.h b/src/mame/includes/polyplay.h index 87fa3f1991a..af30d3473ac 100644 --- a/src/mame/includes/polyplay.h +++ b/src/mame/includes/polyplay.h @@ -8,7 +8,8 @@ public: polyplay_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_characterram(*this, "characterram"){ } + m_characterram(*this, "characterram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; int m_freq1; @@ -36,6 +37,7 @@ public: INTERRUPT_GEN_MEMBER(periodic_interrupt); INTERRUPT_GEN_MEMBER(coin_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(polyplay_timer_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h index c04f07ebdbe..804ecef9153 100644 --- a/src/mame/includes/poolshrk.h +++ b/src/mame/includes/poolshrk.h @@ -16,7 +16,8 @@ public: m_playfield_ram(*this, "playfield_ram"), m_hpos_ram(*this, "hpos_ram"), m_vpos_ram(*this, "vpos_ram"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } int m_da_latch; required_shared_ptr<UINT8> m_playfield_ram; @@ -38,6 +39,7 @@ public: DECLARE_WRITE8_MEMBER(poolshrk_score_sound_w); DECLARE_WRITE8_MEMBER(poolshrk_click_sound_w); DECLARE_WRITE8_MEMBER(poolshrk_bump_sound_w); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h index cc26635b935..34d2d5e7974 100644 --- a/src/mame/includes/popeye.h +++ b/src/mame/includes/popeye.h @@ -7,7 +7,8 @@ public: m_palettebank(*this, "palettebank"), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } UINT8 m_prot0; UINT8 m_prot1; @@ -46,4 +47,5 @@ public: void set_background_palette(int bank); void draw_background(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/includes/popper.h b/src/mame/includes/popper.h index 06c9daacdd0..67701e90db5 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -14,7 +14,8 @@ public: m_ol_attribram(*this, "ol_attribram"), m_attribram(*this, "attribram"), m_spriteram(*this, "spriteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_ol_videoram; @@ -58,4 +59,5 @@ public: UINT32 screen_update_popper(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); 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/includes/portrait.h b/src/mame/includes/portrait.h index 377a57a7d9f..8d01df5fbc6 100644 --- a/src/mame/includes/portrait.h +++ b/src/mame/includes/portrait.h @@ -8,7 +8,8 @@ public: m_tms(*this, "tms"), m_bgvideoram(*this, "bgvideoram"), m_fgvideoram(*this, "fgvideoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_device<tms5200n_device> m_tms; required_shared_ptr<UINT8> m_bgvideoram; @@ -29,4 +30,5 @@ public: UINT32 screen_update_portrait(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); inline void get_tile_info( tile_data &tileinfo, int tile_index, const UINT8 *source ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h index e6007007606..adb8889f689 100644 --- a/src/mame/includes/powerins.h +++ b/src/mame/includes/powerins.h @@ -6,7 +6,8 @@ public: m_vctrl_0(*this, "vctrl_0"), m_vram_0(*this, "vram_0"), m_vram_1(*this, "vram_1"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } int m_oki_bank; required_shared_ptr<UINT16> m_vctrl_0; @@ -33,4 +34,5 @@ public: UINT32 screen_update_powerins(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index ef6239f9e56..7f56ec31d6a 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_bg_videoram16(*this, "bg_videoram16"){ } + m_bg_videoram16(*this, "bg_videoram16"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_videoram; @@ -30,4 +31,5 @@ public: UINT32 screen_update_prehisle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int foreground ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index a4c43ca413a..5d715c386cd 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -14,7 +14,8 @@ public: m_vram_1(*this, "vram_1"), m_vregs(*this, "vregs"), m_bootleg_spritebuffer(*this, "boot_spritebuf"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT32> m_spriteram; @@ -101,6 +102,7 @@ public: void s1945_mcu_init( ); DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(sound_irq); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/psikyo.c -----------*/ diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h index 17881efdf0e..41061bc990c 100644 --- a/src/mame/includes/psychic5.h +++ b/src/mame/includes/psychic5.h @@ -3,7 +3,8 @@ class psychic5_state : public driver_device public: psychic5_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") { } UINT8 m_bank_latch; UINT8 m_ps5_vram_page; @@ -54,4 +55,5 @@ public: void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_background(bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h index c30bbc84b04..7e6713668de 100644 --- a/src/mame/includes/punchout.h +++ b/src/mame/includes/punchout.h @@ -10,7 +10,8 @@ public: m_spr1_videoram(*this, "spr1_videoram"), m_spr2_videoram(*this, "spr2_videoram"), m_bg_bot_videoram(*this, "bg_bot_videoram"), - m_armwrest_fg_videoram(*this, "armwrest_fgram"){ } + m_armwrest_fg_videoram(*this, "armwrest_fgram"), + m_maincpu(*this, "maincpu") { } int m_rp5c01_mode_sel; int m_rp5c01_mem[16*4]; @@ -73,4 +74,5 @@ public: void drawbs2(bitmap_ind16 &bitmap, const rectangle &cliprect); void punchout_copy_top_palette(int bank); void punchout_copy_bot_palette(int bank); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h index c45b5910a28..8003b4f4145 100644 --- a/src/mame/includes/qdrmfgp.h +++ b/src/mame/includes/qdrmfgp.h @@ -4,8 +4,7 @@ public: qdrmfgp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), - m_nvram(*this, "nvram") - , + m_nvram(*this, "nvram"), m_workram(*this, "workram"){ } required_device<cpu_device> m_maincpu; diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h index 8d982bb4402..54356625e45 100644 --- a/src/mame/includes/quizdna.h +++ b/src/mame/includes/quizdna.h @@ -3,7 +3,8 @@ class quizdna_state : public driver_device public: quizdna_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") { } UINT8 *m_bg_ram; UINT8 *m_fg_ram; @@ -26,4 +27,5 @@ public: virtual void video_start(); UINT32 screen_update_quizdna(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/includes/quizpani.h b/src/mame/includes/quizpani.h index 0f097a8450d..8dd929d4d80 100644 --- a/src/mame/includes/quizpani.h +++ b/src/mame/includes/quizpani.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_scrollreg(*this, "scrollreg"), m_bg_videoram(*this, "bg_videoram"), - m_txt_videoram(*this, "txt_videoram"){ } + m_txt_videoram(*this, "txt_videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_scrollreg; required_shared_ptr<UINT16> m_bg_videoram; @@ -22,4 +23,5 @@ public: TILE_GET_INFO_MEMBER(txt_tile_info); virtual void video_start(); UINT32 screen_update_quizpani(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h index b8c2f2d4df1..84f32ff9763 100644 --- a/src/mame/includes/raiden.h +++ b/src/mame/includes/raiden.h @@ -10,7 +10,8 @@ public: m_videoram(*this, "videoram"), m_scroll_ram(*this, "scroll_ram"), m_back_data(*this, "back_data"), - m_fore_data(*this, "fore_data"){ } + m_fore_data(*this, "fore_data"), + m_maincpu(*this, "maincpu") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_shared_ram; @@ -43,4 +44,5 @@ public: INTERRUPT_GEN_MEMBER(raiden_interrupt); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri_mask); void common_decrypt(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index fa967e761a9..9a0d0c5af05 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -7,7 +7,8 @@ public: fore_data(*this, "fore_data"), mid_data(*this, "mid_data"), text_data(*this, "text_data"), - sprites(*this, "sprites") { } + sprites(*this, "sprites") , + m_maincpu(*this, "maincpu") { } DECLARE_WRITE16_MEMBER( cop_itoa_low_w ); DECLARE_WRITE16_MEMBER( cop_itoa_high_w ); @@ -157,6 +158,7 @@ public: const UINT8 fade_table(int v); void combine32(UINT32 *val, int offset, UINT16 data, UINT16 mem_mask); void sprcpt_init(void); + required_device<cpu_device> m_maincpu; }; /*----------- defined in machine/r2crypt.c -----------*/ diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h index 49d373814ac..00be22b067c 100644 --- a/src/mame/includes/realbrk.h +++ b/src/mame/includes/realbrk.h @@ -11,7 +11,8 @@ public: m_dsw_select(*this, "dsw_select"), m_backup_ram(*this, "backup_ram"), m_vram_0ras(*this, "vram_0ras"), - m_vram_1ras(*this, "vram_1ras"){ } + m_vram_1ras(*this, "vram_1ras"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_vram_0; @@ -49,4 +50,5 @@ public: INTERRUPT_GEN_MEMBER(realbrk_interrupt); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void dai2kaku_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, int layer); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/redalert.h b/src/mame/includes/redalert.h index e6bebf21338..2e0d727551a 100644 --- a/src/mame/includes/redalert.h +++ b/src/mame/includes/redalert.h @@ -15,7 +15,8 @@ public: m_bitmap_videoram(*this, "bitmap_videoram"), m_charmap_videoram(*this, "charram"), m_video_control(*this, "video_control"), - m_bitmap_color(*this, "bitmap_color"){ } + m_bitmap_color(*this, "bitmap_color"), + m_maincpu(*this, "maincpu") { } UINT8 m_ay8910_latch_1; UINT8 m_ay8910_latch_2; @@ -50,6 +51,7 @@ public: DECLARE_WRITE8_MEMBER(demoneye_ay8910_data_w); void get_pens(pen_t *pens); void get_panther_pens(pen_t *pens); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/redalert.c -----------*/ diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h index 910f25b7141..1b59770036c 100644 --- a/src/mame/includes/retofinv.h +++ b/src/mame/includes/retofinv.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_fg_videoram(*this, "fg_videoram"), m_sharedram(*this, "sharedram"), - m_bg_videoram(*this, "bg_videoram"){ } + m_bg_videoram(*this, "bg_videoram"), + m_maincpu(*this, "maincpu") { } UINT8 m_cpu2_m6000; required_shared_ptr<UINT8> m_fg_videoram; @@ -65,4 +66,5 @@ public: INTERRUPT_GEN_MEMBER(main_vblank_irq); INTERRUPT_GEN_MEMBER(sub_vblank_irq); void draw_sprites(bitmap_ind16 &bitmap); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 2c322a6b239..3d44fbf32c5 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -10,7 +10,8 @@ public: rockrage_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_paletteram(*this, "paletteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_paletteram; @@ -33,6 +34,7 @@ public: virtual void palette_init(); UINT32 screen_update_rockrage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(rockrage_interrupt); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/rockrage.c -----------*/ diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h index 27c67062eae..a45fe55ee06 100644 --- a/src/mame/includes/rocnrope.h +++ b/src/mame/includes/rocnrope.h @@ -6,7 +6,8 @@ public: m_spriteram2(*this, "spriteram2"), m_spriteram(*this, "spriteram"), m_colorram(*this, "colorram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram2; @@ -31,4 +32,5 @@ public: UINT32 screen_update_rocnrope(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); 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/includes/rollrace.h b/src/mame/includes/rollrace.h index 374b2321a98..f1d8e7106e4 100644 --- a/src/mame/includes/rollrace.h +++ b/src/mame/includes/rollrace.h @@ -5,7 +5,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; @@ -37,4 +38,5 @@ public: UINT32 screen_update_rollrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(sound_timer_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h index 86be2f7871d..12be6a787e1 100644 --- a/src/mame/includes/rpunch.h +++ b/src/mame/includes/rpunch.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_bitmapram(*this, "bitmapram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_videoram; UINT8 m_sound_data; @@ -45,4 +46,5 @@ public: TIMER_CALLBACK_MEMBER(crtc_interrupt_gen); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int start, int stop); void draw_bitmap(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h index 7bda3c97f64..1b6d8dbcf95 100644 --- a/src/mame/includes/runaway.h +++ b/src/mame/includes/runaway.h @@ -4,7 +4,8 @@ public: runaway_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_video_ram(*this, "video_ram"), - m_sprite_ram(*this, "sprite_ram"){ } + m_sprite_ram(*this, "sprite_ram"), + m_maincpu(*this, "maincpu") { } emu_timer *m_interrupt_timer; required_shared_ptr<UINT8> m_video_ram; @@ -27,4 +28,5 @@ public: UINT32 screen_update_runaway(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_qwak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(interrupt_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h index 52f2faa316c..ae0c279397b 100644 --- a/src/mame/includes/sauro.h +++ b/src/mame/includes/sauro.h @@ -7,7 +7,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), - m_colorram2(*this, "colorram2"){ } + m_colorram2(*this, "colorram2"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -41,4 +42,5 @@ public: INTERRUPT_GEN_MEMBER(sauro_interrupt); void sauro_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void trckydoc_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h index 060068fea08..879fd2bb6db 100644 --- a/src/mame/includes/sbasketb.h +++ b/src/mame/includes/sbasketb.h @@ -12,8 +12,8 @@ public: m_palettebank(*this, "palettebank"), m_spriteram_select(*this, "spriteramsel"), m_scroll(*this, "scroll"), - m_sn(*this, "snsnd") - { } + m_sn(*this, "snsnd"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_colorram; @@ -45,4 +45,5 @@ public: UINT32 screen_update_sbasketb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); 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/includes/sbugger.h b/src/mame/includes/sbugger.h index 8f42cf3b9c8..68fed5c5ea0 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -4,7 +4,8 @@ public: sbugger_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram_attr(*this, "videoram_attr"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram_attr; required_shared_ptr<UINT8> m_videoram; @@ -17,4 +18,5 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_sbugger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h index 4ba77897e7d..236dee8b252 100644 --- a/src/mame/includes/scotrsht.h +++ b/src/mame/includes/scotrsht.h @@ -6,7 +6,8 @@ public: m_colorram(*this, "colorram"), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_scroll(*this, "scroll"){ } + m_scroll(*this, "scroll"), + m_maincpu(*this, "maincpu") { } int m_irq_enable; required_shared_ptr<UINT8> m_colorram; @@ -28,4 +29,5 @@ public: UINT32 screen_update_scotrsht(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(scotrsht_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index 17eb9dab8b4..cf7f9191d9f 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_md_videoram(*this, "md_videoram"), m_fg_videoram(*this, "fg_videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_md_videoram; @@ -36,4 +37,5 @@ public: UINT32 screen_update_sderby(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_pmroulet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int codeshift); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h index c561afd63ed..0b01689a19a 100644 --- a/src/mame/includes/segag80r.h +++ b/src/mame/includes/segag80r.h @@ -15,7 +15,8 @@ public: m_mainram(*this, "mainram"), m_videoram(*this, "videoram"), m_sn1(*this, "sn1"), - m_sn2(*this, "sn2"){ } + m_sn2(*this, "sn2"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_mainram; required_shared_ptr<UINT8> m_videoram; @@ -120,6 +121,7 @@ public: offs_t decrypt_offset(address_space &space, offs_t offset); inline UINT8 demangle(UINT8 d7d6, UINT8 d5d4, UINT8 d3d2, UINT8 d1d0); void monsterb_expand_gfx(const char *region); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h index 86b12c41567..fff146c773f 100644 --- a/src/mame/includes/segag80v.h +++ b/src/mame/includes/segag80v.h @@ -12,7 +12,8 @@ public: segag80v_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_mainram(*this, "mainram"), - m_vectorram(*this, "vectorram"){ } + m_vectorram(*this, "vectorram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_mainram; device_t *m_usb; @@ -57,4 +58,5 @@ public: void sega_generate_vector_list(); offs_t decrypt_offset(address_space &space, offs_t offset); inline UINT8 demangle(UINT8 d7d6, UINT8 d5d4, UINT8 d3d2, UINT8 d1d0); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h index f990cb8be8b..9c0c44988ee 100644 --- a/src/mame/includes/segas24.h +++ b/src/mame/includes/segas24.h @@ -4,7 +4,8 @@ class segas24_state : public driver_device { public: segas24_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") { } static const UINT8 mahmajn_mlt[8]; @@ -118,4 +119,5 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(irq_timer_clear_cb); TIMER_DEVICE_CALLBACK_MEMBER(irq_frc_cb); TIMER_DEVICE_CALLBACK_MEMBER(irq_vbl); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h index d3d2231da22..8c2c765582f 100644 --- a/src/mame/includes/segas32.h +++ b/src/mame/includes/segas32.h @@ -17,7 +17,8 @@ public: m_system32_workram(*this,"workram"), m_system32_videoram(*this,"videoram", 0), m_system32_spriteram(*this,"spriteram", 0), - m_system32_paletteram(*this,"paletteram", 0) { } + m_system32_paletteram(*this,"paletteram", 0) , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_z80_shared_ram; optional_shared_ptr<UINT8> m_ga2_dpram; @@ -249,6 +250,7 @@ public: void update_bitmap(screen_device &screen, struct layer_info *layer, const rectangle &cliprect); void update_background(struct layer_info *layer, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(ym3438_irq_handler); + required_device<cpu_device> m_maincpu; }; /*----------- defined in machine/segas32.c -----------*/ diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h index 3d0b4c0f4ad..c8a7a6b814e 100644 --- a/src/mame/includes/seibuspi.h +++ b/src/mame/includes/seibuspi.h @@ -8,7 +8,8 @@ public: seibuspi_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spi_scrollram(*this, "spi_scrollram"), - m_spimainram(*this, "spimainram"){ } + m_spimainram(*this, "spimainram"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT32> m_spi_scrollram; required_shared_ptr<UINT32> m_spimainram; @@ -131,6 +132,7 @@ public: void init_rf2_common(); void init_rfjet_common(); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; /*----------- defined in machine/spisprit.c -----------*/ void seibuspi_sprite_decrypt(UINT8 *src, int romsize); diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h index 56dd5c8d627..137d0f76823 100644 --- a/src/mame/includes/seicross.h +++ b/src/mame/includes/seicross.h @@ -8,7 +8,8 @@ public: m_row_scroll(*this, "row_scroll"), m_spriteram2(*this, "spriteram2"), m_colorram(*this, "colorram"), - m_nvram(*this, "nvram"){ } + m_nvram(*this, "nvram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -32,4 +33,5 @@ public: UINT32 screen_update_seicross(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); 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/includes/senjyo.h b/src/mame/includes/senjyo.h index 4e521e638d3..bd2b7f12bcc 100644 --- a/src/mame/includes/senjyo.h +++ b/src/mame/includes/senjyo.h @@ -23,7 +23,8 @@ public: m_bg2videoram(*this, "bg2videoram"), m_bg3videoram(*this, "bg3videoram"), m_radarram(*this, "radarram"), - m_bgstripesram(*this, "bgstripesram"){ } + m_bgstripesram(*this, "bgstripesram"), + m_maincpu(*this, "maincpu") { } int m_int_delay_kludge; UINT8 m_sound_cmd; @@ -87,6 +88,7 @@ public: void draw_bgbitmap(bitmap_ind16 &bitmap,const rectangle &cliprect); void draw_radar(bitmap_ind16 &bitmap,const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int priority); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/senjyo.c -----------*/ diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index cab557491cd..d3363308a27 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -6,7 +6,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_bg0videoram(*this, "bg0videoram"), m_bg1videoram(*this, "bg1videoram"), - m_spvideoram(*this, "spvideoram"){ } + m_spvideoram(*this, "spvideoram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_fgtilemap; tilemap_t *m_bg0tilemap; @@ -46,4 +47,5 @@ public: void screen_eof_shadfrce(screen_device &screen, bool state); TIMER_DEVICE_CALLBACK_MEMBER(shadfrce_scanline); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h index 377d53296c0..cf8f7c99aa3 100644 --- a/src/mame/includes/shangha3.h +++ b/src/mame/includes/shangha3.h @@ -3,7 +3,8 @@ class shangha3_state : public driver_device public: shangha3_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") { } int m_prot_count; required_shared_ptr<UINT16> m_ram; @@ -29,4 +30,5 @@ public: virtual void video_start(); UINT32 screen_update_shangha3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h index 1640446e7cf..c36309d9ac8 100644 --- a/src/mame/includes/shangkid.h +++ b/src/mame/includes/shangkid.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), - m_videoreg(*this, "videoreg"){ } + m_videoreg(*this, "videoreg"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; optional_shared_ptr<UINT8> m_spriteram; @@ -36,4 +37,5 @@ public: void shangkid_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void dynamski_draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); void dynamski_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h index c87279960db..770cb88cc9f 100644 --- a/src/mame/includes/shisen.h +++ b/src/mame/includes/shisen.h @@ -4,7 +4,8 @@ public: shisen_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_paletteram(*this, "paletteram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } int m_gfxbank; tilemap_t *m_bg_tilemap; @@ -18,4 +19,5 @@ public: TILE_GET_INFO_MEMBER(get_bg_tile_info); virtual void video_start(); UINT32 screen_update_sichuan2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index 6980d30413a..aaf521c56c3 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_textram(*this, "textram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_background; tilemap_t *m_foreground; @@ -30,4 +31,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int bank_bits ); DECLARE_WRITE_LINE_MEMBER(shootout_snd_irq); DECLARE_WRITE_LINE_MEMBER(shootout_snd2_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index 7ed47cf64c4..fecff152116 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -9,7 +9,8 @@ public: m_bg_scrollx(*this, "bg_scrollx"), m_bg_scrolly(*this, "bg_scrolly"), m_videoram(*this, "videoram"), - m_colorram(*this, "colorram"){ } + m_colorram(*this, "colorram"), + m_maincpu(*this, "maincpu") { } int m_gameid; @@ -56,4 +57,5 @@ public: void draw_sprites_region(bitmap_ind16 &bitmap, const rectangle &cliprect, int start_offset, int end_offset ); void sidearms_draw_starfield( bitmap_ind16 &bitmap ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index 740cce3dfae..93184f03c78 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -5,7 +5,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") { } tilemap_t *m_bg_tilemap; required_shared_ptr<UINT8> m_videoram; @@ -30,4 +31,5 @@ public: virtual void palette_init(); UINT32 screen_update_sidepckt(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/includes/silkroad.h b/src/mame/includes/silkroad.h index b0fc95cda0a..f7ea3cfc923 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -7,7 +7,8 @@ public: m_vidram2(*this, "vidram2"), m_vidram3(*this, "vidram3"), m_sprram(*this, "sprram"), - m_regs(*this, "regs"){ } + m_regs(*this, "regs"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT32> m_vidram; required_shared_ptr<UINT32> m_vidram2; @@ -30,4 +31,5 @@ public: virtual void video_start(); UINT32 screen_update_silkroad(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/includes/skydiver.h b/src/mame/includes/skydiver.h index 2374e559881..710020e8603 100644 --- a/src/mame/includes/skydiver.h +++ b/src/mame/includes/skydiver.h @@ -24,7 +24,8 @@ class skydiver_state : public driver_device public: skydiver_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_nmion; @@ -53,6 +54,7 @@ public: UINT32 screen_update_skydiver(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(skydiver_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/skydiver.c -----------*/ diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h index a84b42336b7..bc36c6b35a2 100644 --- a/src/mame/includes/skykid.h +++ b/src/mame/includes/skykid.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_textram(*this, "textram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } UINT8 m_inputport_selected; required_shared_ptr<UINT8> m_videoram; @@ -44,4 +45,5 @@ public: INTERRUPT_GEN_MEMBER(main_vblank_irq); INTERRUPT_GEN_MEMBER(mcu_vblank_irq); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h index 4cff4ede3b8..7b66342dd38 100644 --- a/src/mame/includes/skyraid.h +++ b/src/mame/includes/skyraid.h @@ -8,7 +8,8 @@ public: m_pos_ram(*this, "pos_ram"), m_alpha_num_ram(*this, "alpha_num_ram"), m_obj_ram(*this, "obj_ram"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } int m_analog_range; int m_analog_offset; @@ -33,6 +34,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_missiles(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_trapezoid(bitmap_ind16& dst, bitmap_ind16& src); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/skyraid.c -----------*/ diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h index c67a7e4b6a1..db05219eb59 100644 --- a/src/mame/includes/slapfght.h +++ b/src/mame/includes/slapfght.h @@ -24,7 +24,8 @@ public: m_slapfight_scrollx_lo(*this, "scrollx_lo"), m_slapfight_scrollx_hi(*this, "scrollx_hi"), m_slapfight_scrolly(*this, "scrolly"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") , + m_maincpu(*this, "maincpu") { } int m_getstar_id; required_shared_ptr<UINT8> m_slapfight_videoram; @@ -130,6 +131,7 @@ public: void slapfght_log_vram(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority_to_display ); void getstar_init( ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h index 319c4a04e02..6b541425a6b 100644 --- a/src/mame/includes/snk.h +++ b/src/mame/includes/snk.h @@ -12,7 +12,8 @@ public: m_spriteram(*this, "spriteram"), m_fg_videoram(*this, "fg_videoram"), m_bg_videoram(*this, "bg_videoram"), - m_tx_videoram(*this, "tx_videoram"){ } + m_tx_videoram(*this, "tx_videoram"), + m_maincpu(*this, "maincpu") { } int m_countryc_trackball; int m_last_value[2]; @@ -178,4 +179,5 @@ public: int turbofront_check(int small, int num); int turbofront_check8(int small, int num); DECLARE_WRITE_LINE_MEMBER(ymirq_callback_1); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h index 1435e5b2aed..7d54881fd09 100644 --- a/src/mame/includes/snk6502.h +++ b/src/mame/includes/snk6502.h @@ -18,7 +18,8 @@ public: m_videoram2(*this, "videoram2"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_charram(*this, "charram"){ } + m_charram(*this, "charram"), + m_maincpu(*this, "maincpu") { } UINT8 m_sasuke_counter; @@ -65,6 +66,7 @@ public: INTERRUPT_GEN_MEMBER(snk6502_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(sasuke_update_counter); void sasuke_start_counter(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index 4adc6d065ef..673c7189fb2 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_pow_fg_videoram(*this, "pow_fg_videoram"), m_spriteram(*this, "spriteram"), - m_paletteram(*this, "paletteram"){ } + m_paletteram(*this, "paletteram"), + m_maincpu(*this, "maincpu") { } int m_invert_controls; int m_sound_status; @@ -47,4 +48,5 @@ public: void common_video_start(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int group); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h index dff9d80453a..62a1e90f31e 100644 --- a/src/mame/includes/snookr10.h +++ b/src/mame/includes/snookr10.h @@ -4,7 +4,8 @@ public: snookr10_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_outportl; int m_outporth; @@ -29,4 +30,5 @@ public: DECLARE_VIDEO_START(apple10); DECLARE_PALETTE_INIT(apple10); UINT32 screen_update_snookr10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h index 2db5050a62e..22991a975ce 100644 --- a/src/mame/includes/solomon.h +++ b/src/mame/includes/solomon.h @@ -7,7 +7,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), - m_colorram2(*this, "colorram2"){ } + m_colorram2(*this, "colorram2"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -33,4 +34,5 @@ public: UINT32 screen_update_solomon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); 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/includes/sonson.h b/src/mame/includes/sonson.h index 49e68a45872..0924f766706 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -12,7 +12,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_spriteram(*this, "spriteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -41,4 +42,5 @@ public: virtual void palette_init(); UINT32 screen_update_sonson(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/includes/spacefb.h b/src/mame/includes/spacefb.h index e7e77ed5077..d2d5bceccba 100644 --- a/src/mame/includes/spacefb.h +++ b/src/mame/includes/spacefb.h @@ -29,7 +29,8 @@ class spacefb_state : public driver_device public: spacefb_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_sound_latch; emu_timer *m_interrupt_timer; @@ -60,6 +61,7 @@ public: void draw_objects(bitmap_rgb32 &bitmap, const rectangle &cliprect); void create_interrupt_timer(); void start_interrupt_timer(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/spacefb.c -----------*/ diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 4e0c78595f2..7e7c043d72c 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -10,8 +10,8 @@ public: m_fgvideoram(*this, "fgvideoram"), m_spvideoram(*this, "spvideoram"), m_extraram(*this, "extraram"), - m_extraram2(*this, "extraram2") - { } + m_extraram2(*this, "extraram2"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_bgvideoram; required_shared_ptr<UINT16> m_fgvideoram; @@ -64,4 +64,5 @@ public: return 0xffff; } DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h index bad536301ac..9592e17e53f 100644 --- a/src/mame/includes/spcforce.h +++ b/src/mame/includes/spcforce.h @@ -10,7 +10,8 @@ public: m_colorram(*this, "colorram"), m_sn1(*this, "sn1"), m_sn2(*this, "sn2"), - m_sn3(*this, "sn3"){ } + m_sn3(*this, "sn3"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_scrollram; @@ -35,4 +36,5 @@ public: virtual void palette_init(); UINT32 screen_update_spcforce(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/includes/speedatk.h b/src/mame/includes/speedatk.h index 2c4c1ffc94c..f7de60e75d8 100644 --- a/src/mame/includes/speedatk.h +++ b/src/mame/includes/speedatk.h @@ -4,7 +4,8 @@ public: speedatk_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; @@ -28,4 +29,5 @@ public: virtual void palette_init(); UINT32 screen_update_speedatk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT8 iox_key_matrix_calc(UINT8 p_side); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h index 4282f8de0c7..6d916267941 100644 --- a/src/mame/includes/speedbal.h +++ b/src/mame/includes/speedbal.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_background_videoram(*this, "bg_videoram"), m_foreground_videoram(*this, "fg_videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_background_videoram; required_shared_ptr<UINT8> m_foreground_videoram; @@ -20,4 +21,5 @@ public: virtual void video_start(); UINT32 screen_update_speedbal(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/includes/speedspn.h b/src/mame/includes/speedspn.h index 83e7a090a7d..ee74a75b783 100644 --- a/src/mame/includes/speedspn.h +++ b/src/mame/includes/speedspn.h @@ -3,7 +3,8 @@ class speedspn_state : public driver_device public: speedspn_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_attram(*this, "attram"){ } + m_attram(*this, "attram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_attram; tilemap_t *m_tilemap; @@ -23,4 +24,5 @@ public: virtual void video_start(); UINT32 screen_update_speedspn(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/includes/spiders.h b/src/mame/includes/spiders.h index 3be8ee27766..ff5f3a65787 100644 --- a/src/mame/includes/spiders.h +++ b/src/mame/includes/spiders.h @@ -13,7 +13,8 @@ public: spiders_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_ram(*this, "ram"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_ram; required_device<discrete_device> m_discrete; @@ -37,6 +38,7 @@ public: DECLARE_WRITE8_MEMBER(spiders_audio_a_w); DECLARE_WRITE8_MEMBER(spiders_audio_b_w); DECLARE_WRITE8_MEMBER(spiders_audio_ctrl_w); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/spiders.c -----------*/ diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h index 171479f26fc..fef3bef96df 100644 --- a/src/mame/includes/splash.h +++ b/src/mame/includes/splash.h @@ -8,7 +8,8 @@ public: m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), m_protdata(*this, "protdata"), - m_bitmap_mode(*this, "bitmap_mode"){ } + m_bitmap_mode(*this, "bitmap_mode"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_pixelram; required_shared_ptr<UINT16> m_videoram; @@ -73,4 +74,5 @@ public: DECLARE_WRITE_LINE_MEMBER(ym_irq); DECLARE_WRITE_LINE_MEMBER(adpcm_int1); DECLARE_WRITE_LINE_MEMBER(adpcm_int2); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h index 45c6bfc3add..2f5366d5561 100644 --- a/src/mame/includes/sprint2.h +++ b/src/mame/includes/sprint2.h @@ -26,7 +26,8 @@ class sprint2_state : public driver_device public: sprint2_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") { } int m_attract; int m_steering[2]; @@ -72,6 +73,7 @@ public: inline int get_sprite_x(UINT8 *video_ram, int n); inline int get_sprite_y(UINT8 *video_ram, int n); int service_mode(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/sprint2.c -----------*/ diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h index 5ce54f2febf..75263ced83a 100644 --- a/src/mame/includes/sprint4.h +++ b/src/mame/includes/sprint4.h @@ -3,7 +3,8 @@ class sprint4_state : public driver_device public: sprint4_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_da_latch; @@ -41,4 +42,5 @@ public: UINT32 screen_update_sprint4(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_sprint4(screen_device &screen, bool state); TIMER_CALLBACK_MEMBER(nmi_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h index 451e650103c..5dfb60369bb 100644 --- a/src/mame/includes/sprint8.h +++ b/src/mame/includes/sprint8.h @@ -10,7 +10,8 @@ public: m_pos_v_ram(*this, "pos_v_ram"), m_pos_d_ram(*this, "pos_d_ram"), m_team(*this, "team"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } int m_steer_dir[8]; int m_steer_flag[8]; @@ -48,6 +49,7 @@ public: void set_pens(sprint8_state *state, colortable_t *colortable); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void sprint8_set_collision(int n); + required_device<cpu_device> m_maincpu; }; /*----------- defined in drivers/sprint8.c -----------*/ diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 90597158030..bef9da77c11 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -10,7 +10,8 @@ class srmp2_state : public driver_device { public: srmp2_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_color_bank; int m_gfx_bank; @@ -51,4 +52,5 @@ public: UINT32 screen_update_mjyuugi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT8 iox_key_matrix_calc(UINT8 p_side); DECLARE_WRITE_LINE_MEMBER(srmp2_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index e243855b209..3ff088d1f51 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -18,8 +18,8 @@ public: m_tile_paletteram1(*this, "tile_palram1"), m_prot_data(*this, "prot_data"), m_sprgen1(*this, "spritegen1"), - m_sprgen2(*this, "spritegen2") - { } + m_sprgen2(*this, "spritegen2"), + m_maincpu(*this, "maincpu") { } required_device<deco16ic_device> m_deco_tilegen1; required_shared_ptr<UINT16> m_spriteram; @@ -60,4 +60,5 @@ public: UINT32 screen_update_sshangha(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); inline void sshangha_set_color_888(pen_t color, int rshift, int gshift, int bshift, UINT32 data); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index b0a7bd6f8ca..6c35febb425 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -7,7 +7,8 @@ public: m_md_tileram(*this, "md_tileram"), m_tx_tileram(*this, "tx_tileram"), m_regs(*this, "regs"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } emu_timer *m_music_timer; @@ -54,4 +55,5 @@ public: UINT32 screen_update_powerbls(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(music_playback); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h index 5bff51dff4b..cec4fa1fb64 100644 --- a/src/mame/includes/ssozumo.h +++ b/src/mame/includes/ssozumo.h @@ -8,7 +8,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), - m_colorram2(*this, "colorram2"){ } + m_colorram2(*this, "colorram2"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_paletteram; @@ -38,4 +39,5 @@ public: UINT32 screen_update_ssozumo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(sound_timer_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h index 38e1152b221..885b41be6ec 100644 --- a/src/mame/includes/sspeedr.h +++ b/src/mame/includes/sspeedr.h @@ -2,7 +2,8 @@ class sspeedr_state : public driver_device { public: sspeedr_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_led_TIME[2]; UINT8 m_led_SCORE[24]; @@ -40,4 +41,5 @@ public: void draw_track(bitmap_ind16 &bitmap); void draw_drones(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_driver(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h index 1f556e2ae21..ac303eb3edb 100644 --- a/src/mame/includes/ssrj.h +++ b/src/mame/includes/ssrj.h @@ -7,7 +7,8 @@ public: m_vram2(*this, "vram2"), m_vram3(*this, "vram3"), m_vram4(*this, "vram4"), - m_scrollram(*this, "scrollram"){ } + m_scrollram(*this, "scrollram"), + m_maincpu(*this, "maincpu") { } int m_oldport; tilemap_t *m_tilemap1; @@ -32,4 +33,5 @@ public: UINT32 screen_update_ssrj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_ssrj(screen_device &screen, bool state); void draw_objects(bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index 9475bd4b480..59d6bb582be 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -19,7 +19,8 @@ public: m_videoram_b(*this, "videoram_b"), m_videoram_d(*this, "videoram_d"), m_videoram_e(*this, "videoram_e"), - m_videoram_f(*this, "videoram_f"){ } + m_videoram_f(*this, "videoram_f"), + m_maincpu(*this, "maincpu") { } /* machine state */ int m_vert_pos; @@ -67,6 +68,7 @@ public: void set_indicator_leds(int data, const char *output_name, int base_index); void update_artwork(); void move_motor(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/stactics.c -----------*/ MACHINE_CONFIG_EXTERN( stactics_video ); diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h index ecb1465936a..34a8055c49d 100644 --- a/src/mame/includes/stadhero.h +++ b/src/mame/includes/stadhero.h @@ -4,7 +4,8 @@ public: stadhero_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_pf1_data(*this, "pf1_data"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_pf1_data; tilemap_t *m_pf1_tilemap; @@ -17,4 +18,5 @@ public: virtual void video_start(); UINT32 screen_update_stadhero(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h index dd9954c6614..98e25c49ea4 100644 --- a/src/mame/includes/starcrus.h +++ b/src/mame/includes/starcrus.h @@ -2,7 +2,8 @@ class starcrus_state : public driver_device { public: starcrus_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") { } bitmap_ind16 *m_ship1_vid; bitmap_ind16 *m_ship2_vid; @@ -55,4 +56,5 @@ public: int collision_check_p1p2(); int collision_check_s1p1p2(); int collision_check_s2p1p2(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h index 9c30769f66e..b43b566ee21 100644 --- a/src/mame/includes/starfire.h +++ b/src/mame/includes/starfire.h @@ -26,8 +26,8 @@ public: : driver_device(mconfig, type, tag), m_starfire_colorram(*this, "colorram"), m_starfire_videoram(*this, "videoram"), - m_samples(*this, "samples") - { } + m_samples(*this, "samples"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_starfire_colorram; required_shared_ptr<UINT8> m_starfire_videoram; @@ -63,4 +63,5 @@ public: TIMER_CALLBACK_MEMBER(starfire_scanline_callback); INTERRUPT_GEN_MEMBER(vblank_int); void get_pens(pen_t *pens); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h index b34ba300644..e120b2bcbb4 100644 --- a/src/mame/includes/starshp1.h +++ b/src/mame/includes/starshp1.h @@ -38,7 +38,8 @@ public: m_playfield_ram(*this, "playfield_ram"), m_hpos_ram(*this, "hpos_ram"), m_vpos_ram(*this, "vpos_ram"), - m_obj_ram(*this, "obj_ram"){ } + m_obj_ram(*this, "obj_ram"), + m_maincpu(*this, "maincpu") { } int m_analog_in_select; int m_attract; @@ -96,6 +97,7 @@ public: int spaceship_collision(bitmap_ind16 &bitmap, const rectangle &rect); int point_in_circle(int x, int y, int center_x, int center_y, int r); int circle_collision(const rectangle &rect); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/starshp1.c -----------*/ diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h index 9a7d7881bfa..a3331334614 100644 --- a/src/mame/includes/starwars.h +++ b/src/mame/includes/starwars.h @@ -12,7 +12,8 @@ class starwars_state : public driver_device public: starwars_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_mathram(*this, "mathram"){ } + m_mathram(*this, "mathram"), + m_maincpu(*this, "maincpu") { } UINT8 m_sound_data; UINT8 m_main_data; @@ -71,6 +72,7 @@ public: void starwars_mproc_reset(); void run_mproc(); void esb_slapstic_tweak(address_space &space, offs_t offset); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h index 7f211f083d3..965f42bd2e7 100644 --- a/src/mame/includes/stfight.h +++ b/src/mame/includes/stfight.h @@ -6,7 +6,8 @@ public: m_text_char_ram(*this, "text_char_ram"), m_text_attr_ram(*this, "text_attr_ram"), m_vh_latch_ram(*this, "vh_latch_ram"), - m_sprite_ram(*this, "sprite_ram"){ } + m_sprite_ram(*this, "sprite_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_text_char_ram; required_shared_ptr<UINT8> m_text_attr_ram; @@ -52,4 +53,5 @@ public: void set_pens(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(stfight_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index f80f1ea15a0..b50e4a1c1ef 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -11,7 +11,8 @@ public: m_mlow_scrollram(*this, "mlow_scrollram"), m_mhigh_scrollram(*this, "mhigh_scrollram"), m_vidattrram(*this, "vidattrram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_bg_tilemap; tilemap_t *m_mlow_tilemap; @@ -45,4 +46,5 @@ public: virtual void video_start(); UINT32 screen_update_stlforce(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/includes/subs.h b/src/mame/includes/subs.h index 553d5db2bcb..9a54c5f3306 100644 --- a/src/mame/includes/subs.h +++ b/src/mame/includes/subs.h @@ -23,7 +23,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_discrete(*this, "discrete"){ } + m_discrete(*this, "discrete"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -54,6 +55,7 @@ public: DECLARE_WRITE8_MEMBER(subs_noise_reset_w); int subs_steering_1(); int subs_steering_2(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/subs.c -----------*/ diff --git a/src/mame/includes/superchs.h b/src/mame/includes/superchs.h index 97d66e19d85..b9d7061fd59 100644 --- a/src/mame/includes/superchs.h +++ b/src/mame/includes/superchs.h @@ -15,8 +15,8 @@ public: : driver_device(mconfig, type, tag), m_ram(*this,"ram"), m_spriteram(*this,"spriteram"), - m_shared_ram(*this,"shared_ram") - { } + m_shared_ram(*this,"shared_ram"), + m_maincpu(*this, "maincpu") { } UINT16 m_coin_word; required_shared_ptr<UINT32> m_ram; @@ -40,4 +40,5 @@ public: virtual void video_start(); UINT32 screen_update_superchs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,const int *primasks,int x_offs,int y_offs); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h index 196fdf5c58e..a03a8c71b6b 100644 --- a/src/mame/includes/suprloco.h +++ b/src/mame/includes/suprloco.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_videoram(*this, "videoram"), - m_scrollram(*this, "scrollram"){ } + m_scrollram(*this, "scrollram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -26,4 +27,5 @@ public: inline void draw_pixel(bitmap_ind16 &bitmap,const rectangle &cliprect,int x,int y,int color,int flip); void draw_sprite(bitmap_ind16 &bitmap,const rectangle &cliprect,int spr_number); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h index 1bd54a9b176..2ba61c4b42f 100644 --- a/src/mame/includes/suprridr.h +++ b/src/mame/includes/suprridr.h @@ -11,7 +11,8 @@ public: : driver_device(mconfig, type, tag), m_fgram(*this, "fgram"), m_bgram(*this, "bgram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } UINT8 m_nmi_enable; UINT8 m_sound_data; @@ -44,6 +45,7 @@ public: INTERRUPT_GEN_MEMBER(main_nmi_gen); TIMER_CALLBACK_MEMBER(delayed_sound_w); int suprridr_is_screen_flipped(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/suprridr.c -----------*/ diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index 28fa1c135ad..78bdee17d56 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -16,8 +16,8 @@ public: m_spr_ctrl(*this, "spr_ctrl"), m_screen_vregs(*this, "screen_vregs"), m_spr(*this, "vsystem_spr"), - m_audiocpu(*this, "audiocpu") - { } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_screen_videoram; @@ -56,4 +56,5 @@ public: virtual void video_start(); UINT32 screen_update_suprslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h index 8c170c9cffb..e5821c72364 100644 --- a/src/mame/includes/system1.h +++ b/src/mame/includes/system1.h @@ -9,7 +9,8 @@ public: m_ram(*this, "ram"), m_spriteram(*this, "spriteram"), m_nob_mcu_latch(*this, "nob_mcu_latch"), - m_nob_mcu_status(*this, "nob_mcu_status"){ } + m_nob_mcu_status(*this, "nob_mcu_status"), + m_maincpu(*this, "maincpu") { } optional_device<i8255_device> m_ppi8255; required_shared_ptr<UINT8> m_ram; @@ -120,4 +121,5 @@ public: void bank44_custom_w(UINT8 data, UINT8 prevdata); void bank0c_custom_w(UINT8 data, UINT8 prevdata); void dakkochn_custom_w(UINT8 data, UINT8 prevdata); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h index 4afa44a9ef5..21030e04b19 100644 --- a/src/mame/includes/tagteam.h +++ b/src/mame/includes/tagteam.h @@ -4,7 +4,8 @@ public: tagteam_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; @@ -30,4 +31,5 @@ public: UINT32 screen_update_tagteam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(sound_timer_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h index 5896c7343de..856dea2fea3 100644 --- a/src/mame/includes/taito_f3.h +++ b/src/mame/includes/taito_f3.h @@ -45,7 +45,8 @@ class taito_f3_state : public driver_device public: taito_f3_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_f3_ram(*this,"f3_ram") { } + m_f3_ram(*this,"f3_ram") , + m_maincpu(*this, "maincpu") { } UINT16 *m_videoram; UINT16 *m_spriteram; @@ -274,4 +275,5 @@ public: void screen_eof_f3(screen_device &screen, bool state); INTERRUPT_GEN_MEMBER(f3_interrupt2); TIMER_CALLBACK_MEMBER(f3_interrupt3); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index c1103c2e714..238b367748b 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -28,7 +28,8 @@ public: m_paletteram(*this, "paletteram"), m_audiocpu(*this, "audiocpu"), m_gradram(*this, "gradram"), - m_backregs(*this, "backregs") { } + m_backregs(*this, "backregs") , + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_m68000_mainram; @@ -92,4 +93,5 @@ public: void fill_poly( bitmap_ind16 &bitmap, const rectangle &cliprect, const struct taitoair_poly *q ); int projectEyeCoordToScreen(float* projectionMatrix,const int Res,INT16* eyePoint3d,int type); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/taitosj.h b/src/mame/includes/taitosj.h index e6619f40afc..183d3569f78 100644 --- a/src/mame/includes/taitosj.h +++ b/src/mame/includes/taitosj.h @@ -16,7 +16,8 @@ public: m_video_mode(*this, "video_mode"), m_video_priority(*this, "video_priority"), m_collision_reg(*this, "collision_reg"), - m_kikstart_scrollram(*this, "kikstart_scroll"){ } + m_kikstart_scrollram(*this, "kikstart_scroll"), + m_maincpu(*this, "maincpu") { } typedef void (taitosj_state::*copy_layer_func_t)(bitmap_ind16 &, const rectangle &, int, int *, rectangle *); @@ -114,4 +115,5 @@ public: void copy_layer(bitmap_ind16 &bitmap, const rectangle &cliprect,copy_layer_func_t copy_layer_func, int which, int *sprites_on, rectangle *sprite_areas); void copy_layers(bitmap_ind16 &bitmap, const rectangle &cliprect,copy_layer_func_t copy_layer_func, int *sprites_on, rectangle *sprite_areas); int video_update_common(bitmap_ind16 &bitmap, const rectangle &cliprect, copy_layer_func_t copy_layer_func); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h index b7f1c8ce140..42886f3a96c 100644 --- a/src/mame/includes/tank8.h +++ b/src/mame/includes/tank8.h @@ -32,7 +32,8 @@ public: m_pos_h_ram(*this, "pos_h_ram"), m_pos_v_ram(*this, "pos_v_ram"), m_pos_d_ram(*this, "pos_d_ram"), - m_team(*this, "team"){ } + m_team(*this, "team"), + m_maincpu(*this, "maincpu") { } int m_collision_index; required_shared_ptr<UINT8> m_video_ram; @@ -68,6 +69,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect); void tank8_set_collision(int index); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/tank8.c -----------*/ diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h index 6becdd5ccbc..2d69aad1149 100644 --- a/src/mame/includes/tankbatt.h +++ b/src/mame/includes/tankbatt.h @@ -4,7 +4,8 @@ public: tankbatt_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_bulletsram(*this, "bulletsram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_bulletsram; required_shared_ptr<UINT8> m_videoram; @@ -32,4 +33,5 @@ public: UINT32 screen_update_tankbatt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(tankbatt_interrupt); void draw_bullets(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h index 411b5427ca2..33e3318b37f 100644 --- a/src/mame/includes/tankbust.h +++ b/src/mame/includes/tankbust.h @@ -6,7 +6,8 @@ public: m_txtram(*this, "txtram"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } int m_latch; UINT32 m_timer1; @@ -47,4 +48,5 @@ public: TIMER_CALLBACK_MEMBER(soundlatch_callback); TIMER_CALLBACK_MEMBER(soundirqline_callback); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h index baef5e3432d..509c7db466a 100644 --- a/src/mame/includes/taotaido.h +++ b/src/mame/includes/taotaido.h @@ -7,8 +7,8 @@ public: m_spriteram2(*this, "spriteram2"), m_scrollram(*this, "scrollram"), m_bgram(*this, "bgram"), - m_spr(*this, "vsystem_spr") - { } + m_spr(*this, "vsystem_spr"), + m_maincpu(*this, "maincpu") { } int m_pending_command; required_shared_ptr<UINT16> m_spriteram; @@ -38,4 +38,5 @@ public: UINT32 screen_update_taotaido(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_taotaido(screen_device &screen, bool state); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h index 4c189bc1274..8a7f820fb94 100644 --- a/src/mame/includes/tatsumi.h +++ b/src/mame/includes/tatsumi.h @@ -20,7 +20,8 @@ public: m_roundup_r_ram(*this, "roundup_r_ram"), m_roundup_p_ram(*this, "roundup_p_ram"), m_roundup_l_ram(*this, "roundup_l_ram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") , + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT16> m_videoram; optional_shared_ptr<UINT16> m_cyclwarr_cpua_ram; @@ -127,6 +128,7 @@ public: INTERRUPT_GEN_MEMBER(roundup5_interrupt); DECLARE_READ8_MEMBER(tatsumi_hack_ym2151_r); DECLARE_READ8_MEMBER(tatsumi_hack_oki_r); + required_device<cpu_device> m_maincpu; }; /*----------- defined in machine/tatsumi.c -----------*/ diff --git a/src/mame/includes/taxidriv.h b/src/mame/includes/taxidriv.h index 2dbcb76f783..62a8bd5d23b 100644 --- a/src/mame/includes/taxidriv.h +++ b/src/mame/includes/taxidriv.h @@ -11,7 +11,8 @@ public: m_vram5(*this, "vram5"), m_vram6(*this, "vram6"), m_vram7(*this, "vram7"), - m_scroll(*this, "scroll"){ } + m_scroll(*this, "scroll"), + m_maincpu(*this, "maincpu") { } int m_s1; int m_s2; @@ -53,4 +54,5 @@ public: DECLARE_WRITE8_MEMBER(taxidriv_spritectrl_w); virtual void palette_init(); UINT32 screen_update_taxidriv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index 44a2e890f44..32ecac1f40c 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -8,7 +8,8 @@ public: m_txvideoram(*this, "txvideoram"), m_bgvideoram(*this, "bgvideoram"), m_bg2videoram(*this, "bg2videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } int m_adpcm_pos[2]; int m_adpcm_end[2]; @@ -58,4 +59,5 @@ public: void tbowl_adpcm_int(device_t *device, int chip); DECLARE_WRITE_LINE_MEMBER(tbowl_adpcm_int_1); DECLARE_WRITE_LINE_MEMBER(tbowl_adpcm_int_2); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h index 5a517b3b792..75788092975 100644 --- a/src/mame/includes/tceptor.h +++ b/src/mame/includes/tceptor.h @@ -10,7 +10,8 @@ public: m_bg_ram(*this, "bg_ram"), m_m68k_shared_ram(*this, "m68k_shared_ram"), m_sprite_ram(*this, "sprite_ram"), - m_c45_road(*this, "c45_road") { } + m_c45_road(*this, "c45_road") , + m_maincpu(*this, "maincpu") { } UINT8 m_m6809_irq_enable; UINT8 m_m68k_irq_enable; @@ -75,4 +76,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int sprite_priority); inline UINT8 fix_input0(UINT8 in1, UINT8 in2); inline UINT8 fix_input1(UINT8 in1, UINT8 in2); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index 6b59c2f3367..8d94016837f 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -6,7 +6,8 @@ public: m_txvideoram(*this, "txvideoram"), m_fgvideoram(*this, "fgvideoram"), m_bgvideoram(*this, "bgvideoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } int m_adpcm_pos; int m_adpcm_end; @@ -52,4 +53,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(tecmo_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index 282932f371d..b1897ad0f68 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -10,7 +10,8 @@ public: m_videoram2(*this, "videoram2"), m_colorram2(*this, "colorram2"), m_charram(*this, "charram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_colorram; @@ -52,4 +53,5 @@ public: DECLARE_VIDEO_START(ginkun); DECLARE_VIDEO_START(riot); UINT32 screen_update_tecmo16(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h index 39914faa7cc..2d0a4698f8a 100644 --- a/src/mame/includes/tecmosys.h +++ b/src/mame/includes/tecmosys.h @@ -22,7 +22,8 @@ public: m_b00000regs(*this, "b00000regs"), m_c00000regs(*this, "c00000regs"), m_c80000regs(*this, "c80000regs"), - m_880000regs(*this, "880000regs"){ } + m_880000regs(*this, "880000regs"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_tilemap_paletteram16; @@ -88,4 +89,5 @@ public: void tecmosys_do_final_mix(bitmap_rgb32 &bitmap); void tecmosys_descramble(); DECLARE_WRITE_LINE_MEMBER(sound_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h index f00c3f6c86f..95920c8d165 100644 --- a/src/mame/includes/tehkanwc.h +++ b/src/mame/includes/tehkanwc.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } int m_track0[2]; int m_track1[2]; @@ -51,4 +52,5 @@ public: void gridiron_draw_led(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 led,int player); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(tehkanwc_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h index 8b035bd17db..0b3b9803bb1 100644 --- a/src/mame/includes/terracre.h +++ b/src/mame/includes/terracre.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_amazon_videoram(*this, "amazon_videoram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; required_shared_ptr<UINT16> m_amazon_videoram; @@ -38,4 +39,5 @@ public: DECLARE_MACHINE_START(amazon); UINT32 screen_update_amazon(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/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h index 44b8114ac63..a23453f3dca 100644 --- a/src/mame/includes/tetrisp2.h +++ b/src/mame/includes/tetrisp2.h @@ -18,7 +18,8 @@ public: m_rocknms_sub_vram_bg(*this, "sub_vram_bg"), m_rocknms_sub_scroll_fg(*this, "sub_scroll_fg"), m_rocknms_sub_scroll_bg(*this, "sub_scroll_bg"), - m_rocknms_sub_rotregs(*this, "sub_rotregs"){ } + m_rocknms_sub_rotregs(*this, "sub_rotregs"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_spriteram; optional_shared_ptr<UINT16> m_spriteram2; @@ -115,6 +116,7 @@ public: TIMER_CALLBACK_MEMBER(rockn_timer_level1_callback); TIMER_CALLBACK_MEMBER(rockn_timer_sub_level1_callback); void init_rockn_timer(); + required_device<cpu_device> m_maincpu; }; class stepstag_state : public tetrisp2_state diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h index 13f532982f9..c4dea8d8e3b 100644 --- a/src/mame/includes/thepit.h +++ b/src/mame/includes/thepit.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_attributesram(*this, "attributesram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } int m_question_address; int m_question_rom; @@ -40,4 +41,5 @@ public: DECLARE_PALETTE_INIT(suprmous); UINT32 screen_update_thepit(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/includes/thief.h b/src/mame/includes/thief.h index 94403f9d219..5003486d99c 100644 --- a/src/mame/includes/thief.h +++ b/src/mame/includes/thief.h @@ -11,7 +11,8 @@ class thief_state : public driver_device { public: thief_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_input_select; @@ -40,4 +41,5 @@ public: UINT16 fetch_image_addr( coprocessor_t &thief_coprocessor ); void tape_set_audio( samples_device *samples, int track, int bOn ); void tape_set_motor( samples_device *samples, int bOn ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h index 834cf3b4692..4a75c6a1de7 100644 --- a/src/mame/includes/thoop2.h +++ b/src/mame/includes/thoop2.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_vregs(*this, "vregs"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_videoram; required_shared_ptr<UINT16> m_vregs; @@ -23,4 +24,5 @@ public: UINT32 screen_update_thoop2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void thoop2_sort_sprites(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h index 0834e2fa627..392a7ed154b 100644 --- a/src/mame/includes/tiamc1.h +++ b/src/mame/includes/tiamc1.h @@ -3,7 +3,8 @@ class tiamc1_state : public driver_device { public: tiamc1_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_tileram; UINT8 *m_charram; @@ -34,6 +35,7 @@ public: virtual void palette_init(); UINT32 screen_update_tiamc1(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/includes/tigeroad.h b/src/mame/includes/tigeroad.h index 9a8569cc941..9af7a284aa1 100644 --- a/src/mame/includes/tigeroad.h +++ b/src/mame/includes/tigeroad.h @@ -7,7 +7,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram") , m_videoram(*this, "videoram"), - m_ram16(*this, "ram16"){ } + m_ram16(*this, "ram16"), + m_maincpu(*this, "maincpu") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_videoram; @@ -31,4 +32,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); void f1dream_protection_w(address_space &space); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h index caa43e94a33..3af39140267 100644 --- a/src/mame/includes/timelimt.h +++ b/src/mame/includes/timelimt.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), m_bg_videoram(*this, "bg_videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; int m_nmi_enabled; @@ -31,4 +32,5 @@ public: UINT32 screen_update_timelimt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(timelimt_irq); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index 247d3254ec9..3887b3f4de9 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -21,7 +21,8 @@ public: tnzs_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_audiocpu(*this, "audiocpu"), - m_subcpu(*this, "sub") { } + m_subcpu(*this, "sub") , + m_maincpu(*this, "maincpu") { } /* memory pointers */ // UINT8 * m_paletteram; // currently this uses generic palette handling @@ -106,4 +107,5 @@ public: void mcu_reset( ); void mcu_handle_coins( int coin ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index cfc05a74f19..65375c62297 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -12,7 +12,8 @@ public: m_colorram1(*this, "colorram1"), m_colorram2(*this, "colorram2"), m_sharedram(*this, "sharedram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } int m_unk_reset_port; required_shared_ptr<UINT16> m_colorram1; @@ -161,6 +162,7 @@ public: void demonwld_driver_savestate(); void vimana_driver_savestate(); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index f000287743d..a533642a32c 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -20,8 +20,8 @@ public: m_txvideoram16_offs(*this, "txvram_offs"), m_txscrollram16(*this, "txscrollram16"), m_tx_gfxram16(*this, "tx_gfxram16"), - m_mainram16(*this, "mainram16") - { + m_mainram16(*this, "mainram16"), + m_maincpu(*this, "maincpu") { m_vdp0 = NULL; m_vdp1 = NULL; } @@ -138,4 +138,5 @@ public: void toaplan2_vblank_irq(int irq_line); DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(bbakraid_irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h index a4df2d029d6..6335159b9a2 100644 --- a/src/mame/includes/toki.h +++ b/src/mame/includes/toki.h @@ -9,7 +9,8 @@ public: m_background1_videoram16(*this, "bg1_vram16"), m_background2_videoram16(*this, "bg2_vram16"), m_videoram(*this, "videoram"), - m_scrollram16(*this, "scrollram16"){ } + m_scrollram16(*this, "scrollram16"), + m_maincpu(*this, "maincpu") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_background1_videoram16; @@ -43,4 +44,5 @@ public: void toki_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void tokib_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(toki_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index f6b74fc3e19..ece74c412d4 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_m68000_sharedram(*this, "m68k_shared"), - m_bg_image(*this, "bg_image"){ } + m_bg_image(*this, "bg_image"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -56,4 +57,5 @@ public: TIMER_CALLBACK_MEMBER(namcoio_run); void draw_background(bitmap_ind16 &bitmap); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT8 *spriteram_base); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index f721f5afbbc..eb508f42835 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -17,8 +17,8 @@ public: m_scroll2(*this, "scroll2"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), - m_sn(*this, "snsnd") - { } + m_sn(*this, "snsnd"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram2; @@ -70,4 +70,5 @@ public: INTERRUPT_GEN_MEMBER(vblank_nmi); INTERRUPT_GEN_MEMBER(yieartf_timer_irq); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h index 6e77d85d12b..630011d4f26 100644 --- a/src/mame/includes/travrusa.h +++ b/src/mame/includes/travrusa.h @@ -4,7 +4,8 @@ public: travrusa_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") { } /* memory pointers */ required_shared_ptr<UINT8> m_videoram; @@ -27,4 +28,5 @@ public: UINT32 screen_update_travrusa(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void set_scroll( ); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h index 7d90caf32c1..73557801375 100644 --- a/src/mame/includes/triplhnt.h +++ b/src/mame/includes/triplhnt.h @@ -25,7 +25,8 @@ public: m_vpos_ram(*this, "vpos_ram"), m_hpos_ram(*this, "hpos_ram"), m_orga_ram(*this, "orga_ram"), - m_code_ram(*this, "code_ram"){ } + m_code_ram(*this, "code_ram"), + m_maincpu(*this, "maincpu") { } UINT8 m_cmos[16]; UINT8 m_da_latch; @@ -55,6 +56,7 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); void triplhnt_set_collision(int code); void triplhnt_update_misc(address_space &space, int offset); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/truco.h b/src/mame/includes/truco.h index 9b653ca93df..8168fc357c5 100644 --- a/src/mame/includes/truco.h +++ b/src/mame/includes/truco.h @@ -4,7 +4,8 @@ public: truco_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_battery_ram(*this, "battery_ram"){ } + m_battery_ram(*this, "battery_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_battery_ram; @@ -18,4 +19,5 @@ public: virtual void palette_init(); UINT32 screen_update_truco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(truco_interrupt); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h index 2dba8a7059e..31ee8a7c580 100644 --- a/src/mame/includes/trucocl.h +++ b/src/mame/includes/trucocl.h @@ -4,7 +4,8 @@ public: trucocl_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_cur_dac_address; int m_cur_dac_address_index; @@ -24,4 +25,5 @@ public: UINT32 screen_update_trucocl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(trucocl_interrupt); TIMER_CALLBACK_MEMBER(dac_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h index 0c82a371832..2adcef2afaf 100644 --- a/src/mame/includes/tryout.h +++ b/src/mame/includes/tryout.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), - m_gfx_control(*this, "gfx_control"){ } + m_gfx_control(*this, "gfx_control"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_spriteram; @@ -36,4 +37,5 @@ public: virtual void palette_init(); UINT32 screen_update_tryout(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/includes/tsamurai.h b/src/mame/includes/tsamurai.h index ef8469f3f49..c018b3f42da 100644 --- a/src/mame/includes/tsamurai.h +++ b/src/mame/includes/tsamurai.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_bg_videoram(*this, "bg_videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } int m_nmi_enabled; int m_sound_command1; @@ -62,4 +63,5 @@ public: INTERRUPT_GEN_MEMBER(samurai_interrupt); INTERRUPT_GEN_MEMBER(vsgongf_sound_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tubep.h b/src/mame/includes/tubep.h index 633c1c817c9..d338bd9512f 100644 --- a/src/mame/includes/tubep.h +++ b/src/mame/includes/tubep.h @@ -6,7 +6,8 @@ public: m_textram(*this, "textram"), m_backgroundram(*this, "backgroundram"), m_sprite_colorsharedram(*this, "sprite_color"), - m_rjammer_backgroundram(*this, "rjammer_bgram"){ } + m_rjammer_backgroundram(*this, "rjammer_bgram"), + m_maincpu(*this, "maincpu") { } UINT8 m_sound_latch; UINT8 m_ls74; @@ -85,6 +86,7 @@ public: void tubep_vblank_end(); void tubep_setup_save_state(); DECLARE_WRITE_LINE_MEMBER(rjammer_adpcm_vck); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index bf681482dea..ea0e469f4e2 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_workram(*this, "workram"), m_videoram(*this, "videoram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } UINT8 m_control; required_shared_ptr<UINT8> m_workram; @@ -30,4 +31,5 @@ public: void draw_box(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_shell(bitmap_ind16 &bitmap, const rectangle &cliprect, int picture_code, int hposition,int vstart,int vstop,int vstretch,int hstretch); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h index 31b1c725d26..dba4c06823a 100644 --- a/src/mame/includes/twin16.h +++ b/src/mame/includes/twin16.h @@ -9,7 +9,8 @@ public: m_text_ram(*this, "text_ram"), m_videoram(*this, "videoram"), m_tile_gfx_ram(*this, "tile_gfx_ram"), - m_sprite_gfx_ram(*this, "sprite_gfx_ram"){ } + m_sprite_gfx_ram(*this, "sprite_gfx_ram"), + m_maincpu(*this, "maincpu") { } required_device<buffered_spriteram16_device> m_spriteram; required_shared_ptr<UINT16> m_text_ram; @@ -73,4 +74,5 @@ public: int twin16_spriteram_process_enable( ); void gfx_untangle( ); DECLARE_WRITE8_MEMBER(volume_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index 9796faa8461..59da7f9529c 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -14,8 +14,8 @@ public: : driver_device(mconfig, type, tag), m_sharedram(*this, "sharedram"), m_spriteram8(*this, "spriteram8"), - m_spriteram16(*this, "spriteram16") - { } + m_spriteram16(*this, "spriteram16"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT8> m_sharedram; optional_device<buffered_spriteram8_device> m_spriteram8; @@ -120,6 +120,7 @@ public: void toaplan0_coin_dsp_w(address_space &space, int offset, int data); void twincobr_driver_savestate(); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h index c185e341b98..d3339244797 100644 --- a/src/mame/includes/ultratnk.h +++ b/src/mame/includes/ultratnk.h @@ -10,7 +10,8 @@ class ultratnk_state : public driver_device public: ultratnk_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_da_latch; @@ -42,4 +43,5 @@ public: UINT32 screen_update_ultratnk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void screen_eof_ultratnk(screen_device &screen, bool state); TIMER_CALLBACK_MEMBER(nmi_callback); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/undrfire.h b/src/mame/includes/undrfire.h index f5858a2e4c8..05f52be3c6e 100644 --- a/src/mame/includes/undrfire.h +++ b/src/mame/includes/undrfire.h @@ -15,7 +15,8 @@ public: : driver_device(mconfig, type, tag), m_ram(*this, "ram"), m_shared_ram(*this, "shared_ram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") , + m_maincpu(*this, "maincpu") { } UINT16 m_coin_word; UINT16 m_port_sel; @@ -49,4 +50,5 @@ public: TIMER_CALLBACK_MEMBER(interrupt5); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,const int *primasks,int x_offs,int y_offs); void draw_sprites_cbombers(bitmap_ind16 &bitmap,const rectangle &cliprect,const int *primasks,int x_offs,int y_offs); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h index 87e4144d880..a2080c0ccea 100644 --- a/src/mame/includes/unico.h +++ b/src/mame/includes/unico.h @@ -7,7 +7,8 @@ public: m_scroll(*this, "scroll"), m_vram32(*this, "vram32"), m_scroll32(*this, "scroll32"), - m_spriteram(*this, "spriteram", 0){ } + m_spriteram(*this, "spriteram", 0), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT16> m_vram; optional_shared_ptr<UINT16> m_scroll; @@ -44,4 +45,5 @@ public: UINT32 screen_update_zeropnt2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void unico_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); void zeropnt2_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/usgames.h b/src/mame/includes/usgames.h index c2869684f83..9fdca29f66e 100644 --- a/src/mame/includes/usgames.h +++ b/src/mame/includes/usgames.h @@ -4,7 +4,8 @@ public: usgames_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_charram(*this, "charram"){ } + m_charram(*this, "charram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_charram; @@ -18,4 +19,5 @@ public: virtual void video_start(); virtual void palette_init(); UINT32 screen_update_usgames(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index 2f6c06a1ec2..0e54cd20b22 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -7,8 +7,8 @@ public: m_bg2videoram(*this, "bg2videoram"), m_fgvideoram(*this, "fgvideoram"), m_sprite_priority(*this, "sprite_priority"), - m_sharedram(*this, "sharedram") - { } + m_sharedram(*this, "sharedram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_bg1videoram; required_shared_ptr<UINT8> m_bg2videoram; @@ -43,4 +43,5 @@ public: UINT32 screen_update_vastar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); 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/includes/vball.h b/src/mame/includes/vball.h index cce39e64485..b045e3a9df1 100644 --- a/src/mame/includes/vball.h +++ b/src/mame/includes/vball.h @@ -6,7 +6,8 @@ public: m_vb_attribram(*this, "vb_attribram"), m_vb_videoram(*this, "vb_videoram"), m_vb_scrolly_lo(*this, "vb_scrolly_lo"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_vb_attribram; required_shared_ptr<UINT8> m_vb_videoram; @@ -38,4 +39,5 @@ public: void vb_mark_all_dirty( ); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); inline int scanline_to_vcount(int scanline); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/vertigo.h b/src/mame/includes/vertigo.h index f07165533a1..d166fcaefea 100644 --- a/src/mame/includes/vertigo.h +++ b/src/mame/includes/vertigo.h @@ -86,7 +86,8 @@ class vertigo_state : public driver_device public: vertigo_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_vectorram(*this, "vectorram") { } + m_vectorram(*this, "vectorram") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_vectorram; device_t *m_ttl74148; @@ -120,6 +121,7 @@ public: void vertigo_vgen (vector_generator *vg); void vertigo_vproc(int cycles, int irq4); void update_irq_encoder(int line, int state); + required_device<cpu_device> m_maincpu; }; /*----------- defined in machine/vertigo.c -----------*/ diff --git a/src/mame/includes/victory.h b/src/mame/includes/victory.h index 5a167613f2b..8ed93708819 100644 --- a/src/mame/includes/victory.h +++ b/src/mame/includes/victory.h @@ -35,7 +35,8 @@ public: victory_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_charram(*this, "charram") { } + m_charram(*this, "charram") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_charram; @@ -74,4 +75,5 @@ public: int command7(); void update_background(); void update_foreground(); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h index 777b88e28ec..9c8f6717c56 100644 --- a/src/mame/includes/videopin.h +++ b/src/mame/includes/videopin.h @@ -20,7 +20,8 @@ class videopin_state : public driver_device public: videopin_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") { } attotime m_time_pushed; attotime m_time_released; @@ -45,6 +46,7 @@ public: TIMER_CALLBACK_MEMBER(interrupt_callback); void update_plunger(); double calc_plunger_pos(); + required_device<cpu_device> m_maincpu; }; /*----------- defined in audio/videopin.c -----------*/ diff --git a/src/mame/includes/vigilant.h b/src/mame/includes/vigilant.h index ed02c4795fb..41434f1d451 100644 --- a/src/mame/includes/vigilant.h +++ b/src/mame/includes/vigilant.h @@ -4,7 +4,8 @@ public: vigilant_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_videoram; @@ -32,4 +33,5 @@ public: void draw_foreground(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority, int opaque ); void draw_background(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/includes/vsnes.h b/src/mame/includes/vsnes.h index 768c4672ca9..a7a15a8a03c 100644 --- a/src/mame/includes/vsnes.h +++ b/src/mame/includes/vsnes.h @@ -4,7 +4,8 @@ public: vsnes_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_1(*this, "work_ram_1"){ } + m_work_ram_1(*this, "work_ram_1"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_work_ram; optional_shared_ptr<UINT8> m_work_ram_1; @@ -107,6 +108,7 @@ public: void mapper4_irq( int scanline, int vblank, int blanked ); void ppu_irq_1(int *ppu_regs); void ppu_irq_2(int *ppu_regs); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/vsnes.c -----------*/ diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h index 818d1505459..86ef0c88dd5 100644 --- a/src/mame/includes/vulgus.h +++ b/src/mame/includes/vulgus.h @@ -7,7 +7,8 @@ public: m_scroll_high(*this, "scroll_high"), m_spriteram(*this, "spriteram"), m_fgvideoram(*this, "fgvideoram"), - m_bgvideoram(*this, "bgvideoram"){ } + m_bgvideoram(*this, "bgvideoram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_scroll_low; required_shared_ptr<UINT8> m_scroll_high; @@ -28,4 +29,5 @@ public: UINT32 screen_update_vulgus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vulgus_vblank_irq); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h index 22067b24493..1a47e9db92f 100644 --- a/src/mame/includes/warpwarp.h +++ b/src/mame/includes/warpwarp.h @@ -6,7 +6,8 @@ public: warpwarp_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_geebee_videoram(*this, "geebee_videoram"), - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT8> m_geebee_videoram; optional_shared_ptr<UINT8> m_videoram; @@ -50,6 +51,7 @@ public: INTERRUPT_GEN_MEMBER(vblank_irq); inline void geebee_plot(bitmap_ind16 &bitmap, const rectangle &cliprect, int x, int y, pen_t pen); void draw_ball(bitmap_ind16 &bitmap, const rectangle &cliprect,pen_t pen); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h index 1e677c7ea6d..9f13326ee07 100644 --- a/src/mame/includes/wc90.h +++ b/src/mame/includes/wc90.h @@ -18,7 +18,8 @@ public: m_scroll1yhi(*this, "scroll1yhi"), m_scroll2ylo(*this, "scroll2ylo"), m_scroll2yhi(*this, "scroll2yhi"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } typedef void (wc90_state::*draw_sprites_func)(bitmap_ind16 &, const rectangle &, int, int, int, int, int ); @@ -67,4 +68,5 @@ public: void draw_sprite_64x64(bitmap_ind16 &bitmap, const rectangle &cliprect, int code,int sx, int sy, int bank, int flags ); void draw_sprite_invalid(bitmap_ind16 &bitmap, const rectangle &cliprect, int code, int sx, int sy, int bank, int flags ); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h index 70c9172acfd..cd7afcb199c 100644 --- a/src/mame/includes/wc90b.h +++ b/src/mame/includes/wc90b.h @@ -11,7 +11,8 @@ public: m_scroll1y(*this, "scroll1y"), m_scroll2y(*this, "scroll2y"), m_scroll_x_lo(*this, "scroll_x_lo"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } int m_msm5205next; int m_toggle; @@ -43,4 +44,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority ); DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h index d1ed8787d48..d65d4107fb0 100644 --- a/src/mame/includes/wecleman.h +++ b/src/mame/includes/wecleman.h @@ -9,7 +9,8 @@ public: m_pageram(*this, "pageram"), m_txtram(*this, "txtram"), m_spriteram(*this, "spriteram"), - m_roadram(*this, "roadram"){ } + m_roadram(*this, "roadram"), + m_maincpu(*this, "maincpu") { } optional_shared_ptr<UINT16> m_videostatus; optional_shared_ptr<UINT16> m_protection_ram; @@ -84,6 +85,7 @@ public: void wecleman_unpack_sprites(); void bitswap(UINT8 *src,size_t len,int _14,int _13,int _12,int _11,int _10,int _f,int _e,int _d,int _c,int _b,int _a,int _9,int _8,int _7,int _6,int _5,int _4,int _3,int _2,int _1,int _0); void hotchase_sprite_decode( int num16_banks, int bank_size ); + required_device<cpu_device> m_maincpu; }; /*----------- defined in video/wecleman.c -----------*/ diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index 3cea97489e6..a66a3b237f4 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -8,8 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_pixelram(*this, "pixelram"), m_charvideoram(*this, "charvideoram"), - m_spr_old(*this, "vsystem_spr_old") - { } + m_spr_old(*this, "vsystem_spr_old"), + m_maincpu(*this, "maincpu") { } int m_pending_command; @@ -43,4 +43,5 @@ public: UINT32 screen_update_welltris(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h index da1827ef222..fbe85b2e533 100644 --- a/src/mame/includes/williams.h +++ b/src/mame/includes/williams.h @@ -17,8 +17,8 @@ public: m_videoram(*this, "videoram"), m_blaster_palette_0(*this, "blaster_pal0"), m_blaster_scanline_control(*this, "blaster_scan"), - m_williams2_tileram(*this, "williams2_tile") - { } + m_williams2_tileram(*this, "williams2_tile"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_nvram; UINT8 *m_mayday_protection; @@ -146,6 +146,7 @@ public: /* newer-Williams routines */ DECLARE_WRITE_LINE_MEMBER(mysticm_main_irq); DECLARE_WRITE_LINE_MEMBER(tshoot_main_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/wiping.h b/src/mame/includes/wiping.h index 967c4d61997..a85f516f117 100644 --- a/src/mame/includes/wiping.h +++ b/src/mame/includes/wiping.h @@ -5,7 +5,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; @@ -24,4 +25,5 @@ public: UINT32 screen_update_wiping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(vblank_irq); INTERRUPT_GEN_MEMBER(sound_timer_irq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/wiz.h b/src/mame/includes/wiz.h index 166702d1204..c1a63b07636 100644 --- a/src/mame/includes/wiz.h +++ b/src/mame/includes/wiz.h @@ -10,7 +10,8 @@ public: m_videoram(*this, "videoram"), m_attributesram(*this, "attributesram"), m_spriteram(*this, "spriteram"), - m_sprite_bank(*this, "sprite_bank"){ } + m_sprite_bank(*this, "sprite_bank"), + m_maincpu(*this, "maincpu") { } int m_dsc0; int m_dsc1; @@ -56,4 +57,5 @@ public: void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int bank, int colortype); void draw_foreground(bitmap_ind16 &bitmap, const rectangle &cliprect, int colortype); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, UINT8* sprite_ram,int bank); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/wolfpack.h b/src/mame/includes/wolfpack.h index 996925524a1..180cfcdd2a9 100644 --- a/src/mame/includes/wolfpack.h +++ b/src/mame/includes/wolfpack.h @@ -3,7 +3,8 @@ class wolfpack_state : public driver_device public: wolfpack_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_alpha_num_ram(*this, "alpha_num_ram"){ } + m_alpha_num_ram(*this, "alpha_num_ram"), + m_maincpu(*this, "maincpu") { } int m_collision; required_shared_ptr<UINT8> m_alpha_num_ram; @@ -61,4 +62,5 @@ public: void draw_torpedo(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_pt(bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_water(colortable_t *colortable, bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h index 10ce1ee40c7..6a85d9e52d5 100644 --- a/src/mame/includes/wrally.h +++ b/src/mame/includes/wrally.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_vregs(*this, "vregs"), m_spriteram(*this, "spriteram"), - m_shareram(*this, "shareram"){ } + m_shareram(*this, "shareram"), + m_maincpu(*this, "maincpu") { } tilemap_t *m_pant[2]; required_shared_ptr<UINT16> m_videoram; @@ -26,4 +27,5 @@ public: virtual void video_start(); UINT32 screen_update_wrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index b073eda67be..7bad4e19f7d 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_spriteram(*this, "spriteram"), m_fg0_videoram(*this, "fg0_videoram"), - m_bg0_videoram(*this, "bg0_videoram"){ } + m_bg0_videoram(*this, "bg0_videoram"), + m_maincpu(*this, "maincpu") { } int m_vblank; int m_scrollx; @@ -29,4 +30,5 @@ public: UINT32 screen_update_wwfsstar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(wwfsstar_scanline); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/wwfwfest.h b/src/mame/includes/wwfwfest.h index 2c5692978d9..d81f8b8e801 100644 --- a/src/mame/includes/wwfwfest.h +++ b/src/mame/includes/wwfwfest.h @@ -8,7 +8,8 @@ public: m_fg0_videoram(*this, "fg0_videoram"), m_bg0_videoram(*this, "bg0_videoram"), m_bg1_videoram(*this, "bg1_videoram"), - m_spriteram(*this, "spriteram") { } + m_spriteram(*this, "spriteram") , + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT16> m_fg0_videoram; required_shared_ptr<UINT16> m_bg0_videoram; @@ -46,4 +47,5 @@ public: UINT32 screen_update_wwfwfest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_DEVICE_CALLBACK_MEMBER(wwfwfest_scanline); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h index b443451dea8..7fd9e018c17 100644 --- a/src/mame/includes/xain.h +++ b/src/mame/includes/xain.h @@ -6,7 +6,8 @@ public: m_charram(*this, "charram"), m_bgram0(*this, "bgram0"), m_bgram1(*this, "bgram1"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } int m_vblank; int m_from_main; @@ -73,4 +74,5 @@ public: void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); inline int scanline_to_vcount(int scanline); DECLARE_WRITE_LINE_MEMBER(irqhandler); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h index e7393c18a94..837779b2f6e 100644 --- a/src/mame/includes/xorworld.h +++ b/src/mame/includes/xorworld.h @@ -4,7 +4,8 @@ public: xorworld_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<UINT16> m_videoram; tilemap_t *m_bg_tilemap; @@ -21,4 +22,5 @@ public: virtual void palette_init(); UINT32 screen_update_xorworld(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/includes/xxmissio.h b/src/mame/includes/xxmissio.h index 5e434eab9f5..a6ebef4baa9 100644 --- a/src/mame/includes/xxmissio.h +++ b/src/mame/includes/xxmissio.h @@ -5,7 +5,8 @@ public: : driver_device(mconfig, type, tag), m_bgram(*this, "bgram"), m_fgram(*this, "fgram"), - m_spriteram(*this, "spriteram"){ } + m_spriteram(*this, "spriteram"), + m_maincpu(*this, "maincpu") { } UINT8 m_status; required_shared_ptr<UINT8> m_bgram; @@ -34,4 +35,5 @@ public: DECLARE_WRITE8_MEMBER(xxmissio_scroll_x_w); DECLARE_WRITE8_MEMBER(xxmissio_scroll_y_w); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_element *gfx); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index a5f30313e8e..e4ef11175ce 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -3,7 +3,8 @@ class xyonix_state : public driver_device public: xyonix_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_vidram(*this, "vidram"){ } + m_vidram(*this, "vidram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_vidram; tilemap_t *m_tilemap; @@ -21,4 +22,5 @@ public: virtual void palette_init(); UINT32 screen_update_xyonix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void handle_coins(int coin); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h index cec726a3b2d..84fe13ff0ed 100644 --- a/src/mame/includes/yiear.h +++ b/src/mame/includes/yiear.h @@ -8,8 +8,8 @@ public: m_spriteram(*this, "spriteram"), m_spriteram2(*this, "spriteram2"), m_videoram(*this, "videoram"), - m_sn(*this, "snsnd") - { } + m_sn(*this, "snsnd"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT8> m_spriteram; @@ -39,4 +39,5 @@ public: INTERRUPT_GEN_MEMBER(yiear_vblank_interrupt); INTERRUPT_GEN_MEMBER(yiear_nmi_interrupt); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index 7d2b0ce2dc7..88e62277568 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -15,7 +15,8 @@ public: m_scrollram_1(*this, "scrollram_1"), m_priorityram(*this, "priorityram"), m_spriteram(*this, "spriteram"), - m_audiocpu(*this, "audiocpu"){ } + m_audiocpu(*this, "audiocpu"), + m_maincpu(*this, "maincpu") { } /* memory pointers */ required_shared_ptr<UINT16> m_vram_0; @@ -48,4 +49,5 @@ public: UINT32 screen_update_yunsun16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); DECLARE_WRITE_LINE_MEMBER(soundirq); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index c927adc8b01..a82b2f6a0c9 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -9,7 +9,8 @@ class yunsung8_state : public driver_device public: yunsung8_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 */ tilemap_t *m_tilemap_0; @@ -42,4 +43,5 @@ public: virtual void video_start(); UINT32 screen_update_yunsung8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(yunsung8_adpcm_int); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h index 38adf87d8de..42b2aaf8362 100644 --- a/src/mame/includes/zac2650.h +++ b/src/mame/includes/zac2650.h @@ -4,7 +4,8 @@ public: zac2650_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), m_videoram(*this, "videoram"), - m_s2636_0_ram(*this, "s2636_0_ram"){ } + m_s2636_0_ram(*this, "s2636_0_ram"), + m_maincpu(*this, "maincpu") { } required_shared_ptr<UINT8> m_videoram; required_shared_ptr<UINT8> m_s2636_0_ram; @@ -24,4 +25,5 @@ public: UINT32 screen_update_tinvader(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); int SpriteCollision(int first,int second); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h index 3e3190f2dab..08fa68c7982 100644 --- a/src/mame/includes/zaccaria.h +++ b/src/mame/includes/zaccaria.h @@ -6,7 +6,8 @@ public: m_videoram(*this, "videoram"), m_attributesram(*this, "attributesram"), m_spriteram(*this, "spriteram"), - m_spriteram2(*this, "spriteram2"){ } + m_spriteram2(*this, "spriteram2"), + m_maincpu(*this, "maincpu") { } int m_dsw; int m_active_8910; @@ -48,4 +49,5 @@ public: INTERRUPT_GEN_MEMBER(zaccaria_cb1_toggle); INTERRUPT_GEN_MEMBER(vblank_irq); void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,UINT8 *spriteram,int color,int section); + required_device<cpu_device> m_maincpu; }; diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index 1ae17792e6d..770a8777550 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -11,7 +11,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; optional_shared_ptr<UINT8> m_spriteram; @@ -84,6 +85,7 @@ public: inline int find_minimum_x(UINT8 value, int flip); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT16 flipxmask, UINT16 flipymask); void zaxxonj_decode(const char *cputag); + required_device<cpu_device> m_maincpu; }; |