moved cpu_device * to required_device in existing driver state classes (nw)

src/mame/drivers/1942.c

@@ -238,7 +238,6 @@ GFXDECODE_END
 
 void _1942_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_palette_bank));
 	save_item(NAME(m_scroll));

src/mame/drivers/20pacgal.c

@@ -339,7 +339,6 @@ INPUT_PORTS_END
 
 void _20pacgal_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_eeprom = machine().device("eeprom");
 
 	save_item(NAME(m_game_selected));

src/mame/drivers/2mindril.c

@@ -43,7 +43,8 @@ class _2mindril_state : public taito_f3_state
 public:
 	_2mindril_state(const machine_config &mconfig, device_type type, const char *tag)
 		: taito_f3_state(mconfig, type, tag),
-			m_iodata(*this, "iodata") { }
+		m_iodata(*this, "iodata"),
+		m_maincpu(*this, "maincpu") { }
 
 	/* memory pointers */
 	required_shared_ptr<UINT16> m_iodata;
@@ -54,7 +55,7 @@ public:
 	UINT16        irq_reg;
 
 	/* devices */
-	cpu_device *m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	DECLARE_READ16_MEMBER(drill_io_r);
 	DECLARE_WRITE16_MEMBER(drill_io_w);
 	DECLARE_WRITE16_MEMBER(sensors_w);
@@ -422,7 +423,6 @@ static const ym2610_interface ym2610_config =
 
 MACHINE_START_MEMBER(_2mindril_state,drill)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	save_item(NAME(m_defender_sensor));
 	save_item(NAME(m_shutter_sensor));

src/mame/drivers/40love.c

@@ -974,7 +974,6 @@ static const msm5232_interface msm5232_config =
 
 MACHINE_START_MEMBER(fortyl_state,40love)
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	/* video */
 	save_item(NAME(m_pix1));

src/mame/drivers/88games.c

@@ -300,7 +300,6 @@ static KONAMI_SETLINES_CALLBACK( k88games_banking )
 
 void _88games_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k052109 = machine().device("k052109");
 	m_k051960 = machine().device("k051960");
 	m_k051316 = machine().device("k051316");

src/mame/drivers/actfancr.c

@@ -289,8 +289,6 @@ static const ym3812_interface ym3812_config =
 
 MACHINE_START_MEMBER(actfancr_state,actfancr)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 }
 
 MACHINE_START_MEMBER(actfancr_state,triothep)

src/mame/drivers/adp.c

@@ -157,8 +157,9 @@ class adp_state : public driver_device
 public:
 	adp_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-			m_h63484(*this, "h63484"),
-			m_microtouch(*this, "microtouch")
+		m_h63484(*this, "h63484"),
+		m_microtouch(*this, "microtouch"),
+		m_maincpu(*this, "maincpu")
 		{ }
 
 	required_device<h63484_device> m_h63484;
@@ -173,7 +174,7 @@ public:
 	struct { int r,g,b,offs,offs_internal; } m_pal;
 
 	/* devices */
-	cpu_device *m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	device_t *m_duart;
 	DECLARE_READ16_MEMBER(test_r);
 	DECLARE_WRITE16_MEMBER(wh2_w);
@@ -301,7 +302,6 @@ static const microtouch_interface adb_microtouch_config =
 
 MACHINE_START_MEMBER(adp_state,skattv)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_duart = machine().device("duart68681");
 	//m_h63484 = machine().device("h63484");
 

src/mame/drivers/aerofgt.c

@@ -1293,7 +1293,6 @@ static const ym3812_interface ym3812_config =
 
 MACHINE_START_MEMBER(aerofgt_state,common)
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	save_item(NAME(m_pending_command));
 }
 

src/mame/drivers/airbustr.c

@@ -580,7 +580,6 @@ void airbustr_state::machine_start()
 
 	m_master = machine().device("master");
 	m_slave = machine().device("slave");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_pandora = machine().device("pandora");
 
 	save_item(NAME(m_soundlatch_status));

src/mame/drivers/aliens.c

@@ -220,8 +220,6 @@ void aliens_state::machine_start()
 	membank("bank1")->configure_entries(0, 20, &ROM[0x10000], 0x2000);
 	membank("bank1")->set_entry(0);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k007232 = machine().device("k007232");
 	m_k052109 = machine().device("k052109");
 	m_k051960 = machine().device("k051960");

src/mame/drivers/alpha68k.c

@@ -1862,7 +1862,6 @@ static const ym3812_interface ym3812_config =
 
 MACHINE_START_MEMBER(alpha68k_state,common)
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_trigstate));
 	save_item(NAME(m_deposits1));

src/mame/drivers/amspdwy.c

@@ -240,7 +240,6 @@ GFXDECODE_END
 
 void amspdwy_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_flipscreen));
 	save_item(NAME(m_wheel_old));

src/mame/drivers/angelkds.c

@@ -569,7 +569,6 @@ GFXDECODE_END
 
 void angelkds_state::machine_start()
 {
-	m_subcpu = machine().device<cpu_device>("sub");
 
 	save_item(NAME(m_layer_ctrl));
 	save_item(NAME(m_txbank));

src/mame/drivers/aquarium.c

@@ -289,7 +289,6 @@ GFXDECODE_END
 
 void aquarium_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_aquarium_snd_ack));
 }

src/mame/drivers/ashnojoe.c

@@ -327,7 +327,6 @@ static const msm5205_interface msm5205_config =
 
 void ashnojoe_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_adpcm_byte));
 	save_item(NAME(m_soundlatch_status));

