Fix most reported regressions. A few more still to come.

src/mame/drivers/1945kiii.c

@@ -52,8 +52,8 @@ class k3_state : public driver_device
 public:
 	k3_state(running_machine &machine, const driver_device_config_base &config)
 		: driver_device(machine, config),
-		  oki1(machine.device<okim6295_device>("oki1")),
+		  oki1(*this, "oki1"),
-		  oki2(machine.device<okim6295_device>("oki2")) { }
+		  oki2(*this, "oki2") { }
 
 	/* memory pointers */
 	UINT16 *  spriteram_1;
@@ -65,8 +65,8 @@ public:
 	tilemap_t  *bg_tilemap;
 
 	/* devices */
-	okim6295_device *oki1;
+	required_device<okim6295_device> oki1;
-	okim6295_device *oki2;
+	required_device<okim6295_device> oki2;
 };
 
 

src/mame/drivers/attckufo.c

@@ -51,16 +51,16 @@ class attckufo_state : public driver_device
 public:
 	attckufo_state(running_machine &machine, const driver_device_config_base &config)
 		: driver_device(machine, config),
-		  maincpu(machine.device<cpu_device>("maincpu")),
+		  maincpu(*this, "maincpu"),
-		  mos6560(machine.device("mos6560")) { }
+		  mos6560(*this, "mos6560") { }
 
 	/* memory pointers */
 	UINT8 *      mainram;
 	UINT8 *      tileram;
 
 	/* devices */
-	cpu_device *maincpu;
+	required_device<cpu_device> maincpu;
-	running_device *mos6560;
+	required_device<mos6560_device> mos6560;
 };
 
 

src/mame/drivers/mirage.c

@@ -44,10 +44,10 @@ class mirage_state : public driver_device
 public:
 	mirage_state(running_machine &machine, const driver_device_config_base &config)
 		: driver_device(machine, config),
-		  maincpu(machine.device<cpu_device>("maincpu")),
+		  maincpu(*this, "maincpu"),
-		  deco16ic(machine.device<deco16ic_device>("deco_custom")),
+		  deco16ic(*this, "deco_custom"),
-		  oki_sfx(machine.device<okim6295_device>("oki_sfx")),
+		  oki_sfx(*this, "oki_sfx"),
-		  oki_bgm(machine.device<okim6295_device>("oki_bgm")) { }
+		  oki_bgm(*this, "oki_bgm") { }
 
 	/* memory pointers */
 	UINT16 *  pf1_rowscroll;
@@ -60,10 +60,10 @@ public:
 	UINT32 mux_data;
 
 	/* devices */
-	cpu_device *maincpu;
+	required_device<m68000_device> maincpu;
-	deco16ic_device *deco16ic;
+	required_device<deco16ic_device> deco16ic;
-	okim6295_device *oki_sfx;
+	required_device<okim6295_device> oki_sfx;
-	okim6295_device *oki_bgm;
+	required_device<okim6295_device> oki_bgm;
 };
 
 

src/mame/drivers/splash.c

@@ -435,7 +435,7 @@ static const ym2203_interface ym2203_config =
 	ym_irq
 };
 
-static MACHINE_CONFIG_START( roldfrog, driver_device )
+static MACHINE_CONFIG_START( roldfrog, splash_state )
 
 	/* basic machine hardware */
 	MDRV_CPU_ADD("maincpu", M68000,24000000/2)			/* 12 MHz - verified */
@@ -475,7 +475,7 @@ static MACHINE_CONFIG_START( roldfrog, driver_device )
 MACHINE_CONFIG_END
 
 
-static MACHINE_CONFIG_START( funystrp, driver_device )
+static MACHINE_CONFIG_START( funystrp, splash_state )
 
 	/* basic machine hardware */
 	MDRV_CPU_ADD("maincpu", M68000,24000000/2)			/* 12 MHz (24/2) */

src/mame/includes/balsente.h

