added m_maincpu to the rest of drivers in mame (nw)

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) )

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;
 };

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;
 };

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;
 };

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;
 };

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 -----------*/

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;
 };

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;
 };

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 */

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;
 };

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;
 };

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;
 };

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;
 };

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 */

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;
 };

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;
 };

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;
 };

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;
 };

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

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;
 };
 
 

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;
 };

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 -----------*/

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 -----------*/

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;
 };

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;
 };
 
 

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;
 };

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 -----------*/

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;
 };
 
 

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;
 };

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;
 };

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;
 };

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 -----------*/

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;
 };

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;
 };

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;
 };

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;
 };

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 -----------*/

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;
 };

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;
 };

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 -----------*/

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;
 };

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;
 };

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;
 };

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;
 };

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 -----------*/

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;
 };

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;
 };

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;
 };
 
 

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;
 };
 
 

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;
 };

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;
 };

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;
 };
 
 

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;
 };

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;
 };
 
 

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;
 };

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 -----------*/

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;
 };

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;
 };

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;
 };

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;
 };

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 -----------*/

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;
 };

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;
 };

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;
 };

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;
 };

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;
 };

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;
 };

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;
 };

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 -----------*/

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;
 };

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;
 };
 
 

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;
 };
 
 

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;
 };

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;
 };

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;
 };

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;
 };

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 ----------*/

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;
 };

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;
 };

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;
 };

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;
 };

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;
 };
 
 

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;
 };

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;
 };

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 -----------*/

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 -----------*/

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;
 };

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;
 };

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 -----------*/

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;
 };

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;
 };

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;
 };

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;
 };

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;
 };

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;
 };

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;
 };

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 -----------*/

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;
 };
 
 

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 -----------*/

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;
 };