src/mame/drivers/asterix.c

@@ -240,8 +240,6 @@ static const k05324x_interface asterix_k05324x_intf =
 
 void asterix_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k053260 = machine().device("k053260");
 	m_k056832 = machine().device("k056832");
 	m_k053244 = machine().device("k053244");

src/mame/drivers/astrof.c

@@ -467,7 +467,6 @@ MACHINE_START_MEMBER(astrof_state,astrof)
 	/* the 74175 outputs all HI's if not otherwise set */
 	astrof_set_video_control_2(0xff);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_samples = machine().device<samples_device>("samples");
 
 	/* register for state saving */
@@ -497,7 +496,6 @@ MACHINE_START_MEMBER(astrof_state,spfghmk2)
 	/* the 74175 outputs all HI's if not otherwise set */
 	spfghmk2_set_video_control_2(0xff);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	/* the red background circuit is disabled */
 	m_red_on = FALSE;
@@ -514,7 +512,6 @@ MACHINE_START_MEMBER(astrof_state,tomahawk)
 	/* the 74175 outputs all HI's if not otherwise set */
 	tomahawk_set_video_control_2(0xff);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_sn = machine().device("snsnd");
 
 	/* register for state saving */

src/mame/drivers/asuka.c

@@ -824,8 +824,6 @@ static const tc0110pcr_interface asuka_tc0110pcr_intf =
 
 void asuka_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_pc090oj = machine().device("pc090oj");
 	m_tc0100scn = machine().device("tc0100scn");
 

src/mame/drivers/atarifb.c

@@ -506,7 +506,6 @@ GFXDECODE_END
 
 void atarifb_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	save_item(NAME(m_CTRLD));
 	save_item(NAME(m_sign_x_1));

src/mame/drivers/battlane.c

@@ -266,8 +266,6 @@ static const ym3526_interface ym3526_config =
 
 void battlane_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_subcpu = machine().device<cpu_device>("sub");
 
 	save_item(NAME(m_video_ctrl));
 	save_item(NAME(m_cpu_control));

src/mame/drivers/battlnts.c

@@ -226,7 +226,6 @@ void battlnts_state::machine_start()
 
 	membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000);
 
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k007342 = machine().device("k007342");
 	m_k007420 = machine().device("k007420");
 

src/mame/drivers/beaminv.c

@@ -61,7 +61,8 @@ class beaminv_state : public driver_device
 public:
 	beaminv_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;
@@ -73,7 +74,7 @@ public:
 	UINT8      m_controller_select;
 
 	/* devices */
-	cpu_device *m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	DECLARE_READ8_MEMBER(v128_r);
 	DECLARE_WRITE8_MEMBER(controller_select_w);
 	DECLARE_READ8_MEMBER(controller_r);
@@ -140,7 +141,6 @@ void beaminv_state::machine_start()
 {
 	create_interrupt_timer();
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	/* setup for save states */
 	save_item(NAME(m_controller_select));

src/mame/drivers/beezer.c

@@ -79,7 +79,6 @@ INPUT_PORTS_END
 
 void beezer_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 }
 
 static MACHINE_CONFIG_START( beezer, beezer_state )

src/mame/drivers/bigevglf.c

@@ -414,7 +414,6 @@ static const msm5232_interface msm5232_config =
 
 void bigevglf_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_mcu = machine().device("mcu");
 
 	save_item(NAME(m_vidram_bank));

src/mame/drivers/bishi.c

@@ -387,7 +387,6 @@ static const k054338_interface bishi_k054338_intf =
 
 void bishi_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_k056832 = machine().device("k056832");
 	m_k054338 = machine().device("k054338");
 	m_k055555 = machine().device("k055555");

src/mame/drivers/bking.c

@@ -390,7 +390,6 @@ static const ay8910_interface ay8910_config =
 
 void bking_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	/* video */
 	save_item(NAME(m_pc3259_output));

src/mame/drivers/bladestl.c

@@ -304,7 +304,6 @@ void bladestl_state::machine_start()
 
 	membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x2000);
 
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k007342 = machine().device("k007342");
 	m_k007420 = machine().device("k007420");
 

src/mame/drivers/blktiger.c

@@ -276,7 +276,6 @@ static const ym2203_interface ym2203_config =
 
 void blktiger_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_mcu = machine().device("mcu");
 
 	/* configure bankswitching */

src/mame/drivers/blockhl.c

@@ -186,8 +186,6 @@ void blockhl_state::machine_start()
 
 	membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x2000);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k052109 = machine().device("k052109");
 	m_k051960 = machine().device("k051960");
 

src/mame/drivers/blockout.c

@@ -271,8 +271,6 @@ WRITE_LINE_MEMBER(blockout_state::irq_handler)
 
 void blockout_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_color));
 }

src/mame/drivers/bottom9.c

@@ -315,8 +315,6 @@ void bottom9_state::machine_start()
 
 	membank("bank1")->configure_entries(0, 12, &ROM[0x10000], 0x2000);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k052109 = machine().device("k052109");
 	m_k051960 = machine().device("k051960");
 	m_k051316 = machine().device("k051316");

src/mame/drivers/boxer.c

@@ -26,7 +26,8 @@ public:
 	boxer_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag) ,
 		m_tile_ram(*this, "tile_ram"),
-		m_sprite_ram(*this, "sprite_ram"){ }
+		m_sprite_ram(*this, "sprite_ram"),
+		m_maincpu(*this, "maincpu"){ }
 
 	/* memory pointers */
 	required_shared_ptr<UINT8> m_tile_ram;