@@ -32,15 +32,13 @@ public:
 	balsente_state(running_machine &machine, const driver_device_config_base &config)
 		: driver_device(machine, config),
 		  scanline_timer(*this, "scan_timer"),
-		  counter_0_timer(*this, "8253_0_timer")
+		  counter_0_timer(*this, "8253_0_timer"),
-	{
+		  m_cem1(*this, "cem1"),
-		astring temp;
+		  m_cem2(*this, "cem2"),
-		for (int i = 0; i < ARRAY_LENGTH(cem_device); i++)
+		  m_cem3(*this, "cem3"),
-		{
+		  m_cem4(*this, "cem4"),
-			cem_device[i] = machine.device<cem3394_device>(temp.format("cem%d", i+1));
+		  m_cem5(*this, "cem5"),
-			assert(cem_device[i] != NULL);
+		  m_cem6(*this, "cem6") { }
-		}
-	}
 
 	/* global data */
 	UINT8 shooter;
@@ -100,6 +98,12 @@ public:
 
 	/* noise generator states */
 	UINT32 noise_position[6];
+	required_device<cem3394_device> m_cem1;
+	required_device<cem3394_device> m_cem2;
+	required_device<cem3394_device> m_cem3;
+	required_device<cem3394_device> m_cem4;
+	required_device<cem3394_device> m_cem5;
+	required_device<cem3394_device> m_cem6;
 	cem3394_device *cem_device[6];
 
 	/* game-specific states */

src/mame/includes/cninja.h

@@ -32,8 +32,8 @@ public:
 	required_device<cpu_device> maincpu;
 	required_device<cpu_device> audiocpu;
 	required_device<deco16ic_device> deco16ic;
-	required_device<timer_device> raster_irq_timer;
+	optional_device<timer_device> raster_irq_timer;
-	required_device<okim6295_device> oki2;
+	optional_device<okim6295_device> oki2;
 };
 
 /*----------- defined in video/cninja.c -----------*/

src/mame/includes/metro.h

@@ -82,9 +82,9 @@ public:
 	/* devices */
 	required_device<cpu_device> maincpu;
 	required_device<cpu_device> audiocpu;
-	required_device<okim6295_device> oki;
+	optional_device<okim6295_device> oki;
 	required_device<device_t> ymsnd;
-	required_device<k053936_device> k053936;
+	optional_device<k053936_device> k053936;
 };
 
 

src/mame/includes/mitchell.h

@@ -37,7 +37,7 @@ public:
 	int        keymatrix;
 
 	/* devices */
-	required_device<cpu_device> audiocpu;
+	optional_device<cpu_device> audiocpu;
 	required_device<okim6295_device> oki;
 };
 

src/mame/includes/segas16.h

@@ -92,7 +92,7 @@ public:
 	running_device *n7751;
 	running_device *ppi8255_1;
 	running_device *ppi8255_2;
-	required_device<timer_device> interrupt_timer;
+	optional_device<timer_device> interrupt_timer;
 	running_device *_315_5248_1;
 	running_device *_315_5250_1;
 	running_device *_315_5250_2;

src/mame/includes/taito_f2.h

@@ -68,7 +68,7 @@ public:
 	/* devices */
 	running_device *maincpu;
 	running_device *audiocpu;
-	required_device<okim6295_device> oki;
+	optional_device<okim6295_device> oki;
 	running_device *tc0100scn;
 	running_device *tc0100scn_1;
 	running_device *tc0100scn_2;

src/mame/machine/balsente.c

@@ -80,6 +80,13 @@ MACHINE_START( balsente )
 {
 	balsente_state *state = machine->driver_data<balsente_state>();
 	int i;
+	
+	state->cem_device[0] = state->m_cem1;
+	state->cem_device[1] = state->m_cem2;
+	state->cem_device[2] = state->m_cem3;
+	state->cem_device[3] = state->m_cem4;
+	state->cem_device[4] = state->m_cem5;
+	state->cem_device[5] = state->m_cem6;
 
 	/* create the polynomial tables */
 	poly17_init(machine);