@@ -37,7 +38,7 @@ public:
 	UINT8 m_pot_latch;
 
 	/* devices */
-	cpu_device *m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	DECLARE_READ8_MEMBER(boxer_input_r);
 	DECLARE_READ8_MEMBER(boxer_misc_r);
 	DECLARE_WRITE8_MEMBER(boxer_bell_w);
@@ -427,7 +428,6 @@ GFXDECODE_END
 
 void boxer_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	save_item(NAME(m_pot_state));
 	save_item(NAME(m_pot_latch));

src/mame/drivers/brkthru.c

@@ -363,8 +363,6 @@ static const ym3526_interface ym3526_config =
 
 void brkthru_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_bgscroll));
 	save_item(NAME(m_bgbasecolor));

src/mame/drivers/btime.c

@@ -1240,8 +1240,6 @@ DISCRETE_SOUND_END
 
 MACHINE_START_MEMBER(btime_state,btime)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_btime_palette));
 	save_item(NAME(m_bnj_scroll1));

src/mame/drivers/bublbobl.c

@@ -721,9 +721,7 @@ static const ym2203_interface ym2203_config =
 
 MACHINE_START_MEMBER(bublbobl_state,common)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_mcu = machine().device("mcu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_slave = machine().device("slave");
 
 	save_item(NAME(m_sound_nmi_enable));

src/mame/drivers/buggychl.c

@@ -361,7 +361,6 @@ void buggychl_state::machine_start()
 
 	membank("bank1")->configure_entries(0, 6, &ROM[0x10000], 0x2000);
 
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_sound_nmi_enable));
 	save_item(NAME(m_pending_nmi));

src/mame/drivers/bwing.c

@@ -331,9 +331,6 @@ GFXDECODE_END
 
 void bwing_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_subcpu = machine().device<cpu_device>("sub");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_palatch));
 	save_item(NAME(m_srbank));

src/mame/drivers/capbowl.c

@@ -334,8 +334,6 @@ static const ym2203_interface ym2203_config =
 
 void capbowl_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_blitter_addr));
 	save_item(NAME(m_last_trackball_val[0]));

src/mame/drivers/cave.c

@@ -1791,8 +1791,6 @@ GFXDECODE_END
 
 MACHINE_START_MEMBER(cave_state,cave)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_soundbuf_len));
 	save_item(NAME(m_soundbuf_data));

src/mame/drivers/cball.c

@@ -13,7 +13,8 @@ class cball_state : public driver_device
 public:
 	cball_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")
 	{ }
 
 	/* memory pointers */
@@ -23,7 +24,7 @@ public:
 	tilemap_t* m_bg_tilemap;
 
 	/* devices */
-	cpu_device *m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	DECLARE_WRITE8_MEMBER(cball_vram_w);
 	DECLARE_READ8_MEMBER(cball_wram_r);
 	DECLARE_WRITE8_MEMBER(cball_wram_w);
@@ -91,7 +92,6 @@ TIMER_CALLBACK_MEMBER(cball_state::interrupt_callback)
 
 void cball_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 }
 
 void cball_state::machine_reset()

src/mame/drivers/cbuster.c

@@ -291,8 +291,6 @@ static const deco16ic_interface twocrude_deco16ic_tilegen2_intf =
 
 void cbuster_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_deco_tilegen1 = machine().device("tilegen1");
 	m_deco_tilegen2 = machine().device("tilegen2");
 

src/mame/drivers/champbas.c

@@ -574,7 +574,6 @@ GFXDECODE_END
 
 MACHINE_START_MEMBER(champbas_state,champbas)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_mcu = machine().device(CPUTAG_MCU);
 
 	save_item(NAME(m_watchdog_count));
@@ -584,7 +583,6 @@ MACHINE_START_MEMBER(champbas_state,champbas)
 
 MACHINE_START_MEMBER(champbas_state,exctsccr)
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	// FIXME
 	machine().scheduler().timer_pulse(attotime::from_hz(75), timer_expired_delegate(FUNC(champbas_state::exctsccr_fm_callback),this)); /* updates fm */

src/mame/drivers/chanbara.c

@@ -62,7 +62,8 @@ public:
 		m_colorram(*this, "colorram"),
 		m_spriteram(*this, "spriteram"),
 		m_videoram2(*this, "videoram2"),
-		m_colorram2(*this, "colorram2"){ }
+		m_colorram2(*this, "colorram2"),
+		m_maincpu(*this, "maincpu"){ }
 
 	/* memory pointers */
 	required_shared_ptr<UINT8> m_videoram;
@@ -78,7 +79,7 @@ public:
 	UINT8    m_scrollhi;
 
 	/* devices */
-	cpu_device *m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	DECLARE_WRITE8_MEMBER(chanbara_videoram_w);
 	DECLARE_WRITE8_MEMBER(chanbara_colorram_w);
 	DECLARE_WRITE8_MEMBER(chanbara_videoram2_w);
@@ -384,7 +385,6 @@ static const ym2203_interface ym2203_config =
 
 void chanbara_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	save_item(NAME(m_scroll));
 	save_item(NAME(m_scrollhi));

src/mame/drivers/cheekyms.c

@@ -109,7 +109,6 @@ GFXDECODE_END
 
 void cheekyms_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_dac = machine().device<dac_device>("dac");
 }
 

src/mame/drivers/chinagat.c

@@ -531,7 +531,6 @@ static const ym2203_interface ym2203_config =
 
 MACHINE_START_MEMBER(chinagat_state,chinagat)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_sub_cpu = machine().device("sub");
 	m_snd_cpu = machine().device("audiocpu");
 

src/mame/drivers/chqflag.c

@@ -311,8 +311,6 @@ void chqflag_state::machine_start()
 
 	membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x2000);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k051316_1 = machine().device("k051316_1");
 	m_k051316_2 = machine().device("k051316_2");
 	m_k051960 = machine().device("k051960");

src/mame/drivers/circus.c

@@ -263,7 +263,6 @@ GFXDECODE_END
 ***************************************************************************/
 void circus_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_samples = machine().device<samples_device>("samples");
 
 	save_item(NAME(m_clown_x));

src/mame/drivers/circusc.c

@@ -58,7 +58,6 @@ To enter service mode, keep 1&2 pressed on reset
 
 void circusc_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_dac = machine().device<dac_device>("dac");
 
 	save_item(NAME(m_sn_latch));

src/mame/drivers/citycon.c

@@ -188,7 +188,6 @@ static const ym2203_interface ym2203_config =
 
 void citycon_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	save_item(NAME(m_bg_image));
 }

src/mame/drivers/cntsteer.c

@@ -37,7 +37,10 @@ public:
 		m_spriteram(*this, "spriteram"),
 		m_videoram(*this, "videoram"),
 		m_colorram(*this, "colorram"),
-		m_videoram2(*this, "videoram2"){ }
+		m_videoram2(*this, "videoram2"),
+		m_maincpu(*this, "maincpu"),
+		m_audiocpu(*this, "audiocpu"),
+		m_subcpu(*this, "subcpu"){ }
 
 	/* memory pointers */
 	required_shared_ptr<UINT8> m_spriteram;
@@ -63,9 +66,9 @@ public:
 	int      m_nmimask; // zerotrgt only
 
 	/* devices */
-	cpu_device *m_maincpu;
-	cpu_device *m_audiocpu;
-	cpu_device *m_subcpu;
+	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_audiocpu;
+	required_device<cpu_device> m_subcpu;
 	DECLARE_WRITE8_MEMBER(zerotrgt_vregs_w);
 	DECLARE_WRITE8_MEMBER(cntsteer_vregs_w);
 	DECLARE_WRITE8_MEMBER(cntsteer_foreground_vram_w);
@@ -817,10 +820,6 @@ GFXDECODE_END
 
 MACHINE_START_MEMBER(cntsteer_state,cntsteer)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
-	m_subcpu = machine().device<cpu_device>("subcpu");
-
 	save_item(NAME(m_flipscreen));
 	save_item(NAME(m_bg_bank));
 	save_item(NAME(m_scrolly));

src/mame/drivers/combatsc.c

@@ -678,7 +678,6 @@ MACHINE_START_MEMBER(combatsc_state,combatsc)
 
 	m_interleave_timer = machine().scheduler().timer_alloc(FUNC_NULL);
 
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k007121_1 = machine().device("k007121_1");
 	m_k007121_2 = machine().device("k007121_2");
 

src/mame/drivers/commando.c

@@ -225,7 +225,6 @@ INTERRUPT_GEN_MEMBER(commando_state::commando_interrupt)
 
 void commando_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_scroll_x));
 	save_item(NAME(m_scroll_y));

src/mame/drivers/contra.c

@@ -181,7 +181,6 @@ void contra_state::machine_start()
 
 	membank("bank1")->configure_entries(0, 16, &ROM[0x10000], 0x2000);
 
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k007121_1 = machine().device("k007121_1");
 	m_k007121_2 = machine().device("k007121_2");
 }

src/mame/drivers/coolpool.c

@@ -134,7 +134,6 @@ static void coolpool_from_shiftreg(address_space &space, UINT32 address, UINT16
 
 MACHINE_RESET_MEMBER(coolpool_state,amerdart)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_dsp = machine().device("dsp");
 
 	m_nvram_write_enable = 0;

src/mame/drivers/cop01.c

@@ -425,8 +425,6 @@ GFXDECODE_END
 
 void cop01_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_pulse));
 	save_item(NAME(m_timer));

src/mame/drivers/cps1.c

@@ -3156,8 +3156,6 @@ GFXDECODE_END
 
 MACHINE_START_MEMBER(cps_state,common)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 }
 
 MACHINE_START_MEMBER(cps_state,cps1)

src/mame/drivers/cps2.c

@@ -1240,8 +1240,6 @@ GFXDECODE_END
 
 MACHINE_START_MEMBER(cps_state,cps2)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	if (m_audiocpu != NULL) // gigaman2 has no audiocpu
 		membank("bank1")->configure_entries(0, (QSOUND_SIZE - 0x10000) / 0x4000, memregion("audiocpu")->base() + 0x10000, 0x4000);

src/mame/drivers/crgolf.c

@@ -73,8 +73,6 @@ WRITE8_MEMBER(crgolf_state::rom_bank_select_w)
 
 void crgolf_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	/* configure the banking */
 	membank("bank1")->configure_entries(0, 16, memregion("maincpu")->base() + 0x10000, 0x2000);

src/mame/drivers/crimfght.c

@@ -255,8 +255,6 @@ void crimfght_state::machine_start()
 	membank("bank2")->configure_entries(0, 12, &ROM[0x10000], 0x2000);
 	membank("bank2")->set_entry(0);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k052109 = machine().device("k052109");
 	m_k051960 = machine().device("k051960");
 	m_k007232 = machine().device("k007232");

src/mame/drivers/crospang.c

@@ -328,7 +328,6 @@ static const ym3812_interface ym3812_config =
 
 void crospang_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_bestri_tilebank));
 

src/mame/drivers/crystal.c

@@ -135,7 +135,8 @@ public:
 		m_vidregs(*this, "vidregs"),
 		m_textureram(*this, "textureram"),
 		m_frameram(*this, "frameram"),
-		m_reset_patch(*this, "reset_patch"){ }
+		m_reset_patch(*this, "reset_patch"),
+		m_maincpu(*this, "maincpu"){ }
 
 	/* memory pointers */
 	required_shared_ptr<UINT32> m_sysregs;
@@ -160,7 +161,7 @@ public:
 	UINT32    m_DMActrl[2];
 	UINT8     m_OldPort4;
 
-	cpu_device *m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	ds1302_device *m_ds1302;
 	device_t *m_vr0video;
 	DECLARE_READ32_MEMBER(FlipCount_r);
@@ -577,7 +578,6 @@ void crystal_state::machine_start()
 {
 	int i;
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_ds1302 = machine().device<ds1302_device>("rtc");
 	m_vr0video = machine().device("vr0");
 

src/mame/drivers/cvs.c

@@ -982,8 +982,6 @@ MACHINE_START_MEMBER(cvs_state,cvs)
 	start_393hz_timer();
 
 	/* set devices */
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_speech = machine().device("speech");
 	m_dac3 = machine().device<dac_device>("dac3");
 	m_tms = machine().device("tms");

src/mame/drivers/darius.c

@@ -822,8 +822,6 @@ void darius_state::machine_start()
 	membank("bank1")->configure_entry(4, memregion("audiocpu")->base());
 	membank("bank1")->set_entry(4);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_cpub = machine().device("cpub");
 	m_adpcm = machine().device("adpcm");
 	m_pc080sn = machine().device("pc080sn");

src/mame/drivers/dblewing.c

@@ -34,7 +34,9 @@ public:
 		m_pf1_rowscroll(*this, "pf1_rowscroll"),
 		m_pf2_rowscroll(*this, "pf2_rowscroll"),
 		m_spriteram(*this, "spriteram"),
-		m_sprgen(*this, "spritegen")
+		m_sprgen(*this, "spritegen"),
+		m_maincpu(*this, "maincpu"),
+		m_audiocpu(*this, "audiocpu")
 	{ }
 
 	/* memory pointers */
@@ -77,8 +79,8 @@ public:
 	UINT8 m_sound_irq;
 
 	/* devices */
-	cpu_device *m_maincpu;
-	cpu_device *m_audiocpu;
+	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_audiocpu;
 	device_t *m_deco_tilegen1;
 	DECLARE_WRITE_LINE_MEMBER(sound_irq);
 	DECLARE_READ16_MEMBER(dblewing_prot_r);
@@ -560,8 +562,6 @@ static const deco16ic_interface dblewing_deco16ic_tilegen1_intf =
 
 void dblewing_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_deco_tilegen1 = machine().device("tilegen1");
 
 	save_item(NAME(m_008_data));

src/mame/drivers/dbz.c

@@ -335,8 +335,6 @@ static const k053252_interface dbz_k053252_intf =
 
 void dbz_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k053936_1 = machine().device("k053936_1");
 	m_k053936_2 = machine().device("k053936_2");
 	m_k056832 = machine().device("k056832");

src/mame/drivers/dcheese.c

@@ -89,8 +89,6 @@ INTERRUPT_GEN_MEMBER(dcheese_state::dcheese_vblank)
 
 void dcheese_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_bsmt = machine().device("bsmt");
 
 	m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(dcheese_state::irq_callback),this));

src/mame/drivers/ddayjlc.c

@@ -64,7 +64,8 @@ public:
 		m_mainram(*this, "mainram"),
 		m_spriteram(*this, "spriteram"),
 		m_videoram(*this, "videoram"),
-		m_bgram(*this, "bgram"){ }
+		m_bgram(*this, "bgram"),
+		m_audiocpu(*this, "audiocpu"){ }
 
 	/* memory pointers */
 	required_shared_ptr<UINT8> m_mainram;
@@ -85,7 +86,7 @@ public:
 	UINT8    m_prot_addr;
 
 	/* devices */
-	cpu_device *m_audiocpu;
+	required_device<cpu_device> m_audiocpu;
 	DECLARE_WRITE8_MEMBER(prot_w);
 	DECLARE_WRITE8_MEMBER(char_bank_w);
 	DECLARE_WRITE8_MEMBER(ddayjlc_bgram_w);
@@ -447,7 +448,6 @@ INTERRUPT_GEN_MEMBER(ddayjlc_state::ddayjlc_snd_interrupt)
 
 void ddayjlc_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_char_bank));
 	save_item(NAME(m_bgadr));

src/mame/drivers/ddenlovr.c

@@ -9292,8 +9292,6 @@ INPUT_PORTS_END
 
 MACHINE_START_MEMBER(ddenlovr_state,ddenlovr)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_soundcpu = machine().device<cpu_device>("soundcpu");
 	m_oki = machine().device<okim6295_device>("oki");
 
 	save_item(NAME(m_input_sel));

src/mame/drivers/ddragon.c

@@ -149,7 +149,6 @@ MACHINE_START_MEMBER(ddragon_state,ddragon)
 	/* configure banks */
 	membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base() + 0x10000, 0x4000);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_sub_cpu = machine().device("sub");
 	m_snd_cpu = machine().device("soundcpu");
 	m_adpcm_1 = machine().device("adpcm1");

src/mame/drivers/ddragon3.c

@@ -542,8 +542,6 @@ TIMER_DEVICE_CALLBACK_MEMBER(ddragon3_state::ddragon3_scanline)
 
 void ddragon3_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_vreg));
 	save_item(NAME(m_bg_scrollx));

src/mame/drivers/dec8.c

@@ -1949,9 +1949,6 @@ INTERRUPT_GEN_MEMBER(dec8_state::oscar_interrupt)
 
 void dec8_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_subcpu = machine().device<cpu_device>("sub");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_mcu = machine().device("mcu");
 
 	save_item(NAME(m_latch));

src/mame/drivers/destroyr.c

@@ -22,7 +22,8 @@ public:
 		: driver_device(mconfig, type, tag) ,
 		m_alpha_num_ram(*this, "alpha_nuram"),
 		m_major_obj_ram(*this, "major_obj_ram"),
-		m_minor_obj_ram(*this, "minor_obj_ram"){ }
+		m_minor_obj_ram(*this, "minor_obj_ram"),
+		m_maincpu(*this, "maincpu"){ }
 
 	/* memory pointers */
 	required_shared_ptr<UINT8> m_alpha_num_ram;
@@ -41,7 +42,7 @@ public:
 	int            m_noise;
 
 	/* devices */
-	cpu_device *m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	DECLARE_WRITE8_MEMBER(destroyr_misc_w);
 	DECLARE_WRITE8_MEMBER(destroyr_cursor_load_w);
 	DECLARE_WRITE8_MEMBER(destroyr_interrupt_ack_w);
@@ -432,7 +433,6 @@ void destroyr_state::palette_init()
 
 void destroyr_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	save_item(NAME(m_cursor));
 	save_item(NAME(m_wavemod));

src/mame/drivers/dietgo.c

@@ -184,8 +184,6 @@ static const deco16ic_interface dietgo_deco16ic_tilegen1_intf =
 
 void dietgo_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_deco_tilegen1 = machine().device("tilegen1");
 }
 

src/mame/drivers/discoboy.c

@@ -50,7 +50,8 @@ class discoboy_state : public driver_device
 {
 public:
 	discoboy_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag) { }
+		: driver_device(mconfig, type, tag),
+		m_audiocpu(*this, "audiocpu") { }
 
 	/* video-related */
 	UINT8    m_ram_bank;
@@ -60,7 +61,7 @@ public:
 	UINT8    m_toggle;
 
 	/* devices */
-	cpu_device *m_audiocpu;
+	required_device<cpu_device> m_audiocpu;
 
 	/* memory */
 	UINT8    m_ram_1[0x800];
@@ -452,7 +453,6 @@ GFXDECODE_END
 
 void discoboy_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_ram_bank));
 	save_item(NAME(m_port_00));

src/mame/drivers/diverboy.c

@@ -58,14 +58,15 @@ class diverboy_state : public driver_device
 public:
 	diverboy_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_audiocpu(*this, "audiocpu"){ }
 
 	/* memory pointers */
 	required_shared_ptr<UINT16> m_spriteram;
 //  UINT16 *  m_paletteram;   // currently this uses generic palette handling
 
 	/* devices */
-	cpu_device *m_audiocpu;
+	required_device<cpu_device> m_audiocpu;
 	DECLARE_WRITE16_MEMBER(soundcmd_w);
 	DECLARE_WRITE8_MEMBER(okibank_w);
 	virtual void machine_start();
@@ -248,7 +249,6 @@ GFXDECODE_END
 
 void diverboy_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 }
 
 static MACHINE_CONFIG_START( diverboy, diverboy_state )

src/mame/drivers/djboy.c

@@ -524,7 +524,6 @@ void djboy_state::machine_start()
 	membank("bank3")->configure_entries(3, 5,  &CPU2[0x10000], 0x4000);
 	membank("bank4")->configure_entry(0, &MAIN[0x10000]); /* unsure if/how this area is banked */
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_cpu1 = machine().device("cpu1");
 	m_cpu2 = machine().device("cpu2");
 	m_beast = machine().device("beast");

src/mame/drivers/docastle.c

@@ -584,9 +584,6 @@ void docastle_state::machine_reset()
 
 void docastle_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_slave = machine().device<cpu_device>("slave");
-
 	save_item(NAME(m_adpcm_pos));
 	save_item(NAME(m_adpcm_data));
 	save_item(NAME(m_adpcm_idle));

src/mame/drivers/dogfgt.c

@@ -207,7 +207,6 @@ GFXDECODE_END
 
 void dogfgt_state::machine_start()
 {
-	m_subcpu = machine().device<cpu_device>("sub");
 
 	save_item(NAME(m_bm_plane));
 	save_item(NAME(m_lastflip));

src/mame/drivers/dreambal.c

@@ -32,13 +32,14 @@ class dreambal_state : public driver_device
 public:
 	dreambal_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-			m_eeprom(*this, "eeprom")
+		m_eeprom(*this, "eeprom"),
+		m_maincpu(*this, "maincpu")
 	{ }
 
 	required_device<eeprom_device> m_eeprom;
 
 	/* devices */
-	cpu_device *m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	device_t *m_deco_tilegen1;
 
 	DECLARE_DRIVER_INIT(dreambal);
@@ -282,7 +283,6 @@ static const deco16ic_interface dreambal_deco16ic_tilegen1_intf =
 
 void dreambal_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_deco_tilegen1 = machine().device("tilegen1");
 
 

src/mame/drivers/dynax.c

@@ -3972,8 +3972,6 @@ INPUT_PORTS_END
 
 MACHINE_START_MEMBER(dynax_state,dynax)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_soundcpu = machine().device<cpu_device>("soundcpu");
 	m_rtc = machine().device("rtc");
 	m_ymsnd = machine().device("ymsnd");
 

src/mame/drivers/egghunt.c

@@ -49,7 +49,8 @@ class egghunt_state : public driver_device
 {
 public:
 	egghunt_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag) ,
+		: driver_device(mconfig, type, tag),
+		m_audiocpu(*this, "audiocpu"),
 		m_atram(*this, "atram"){ }
 
 	/* video-related */
@@ -61,7 +62,7 @@ public:
 	UINT8     m_gfx_banking;
 
 	/* devices */
-	cpu_device *m_audiocpu;
+	required_device<cpu_device> m_audiocpu;
 
 	/* memory */
 	required_shared_ptr<UINT8> m_atram;
@@ -390,7 +391,6 @@ GFXDECODE_END
 
 void egghunt_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_gfx_banking));
 	save_item(NAME(m_okibanking));

src/mame/drivers/enigma2.c

@@ -61,7 +61,9 @@ class enigma2_state : public driver_device
 public:
 	enigma2_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"),
+		m_audiocpu(*this, "audiocpu"){ }
 
 	/* memory pointers */
 	required_shared_ptr<UINT8> m_videoram;
@@ -77,8 +79,8 @@ public:
 	emu_timer *m_interrupt_assert_timer;
 
 	/* devices */
-	cpu_device *m_maincpu;
-	cpu_device *m_audiocpu;
+	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_audiocpu;
 	DECLARE_READ8_MEMBER(dip_switch_r);
 	DECLARE_WRITE8_MEMBER(sound_data_w);
 	DECLARE_WRITE8_MEMBER(enigma2_flip_screen_w);
@@ -168,8 +170,6 @@ void enigma2_state::machine_start()
 {
 	create_interrupt_timers();
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_blink_count));
 	save_item(NAME(m_sound_latch));

src/mame/drivers/espial.c

@@ -54,8 +54,6 @@ void espial_state::machine_reset()
 
 void espial_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	//state_save_register_global_array(machine(), mcu_out[1]);
 	save_item(NAME(m_sound_nmi_enabled));

src/mame/drivers/exerion.c

@@ -379,7 +379,6 @@ static const ay8910_interface ay8910_config =
 
 void exerion_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	save_item(NAME(m_porta));
 	save_item(NAME(m_portb));

src/mame/drivers/exprraid.c

@@ -467,7 +467,6 @@ INTERRUPT_GEN_MEMBER(exprraid_state::exprraid_interrupt)
 
 void exprraid_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_slave = machine().device("slave");
 
 	save_item(NAME(m_bg_index));

src/mame/drivers/f1gp.c

@@ -426,7 +426,6 @@ MACHINE_START_MEMBER(f1gp_state,f1gp)
 
 	membank("bank1")->configure_entries(0, 2, &ROM[0x10000], 0x8000);
 
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k053936 = machine().device("k053936");
 
 	MACHINE_START_CALL_MEMBER(f1gpb);

src/mame/drivers/fcombat.c

@@ -257,7 +257,6 @@ GFXDECODE_END
 
 void fcombat_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	save_item(NAME(m_cocktail_flip));
 	save_item(NAME(m_char_palette));

src/mame/drivers/fcrash.c

@@ -1356,8 +1356,6 @@ MACHINE_START_MEMBER(cps_state,fcrash)
 
 	membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x4000);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_msm_1 = machine().device<msm5205_device>("msm1");
 	m_msm_2 = machine().device<msm5205_device>("msm2");
 
@@ -1390,8 +1388,6 @@ MACHINE_START_MEMBER(cps_state,sgyxz)
 
 MACHINE_START_MEMBER(cps_state,kodb)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	m_layer_enable_reg = 0x20;
 	m_layer_mask_reg[0] = 0x2e;
@@ -1427,8 +1423,6 @@ MACHINE_START_MEMBER(cps_state, sf2mdt)
 
 	membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x4000);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_msm_1 = machine().device<msm5205_device>("msm1");
 	m_msm_2 = machine().device<msm5205_device>("msm2");
 
@@ -1456,8 +1450,6 @@ MACHINE_START_MEMBER(cps_state, knightsb)
 
 	membank("bank1")->configure_entries(0, 16, &ROM[0x10000], 0x4000);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_msm_1 = machine().device<msm5205_device>("msm1");
 	m_msm_2 = machine().device<msm5205_device>("msm2");
 	m_layer_enable_reg = 0x30;
@@ -1479,8 +1471,6 @@ MACHINE_START_MEMBER(cps_state, sf2m1)
 
 	membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x4000);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_layer_enable_reg = 0x26;
 	m_layer_mask_reg[0] = 0x28;
 	m_layer_mask_reg[1] = 0x2a;
@@ -1947,9 +1937,6 @@ DRIVER_INIT_MEMBER(cps_state, cawingbl)
 
 MACHINE_START_MEMBER(cps_state, dinopic)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	//m_audiocpu = machine().device<cpu_device>("audiocpu");
-
 	m_layer_enable_reg = 0x0a;
 	m_layer_mask_reg[0] = 0x0c;
 	m_layer_mask_reg[1] = 0x0e;
@@ -2196,9 +2183,6 @@ ROM_END
 
 MACHINE_START_MEMBER(cps_state, punipic)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	//m_audiocpu = machine().device<cpu_device>("audiocpu");
-
 	m_layer_enable_reg = 0x12;
 	m_layer_mask_reg[0] = 0x14;
 	m_layer_mask_reg[1] = 0x16;
@@ -2588,9 +2572,6 @@ DRIVER_INIT_MEMBER(cps_state, sf2mdta)
 
 MACHINE_START_MEMBER(cps_state, slampic)
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	//m_audiocpu = machine().device<cpu_device>("audiocpu");
-
 	m_layer_enable_reg = 0x16;
 	m_layer_mask_reg[0] = 0x00;
 	m_layer_mask_reg[1] = 0x02;

src/mame/drivers/fgoal.c

@@ -326,7 +326,6 @@ GFXDECODE_END
 
 void fgoal_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 	m_mb14241 = machine().device("mb14241");
 
 	save_item(NAME(m_xpos));

src/mame/drivers/firetrap.c

@@ -590,8 +590,6 @@ void firetrap_state::machine_start()
 	UINT8 *MAIN = memregion("maincpu")->base();
 	UINT8 *SOUND = memregion("audiocpu")->base();
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_msm = machine().device("msm");
 
 	membank("bank1")->configure_entries(0, 4, &MAIN[0x10000], 0x4000);

src/mame/drivers/flkatck.c

@@ -195,7 +195,6 @@ void flkatck_state::machine_start()
 
 	membank("bank1")->configure_entries(0, 3, &ROM[0x10000], 0x2000);
 
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_k007121 = machine().device("k007121");
 
 	save_item(NAME(m_irq_enabled));

src/mame/drivers/flstory.c

@@ -1002,8 +1002,6 @@ static const msm5232_interface msm5232_config =
 
 void flstory_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_mcu = machine().device("mcu");
 
 	/* video */

src/mame/drivers/flyball.c

@@ -24,7 +24,8 @@ public:
 	flyball_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag) ,
 		m_playfield_ram(*this, "playfield_ram"),
-		m_rombase(*this, "rombase"){ }
+		m_rombase(*this, "rombase"),
+		m_maincpu(*this, "maincpu"){ }
 
 	/* memory pointers */
 	required_shared_ptr<UINT8> m_playfield_ram;
@@ -43,7 +44,7 @@ public:
 	UINT8    m_potsense;
 
 	/* devices */
-	cpu_device *m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	DECLARE_READ8_MEMBER(flyball_input_r);
 	DECLARE_READ8_MEMBER(flyball_scanline_r);
 	DECLARE_READ8_MEMBER(flyball_potsense_r);
@@ -374,7 +375,6 @@ void flyball_state::palette_init()
 
 void flyball_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	save_item(NAME(m_pitcher_vert));
 	save_item(NAME(m_pitcher_horz));

src/mame/drivers/fromanc2.c

@@ -501,8 +501,6 @@ static const ym2610_interface ym2610_config =
 
 MACHINE_START_MEMBER(fromanc2_state,fromanc4)
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
-	m_subcpu = machine().device<cpu_device>("sub");
 	m_eeprom = machine().device("eeprom");
 	m_left_screen = machine().device("lscreen");
 	m_right_screen = machine().device("rscreen");

src/mame/drivers/fromance.c

@@ -952,7 +952,6 @@ MACHINE_START_MEMBER(fromance_state,fromance)
 
 	membank("bank1")->configure_entries(0, 0x100, &ROM[0x10000], 0x4000);
 
-	m_subcpu = machine().device<cpu_device>("sub");
 
 	save_item(NAME(m_directionflag));
 	save_item(NAME(m_commanddata));

src/mame/drivers/funkyjet.c

@@ -288,8 +288,6 @@ static const deco16ic_interface funkyjet_deco16ic_tilegen1_intf =
 
 void funkyjet_state::machine_start()
 {
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 	m_deco_tilegen1 = machine().device("tilegen1");
 
 	decoprot_reset(machine());

src/mame/drivers/funybubl.c

@@ -204,7 +204,6 @@ void funybubl_state::machine_start()
 {
 	UINT8 *ROM = memregion("maincpu")->base();
 
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	save_item(NAME(m_banked_vram));
 

src/mame/drivers/fuukifg2.c

@@ -441,8 +441,6 @@ void fuuki16_state::machine_start()
 
 	membank("bank1")->configure_entries(0, 3, &ROM[0x10000], 0x8000);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 
 	m_raster_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(fuuki16_state::raster_interrupt_callback),this));
 }

src/mame/drivers/fuukifg3.c

@@ -549,9 +549,6 @@ void fuuki32_state::machine_start()
 
 	membank("bank1")->configure_entries(0, 0x10, &ROM[0x10000], 0x8000);
 
-	m_maincpu = machine().device<cpu_device>("maincpu");
-	m_audiocpu = machine().device<cpu_device>("soundcpu");
-
 	m_raster_interrupt_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(fuuki32_state::raster_interrupt_callback),this));
 
 	save_item(NAME(m_spr_buffered_tilebank));
@@ -571,7 +568,7 @@ void fuuki32_state::machine_reset()
 
 WRITE_LINE_MEMBER(fuuki32_state::irqhandler)
 {
-	m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
+	m_soundcpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
 }
 
 static const ymf278b_interface fuuki32_ymf278b_interface =

src/mame/drivers/gaelco.c

@@ -492,7 +492,6 @@ GFXDECODEINFO(0x100000,64)
 
 void gaelco_state::machine_start()
 {
-	m_audiocpu = machine().device<cpu_device>("audiocpu");
 }
 
 static MACHINE_CONFIG_START( bigkarnk, gaelco_state )