replaced machine().driver_data()->generic_space() with machine().dummy_space() (nw)

src/devices/bus/apricot/keyboard/hle.cpp

@@ -266,7 +266,7 @@ void apricot_keyboard_hle_device::received_byte(uint8_t byte)
 		if (m_rtc_index >= 0)
 		{
 			m_rtc->address_w(m_rtc_index--);
-			m_rtc->data_w(machine().driver_data()->generic_space(), 0, byte);
+			m_rtc->data_w(machine().dummy_space(), 0, byte);
 		}
 	}
 	else
@@ -290,7 +290,7 @@ void apricot_keyboard_hle_device::received_byte(uint8_t byte)
 			for (int i = 12; i >= 0; i--)
 			{
 				m_rtc->address_w(i);
-				transmit_byte(0xf0 | m_rtc->data_r(machine().driver_data()->generic_space(), 0));
+				transmit_byte(0xf0 | m_rtc->data_r(machine().dummy_space(), 0));
 			}
 
 			break;

src/devices/bus/ti99_peb/tn_ide.cpp

@@ -141,18 +141,18 @@ READ8Z_MEMBER(nouspikel_ide_interface_device::readz)
 			case 0:     /* RTC RAM */
 				if (addr & 0x80)
 					/* RTC RAM page register */
-					reply = m_rtc->xram_r(machine().driver_data()->generic_space(),(addr & 0x1f) | 0x20);
+					reply = m_rtc->xram_r(machine().dummy_space(), (addr & 0x1f) | 0x20);
 				else
 					/* RTC RAM read */
-					reply = m_rtc->xram_r(machine().driver_data()->generic_space(),addr);
+					reply = m_rtc->xram_r(machine().dummy_space(), addr);
 				break;
 			case 1:     /* RTC registers */
 				if (addr & 0x10)
 					/* register data */
-					reply = m_rtc->rtc_r(machine().driver_data()->generic_space(),1);
+					reply = m_rtc->rtc_r(machine().dummy_space(), 1);
 				else
 					/* register select */
-					reply = m_rtc->rtc_r(machine().driver_data()->generic_space(),0);
+					reply = m_rtc->rtc_r(machine().dummy_space(), 0);
 				break;
 			case 2:     /* IDE registers set 1 (CS1Fx) */
 				if (m_tms9995_mode ? (!(addr & 1)) : (addr & 1))
@@ -212,18 +212,18 @@ WRITE8_MEMBER(nouspikel_ide_interface_device::write)
 			case 0:     /* RTC RAM */
 				if (addr & 0x80)
 					/* RTC RAM page register */
-					m_rtc->xram_w(machine().driver_data()->generic_space(),(addr & 0x1f) | 0x20, data);
+					m_rtc->xram_w(machine().dummy_space(), (addr & 0x1f) | 0x20, data);
 				else
 					/* RTC RAM write */
-					m_rtc->xram_w(machine().driver_data()->generic_space(),addr, data);
+					m_rtc->xram_w(machine().dummy_space(), addr, data);
 				break;
 			case 1:     /* RTC registers */
 				if (addr & 0x10)
 					/* register data */
-					m_rtc->rtc_w(machine().driver_data()->generic_space(),1, data);
+					m_rtc->rtc_w(machine().dummy_space(), 1, data);
 				else
 					/* register select */
-					m_rtc->rtc_w(machine().driver_data()->generic_space(),0, data);
+					m_rtc->rtc_w(machine().dummy_space(), 0, data);
 				break;
 			case 2:     /* IDE registers set 1 (CS1Fx) */
 /*

src/devices/machine/6840ptm.h

@@ -63,9 +63,9 @@ public:
 	int ext_clock(int counter) const { return m_external_clock[counter]; }  // get clock frequency
 
 	DECLARE_WRITE8_MEMBER( write );
-	void write(offs_t offset, uint8_t data) { write(machine().driver_data()->generic_space(), offset, data); }
+	void write(offs_t offset, uint8_t data) { write(machine().dummy_space(), offset, data); }
 	DECLARE_READ8_MEMBER( read );
-	uint8_t read(offs_t offset) { return read(machine().driver_data()->generic_space(), offset); }
+	uint8_t read(offs_t offset) { return read(machine().dummy_space(), offset); }
 
 	void set_gate(int idx, int state);
 	DECLARE_WRITE_LINE_MEMBER( set_g1 );

src/devices/machine/8042kbdc.cpp

@@ -288,7 +288,7 @@ void kbdc8042_device::at_8042_check_keyboard()
 
 	if (!m_keyboard.received && !m_mouse.received)
 	{
-		if((data = m_keyboard_dev->read(machine().driver_data()->generic_space(), 0)))
+		if((data = m_keyboard_dev->read(machine().dummy_space(), 0)))
 			at_8042_receive(data);
 	}
 }

src/devices/machine/latch8.cpp

@@ -23,14 +23,14 @@ void latch8_device::update(uint8_t new_val, uint8_t mask)
 		uint8_t changed = old_val ^ m_value;
 		for (i=0; i<8; i++)
 			if (((changed & (1<<i)) != 0)) {
-				if (i==0 && !m_write_0.isnull()) m_write_0(machine().driver_data()->generic_space(), m_offset[i] , (m_value >> i) & 1);
+				if (i==0 && !m_write_0.isnull()) m_write_0(machine().dummy_space(), m_offset[i] , (m_value >> i) & 1);
-				if (i==1 && !m_write_1.isnull()) m_write_1(machine().driver_data()->generic_space(), m_offset[i] , (m_value >> i) & 1);
+				if (i==1 && !m_write_1.isnull()) m_write_1(machine().dummy_space(), m_offset[i] , (m_value >> i) & 1);
-				if (i==2 && !m_write_2.isnull()) m_write_2(machine().driver_data()->generic_space(), m_offset[i] , (m_value >> i) & 1);
+				if (i==2 && !m_write_2.isnull()) m_write_2(machine().dummy_space(), m_offset[i] , (m_value >> i) & 1);
-				if (i==3 && !m_write_3.isnull()) m_write_3(machine().driver_data()->generic_space(), m_offset[i] , (m_value >> i) & 1);
+				if (i==3 && !m_write_3.isnull()) m_write_3(machine().dummy_space(), m_offset[i] , (m_value >> i) & 1);
-				if (i==4 && !m_write_4.isnull()) m_write_4(machine().driver_data()->generic_space(), m_offset[i] , (m_value >> i) & 1);
+				if (i==4 && !m_write_4.isnull()) m_write_4(machine().dummy_space(), m_offset[i] , (m_value >> i) & 1);
-				if (i==5 && !m_write_5.isnull()) m_write_5(machine().driver_data()->generic_space(), m_offset[i] , (m_value >> i) & 1);
+				if (i==5 && !m_write_5.isnull()) m_write_5(machine().dummy_space(), m_offset[i] , (m_value >> i) & 1);
-				if (i==6 && !m_write_6.isnull()) m_write_6(machine().driver_data()->generic_space(), m_offset[i] , (m_value >> i) & 1);
+				if (i==6 && !m_write_6.isnull()) m_write_6(machine().dummy_space(), m_offset[i] , (m_value >> i) & 1);
-				if (i==7 && !m_write_7.isnull()) m_write_7(machine().driver_data()->generic_space(), m_offset[i] , (m_value >> i) & 1);
+				if (i==7 && !m_write_7.isnull()) m_write_7(machine().dummy_space(), m_offset[i] , (m_value >> i) & 1);
 			}
 	}
 }

src/devices/sound/msm5232.cpp

@@ -84,8 +84,8 @@ void msm5232_device::device_reset()
 
 	for (i=0; i<8; i++)
 	{
-		write(machine().driver_data()->generic_space(),i,0x80);
+		write(machine().dummy_space(), i, 0x80);
-		write(machine().driver_data()->generic_space(),i,0x00);
+		write(machine().dummy_space(), i, 0x00);
 	}
 	m_noise_cnt     = 0;
 	m_noise_rng     = 1;

src/devices/video/huc6261.cpp

@@ -84,7 +84,7 @@ void huc6261_device::device_timer(emu_timer &timer, device_timer_id id, int para
 		{
 			g_profiler.start( PROFILER_VIDEO );
 			/* Get next pixel information */
-			m_pixel_data = m_huc6270_b->next_pixel( machine().driver_data()->generic_space(), 0, 0xffff );
+			m_pixel_data = m_huc6270_b->next_pixel( machine().dummy_space(), 0, 0xffff );
 			g_profiler.stop();
 		}
 

src/mame/audio/cage.cpp

@@ -448,7 +448,7 @@ void atari_cage_device::update_control_lines()
 	if ((m_control & 2) && m_cage_to_cpu_ready)
 		reason |= CAGE_IRQ_REASON_DATA_READY;
 
-	m_irqhandler(machine().driver_data()->generic_space(), 0, reason);
+	m_irqhandler(machine().dummy_space(), 0, reason);
 	/* set the IOF input lines */
 	val = m_cpu->state_int(TMS3203X_IOF);
 	val &= ~0x88;

src/mame/audio/dcs.cpp

@@ -2142,7 +2142,7 @@ void dcs_audio_device::fifo_notify(int count, int max)
 	if (transfer.state != 5 || transfer.fifo_entries == transfer.writes_left || transfer.fifo_entries >= 256)
 	{
 		for ( ; transfer.fifo_entries; transfer.fifo_entries--)
-			preprocess_write(m_fifo_data_r(machine().driver_data()->generic_space(),0, 0xffff));
+			preprocess_write(m_fifo_data_r(machine().dummy_space(), 0, 0xffff));
 	}
 }
 
@@ -2155,7 +2155,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( dcs_audio_device::transfer_watchdog_callback )
 	if (transfer.fifo_entries && starting_writes_left == transfer.writes_left)
 	{
 		for ( ; transfer.fifo_entries; transfer.fifo_entries--)
-			preprocess_write(m_fifo_data_r(machine().driver_data()->generic_space(),0, 0xffff));
+			preprocess_write(m_fifo_data_r(machine().dummy_space(), 0, 0xffff));
 	}
 	if (transfer.watchdog != nullptr)
 		transfer.watchdog->adjust(attotime::from_msec(1), transfer.writes_left);

src/mame/audio/mw8080bw.cpp

@@ -565,7 +565,7 @@ void mw8080bw_state::maze_write_discrete(uint8_t maze_tone_timing_state)
 	/* controls need to be active low */
 	int controls = ~ioport("IN0")->read() & 0xff;
 
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	m_discrete->write(space, MAZE_TONE_TIMING, maze_tone_timing_state);
 	m_discrete->write(space, MAZE_P1_DATA, controls & 0x0f);
 	m_discrete->write(space, MAZE_P2_DATA, (controls >> 4) & 0x0f);

src/mame/drivers/gei.cpp

@@ -211,7 +211,7 @@ WRITE8_MEMBER(gei_state::sound_w)
 
 	/* bit 5 - ticket out in trivia games */
 	if (m_ticket != nullptr)
-		m_ticket->write(machine().driver_data()->generic_space(), 0, (data & 0x20)<< 2);
+		m_ticket->write(machine().dummy_space(), 0, (data & 0x20)<< 2);
 
 	/* bit 6 enables NMI */
 	m_nmi_mask = data & 0x40;

src/mame/drivers/hp64k.cpp

@@ -895,9 +895,9 @@ WRITE8_MEMBER(hp64k_state::hp64k_floppy1_rdy)
 void hp64k_state::hp64k_floppy_idx_cb(floppy_image_device *floppy , int state)
 {
 		if (floppy == m_floppy0->get_device()) {
-				m_ss0->a_w(machine().driver_data()->generic_space() , 0 , !state);
+				m_ss0->a_w(machine().dummy_space(), 0, !state);
 		} else if (floppy == m_floppy1->get_device()) {
-				m_ss1->a_w(machine().driver_data()->generic_space() , 0 , !state);
+				m_ss1->a_w(machine().dummy_space(), 0, !state);
 		}
 
 		if (floppy == m_current_floppy) {

src/mame/drivers/ibmpcjr.cpp

@@ -256,7 +256,7 @@ WRITE_LINE_MEMBER(pcjr_state::keyb_interrupt)
 {
 	int data;
 
-	if(state && (data = m_keyboard->read(machine().driver_data()->generic_space(), 0)))
+	if(state && (data = m_keyboard->read(machine().dummy_space(), 0)))
 	{
 		uint8_t   parity = 0;
 		int     i;

src/mame/drivers/itech32.cpp

@@ -739,7 +739,7 @@ WRITE8_MEMBER(itech32_state::drivedge_portb_out)
 	output().set_led_value(1, data & 0x01);
 	output().set_led_value(2, data & 0x02);
 	output().set_led_value(3, data & 0x04);
-	machine().device<ticket_dispenser_device>("ticket")->write(machine().driver_data()->generic_space(), 0, (data & 0x10) << 3);
+	machine().device<ticket_dispenser_device>("ticket")->write(machine().dummy_space(), 0, (data & 0x10) << 3);
 	machine().bookkeeping().coin_counter_w(0, (data & 0x20) >> 5);
 }
 
@@ -757,7 +757,7 @@ WRITE8_MEMBER(itech32_state::pia_portb_out)
 	/* bit 4 controls the ticket dispenser */
 	/* bit 5 controls the coin counter */
 	/* bit 6 controls the diagnostic sound LED */
-	machine().device<ticket_dispenser_device>("ticket")->write(machine().driver_data()->generic_space(), 0, (data & 0x10) << 3);
+	machine().device<ticket_dispenser_device>("ticket")->write(machine().dummy_space(), 0, (data & 0x10) << 3);
 	machine().bookkeeping().coin_counter_w(0, (data & 0x20) >> 5);
 }
 

src/mame/drivers/itech8.cpp

@@ -760,7 +760,7 @@ WRITE8_MEMBER(itech8_state::ym2203_portb_out)
 	/* bit 6 controls the diagnostic sound LED */
 	/* bit 7 controls the ticket dispenser */
 	m_pia_portb_data = data;
-	m_ticket->write(machine().driver_data()->generic_space(), 0, data & 0x80);
+	m_ticket->write(machine().dummy_space(), 0, data & 0x80);
 	machine().bookkeeping().coin_counter_w(0, (data & 0x20) >> 5);
 }
 

src/mame/drivers/kron.cpp

@@ -278,7 +278,7 @@ INTERRUPT_GEN_MEMBER(kron180_state::interrupt)
 
 WRITE_LINE_MEMBER(kron180_state::keyb_interrupt)
 {
-	if(state && (m_kbd_data = m_keyboard->read(machine().driver_data()->generic_space(), 0)))
+	if(state && (m_kbd_data = m_keyboard->read(machine().dummy_space(), 0)))
 	{
 		LOGKBD(("%s(%02x)\n", FUNCNAME, m_kbd_data));
 		m_maincpu->set_input_line(2, ASSERT_LINE);

src/mame/drivers/mgavegas.cpp

@@ -369,7 +369,7 @@ WRITE8_MEMBER(mgavegas_state::cso1_w)
 	update_custom();
 
 	hopper_data=(m_hop&0x01)<<7;
-	m_ticket->write(machine().driver_data()->generic_space(), 0, hopper_data);
+	m_ticket->write(machine().dummy_space(), 0, hopper_data);
 }
 
 WRITE8_MEMBER(mgavegas_state::cso2_w)

src/mame/drivers/midyunit.cpp

@@ -152,13 +152,13 @@ WRITE8_MEMBER(midyunit_state::yawdim_oki_bank_w)
 
 CUSTOM_INPUT_MEMBER(midyunit_state::narc_talkback_strobe_r)
 {
-	return (m_narc_sound->read(machine().driver_data()->generic_space(), 0) >> 8) & 1;
+	return (m_narc_sound->read(machine().dummy_space(), 0) >> 8) & 1;
 }
 
 
 CUSTOM_INPUT_MEMBER(midyunit_state::narc_talkback_data_r)
 {
-	return m_narc_sound->read(machine().driver_data()->generic_space(), 0) & 0xff;
+	return m_narc_sound->read(machine().dummy_space(), 0) & 0xff;
 }
 
 

src/mame/drivers/mirage.cpp

@@ -92,7 +92,7 @@ void miragemi_state::video_start()
 
 uint32_t miragemi_state::screen_update_mirage(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	flip_screen_set(BIT(flip, 7));

src/mame/drivers/ms0515.cpp

@@ -123,7 +123,7 @@ WRITE8_MEMBER(ms0515_state::ms0515_sys_w)
 void ms0515_state::machine_reset()
 {
 	uint8_t *ram = m_ram->pointer();
-	ms0515_bank_w(machine().driver_data()->generic_space(),0,0);
+	ms0515_bank_w(machine().dummy_space(), 0, 0);
 
 	m_video_ram = ram + 0000000 + 0340000;
 	m_blink = 0;

src/mame/drivers/pcw16.cpp

@@ -528,7 +528,7 @@ WRITE_LINE_MEMBER(pcw16_state::pcw16_keyboard_callback)
 	{
 		int data;
 
-		data = m_keyboard->read(machine().driver_data()->generic_space(), 0);
+		data = m_keyboard->read(machine().dummy_space(), 0);
 
 		if (data)
 		{

src/mame/drivers/r2dtank.cpp

@@ -323,7 +323,7 @@ WRITE_LINE_MEMBER(r2dtank_state::display_enable_changed)
 WRITE8_MEMBER(r2dtank_state::pia_comp_w)
 {
 	device_t *device = machine().device("pia_main");
-	downcast<pia6821_device *>(device)->write(machine().driver_data()->generic_space(), offset, ~data);
+	downcast<pia6821_device *>(device)->write(machine().dummy_space(), offset, ~data);
 }
 
 

src/mame/drivers/videopin.cpp

@@ -93,8 +93,8 @@ void videopin_state::machine_reset()
 
 	/* both output latches are cleared on reset */
 
-	out1_w(machine().driver_data()->generic_space(), 0, 0);
+	out1_w(machine().dummy_space(), 0, 0);
-	out2_w(machine().driver_data()->generic_space(), 0, 0);
+	out2_w(machine().dummy_space(), 0, 0);
 }
 
 

src/mame/drivers/vip.cpp

@@ -477,7 +477,7 @@ READ_LINE_MEMBER( vip_state::ef4_r )
 WRITE_LINE_MEMBER( vip_state::q_w )
 {
 	// sound output
-	m_beeper->write(machine().driver_data()->generic_space(), NODE_01, state);
+	m_beeper->write(machine().dummy_space(), NODE_01, state);
 
 	// Q led
 	output().set_led_value(LED_Q, state);
@@ -620,7 +620,7 @@ void vip_state::machine_start()
 	output().set_led_value(LED_POWER, 1);
 
 	// reset sound
-	m_beeper->write(machine().driver_data()->generic_space(), NODE_01, 0);
+	m_beeper->write(machine().dummy_space(), NODE_01, 0);
 
 	// state saving
 	save_item(NAME(m_8000));

src/mame/machine/midwayic.cpp

@@ -700,7 +700,7 @@ void midway_ioasic_device::ioasic_reset()
 
 void midway_ioasic_device::update_ioasic_irq()
 {
-	uint16_t fifo_state = fifo_status_r(machine().driver_data()->generic_space(),0);
+	uint16_t fifo_state = fifo_status_r(machine().dummy_space(), 0);
 	uint16_t irqbits = 0x2000;
 	uint8_t new_state;
 

src/mame/machine/nitedrvr.cpp

@@ -252,7 +252,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(nitedrvr_state::nitedrvr_crash_toggle_callback)
 	if (m_crash_en && m_crash_data_en)
 	{
 		m_crash_data--;
-		address_space &space = machine().driver_data()->generic_space();
+		address_space &space = machine().dummy_space();
 		m_discrete->write(space, NITEDRVR_BANG_DATA, m_crash_data);  // Crash Volume
 		if (!m_crash_data)
 			m_crash_data_en = 0;    // Done counting?

src/mame/machine/ticket.cpp

@@ -155,7 +155,7 @@ WRITE8_MEMBER( ticket_dispenser_device::write )
 
 WRITE_LINE_MEMBER( ticket_dispenser_device::motor_w )
 {
-	write(machine().driver_data()->generic_space(), 0, state ? m_active_bit : 0);
+	write(machine().dummy_space(), 0, state ? m_active_bit : 0);
 }
 
 

src/mame/machine/williams.cpp

@@ -693,13 +693,13 @@ TIMER_CALLBACK_MEMBER(joust2_state::joust2_deferred_snd_cmd_w)
 WRITE_LINE_MEMBER(joust2_state::joust2_pia_3_cb1_w)
 {
 	m_joust2_current_sound_data = (m_joust2_current_sound_data & ~0x100) | ((state << 8) & 0x100);
-	m_cvsd_sound->write(machine().driver_data()->generic_space(), 0, m_joust2_current_sound_data);
+	m_cvsd_sound->write(machine().dummy_space(), 0, m_joust2_current_sound_data);
 }
 
 
 WRITE8_MEMBER(joust2_state::joust2_snd_cmd_w)
 {
 	m_joust2_current_sound_data = (m_joust2_current_sound_data & ~0xff) | (data & 0xff);
-	m_cvsd_sound->write(machine().driver_data()->generic_space(), 0, m_joust2_current_sound_data);
+	m_cvsd_sound->write(machine().dummy_space(), 0, m_joust2_current_sound_data);
 	machine().scheduler().synchronize(timer_expired_delegate(FUNC(joust2_state::joust2_deferred_snd_cmd_w),this), m_joust2_current_sound_data);
 }

src/mame/video/boogwing.cpp

@@ -27,7 +27,7 @@ void boogwing_state::mix_boogwing(screen_device &screen, bitmap_rgb32 &bitmap, c
 	bitmap_ind16 *sprite_bitmap1, *sprite_bitmap2;
 	bitmap_ind8* priority_bitmap;
 
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff);
 
 	sprite_bitmap1 = &m_sprgen1->get_sprite_temp_bitmap();
@@ -179,7 +179,7 @@ void boogwing_state::mix_boogwing(screen_device &screen, bitmap_rgb32 &bitmap, c
 
 uint32_t boogwing_state::screen_update_boogwing(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 	uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff);
 

src/mame/video/cbuster.cpp

@@ -24,7 +24,7 @@ void cbuster_state::video_start()
 
 uint32_t cbuster_state::screen_update_twocrude(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	flip_screen_set(!BIT(flip, 7));

src/mame/video/cninja.cpp

@@ -123,7 +123,7 @@ void cninja_state::cninjabl_draw_sprites( screen_device &screen, bitmap_ind16 &b
 
 uint32_t cninja_state::screen_update_cninja(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	flip_screen_set(BIT(flip, 7));
@@ -155,7 +155,7 @@ uint32_t cninja_state::screen_update_cninjabl2(screen_device &screen, bitmap_ind
 
 uint32_t cninja_state::screen_update_cninjabl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	/* force layers to be enabled */
@@ -180,7 +180,7 @@ uint32_t cninja_state::screen_update_cninjabl(screen_device &screen, bitmap_ind1
 
 uint32_t cninja_state::screen_update_edrandy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	flip_screen_set(BIT(flip, 7));
@@ -199,7 +199,7 @@ uint32_t cninja_state::screen_update_edrandy(screen_device &screen, bitmap_ind16
 
 uint32_t cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 	uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff);
 
@@ -256,7 +256,7 @@ VIDEO_START_MEMBER(cninja_state,mutantf)
 
 uint32_t cninja_state::screen_update_mutantf(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 	uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff);
 

src/mame/video/combatsc.cpp

@@ -357,7 +357,7 @@ WRITE8_MEMBER(combatsc_state::combatsc_scrollram_w)
 void combatsc_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, const uint8_t *source, int circuit, bitmap_ind8 &priority_bitmap, uint32_t pri_mask )
 {
 	k007121_device *k007121 = circuit ? m_k007121_2 : m_k007121_1;
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	int base_color = (circuit * 4) * 16 + (k007121->ctrlram_r(space, 6) & 0x10) * 2;
 
 	k007121->sprites_draw(bitmap, cliprect, m_gfxdecode->gfx(circuit), *m_palette, source, base_color, 0, 0, priority_bitmap, pri_mask);
@@ -368,7 +368,7 @@ uint32_t combatsc_state::screen_update_combatsc(screen_device &screen, bitmap_in
 {
 	int i;
 
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	if (m_k007121_1->ctrlram_r(space, 1) & 0x02)
 	{
 		m_bg_tilemap[0]->set_scroll_rows(32);

src/mame/video/contra.cpp

@@ -265,7 +265,7 @@ WRITE8_MEMBER(contra_state::contra_K007121_ctrl_1_w)
 void contra_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int bank )
 {
 	k007121_device *k007121 = bank ? m_k007121_2 : m_k007121_1;
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	int base_color = (k007121->ctrlram_r(space, 6) & 0x30) * 2;
 	const uint8_t *source;
 
@@ -279,7 +279,7 @@ void contra_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect,
 
 uint32_t contra_state::screen_update_contra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint8_t ctrl_1_0 = m_k007121_1->ctrlram_r(space, 0);
 	uint8_t ctrl_1_2 = m_k007121_1->ctrlram_r(space, 2);
 	uint8_t ctrl_2_0 = m_k007121_2->ctrlram_r(space, 0);

src/mame/video/darkseal.cpp

@@ -60,7 +60,7 @@ void darkseal_state::video_start()
 
 uint32_t darkseal_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen2->pf_control_r(space, 0, 0xffff);
 	flip_screen_set(!BIT(flip, 7));
 

src/mame/video/dassault.cpp

@@ -75,7 +75,7 @@ void dassault_state::mixdassaultlayer(bitmap_rgb32 &bitmap, bitmap_ind16* sprite
 /* are the priorities 100% correct? they're the same as they were before conversion to DECO52 sprite device, but if (for example) you walk to the side of the crates in the first part of the game you appear over them... */
 uint32_t dassault_state::screen_update_dassault(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 	uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff);
 

src/mame/video/dec0.cpp

@@ -127,7 +127,7 @@ uint32_t dec0_automat_state::screen_update_automat(screen_device &screen, bitmap
 	// layer enables seem different... where are they?
 
 	// the bootleg doesn't write these registers, I think they're hardcoded?, so fake them for compatibility with our implementation..
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	m_tilegen1->pf_control_0_w(space,0,0x0003, 0x00ff); // 8x8
 	m_tilegen1->pf_control_0_w(space,1,0x0003, 0x00ff);
 	m_tilegen1->pf_control_0_w(space,2,0x0000, 0x00ff);
@@ -194,7 +194,7 @@ uint32_t dec0_automat_state::screen_update_secretab(screen_device &screen, bitma
 	// layer enables seem different... where are they?
 
 	// the bootleg doesn't write these registers, I think they're hardcoded?, so fake them for compatibility with our implementation..
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	m_tilegen1->pf_control_0_w(space,0,0x0003, 0x00ff); // 8x8
 	m_tilegen1->pf_control_0_w(space,1,0x0003, 0x00ff);
 	m_tilegen1->pf_control_0_w(space,2,0x0000, 0x00ff);

src/mame/video/deco32.cpp

@@ -233,7 +233,7 @@ VIDEO_START_MEMBER(dragngun_state,lockload)
 
 uint32_t deco32_state::screen_update_captaven(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 	flip_screen_set(BIT(flip, 7));
 

src/mame/video/dietgo.cpp

@@ -5,7 +5,7 @@
 
 uint32_t dietgo_state::screen_update_dietgo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	flip_screen_set(BIT(flip, 7));

src/mame/video/dkong.cpp

@@ -708,7 +708,7 @@ void dkong_state::radarscp_step(int line_cnt)
 	 */
 
 	/* Now mix with SND02 (sound 2) line - on 74ls259, bit2 */
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	m_rflip_sig = m_dev_6h->bit2_r(space, 0) & m_lfsr_5I;
 
 	/* blue background generation */

src/mame/video/fastlane.cpp

@@ -139,7 +139,7 @@ uint32_t fastlane_state::screen_update_fastlane(screen_device &screen, bitmap_in
 	finalclip1 &= cliprect;
 
 	/* set scroll registers */
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	xoffs = m_k007121->ctrlram_r(space, 0);
 	for (i = 0; i < 32; i++)
 		m_layer0->set_scrollx(i, m_k007121_regs[0x20 + i] + xoffs - 40);

src/mame/video/flkatck.cpp

@@ -129,7 +129,7 @@ uint32_t flkatck_state::screen_update_flkatck(screen_device &screen, bitmap_ind1
 	rectangle clip[2];
 	const rectangle &visarea = screen.visible_area();
 
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	if (m_flipscreen)
 	{
 		clip[0] = visarea;

src/mame/video/funkyjet.cpp

@@ -13,7 +13,7 @@
 
 uint32_t funkyjet_state::screen_update_funkyjet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	flip_screen_set(BIT(flip, 7));

src/mame/video/gradius3.cpp

@@ -98,7 +98,7 @@ WRITE16_MEMBER(gradius3_state::gradius3_gfxram_w)
 uint32_t gradius3_state::screen_update_gradius3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	/* TODO: this kludge enforces the char banks. For some reason, they don't work otherwise. */
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	m_k052109->write(space, 0x1d80, 0x10);
 	m_k052109->write(space, 0x1f00, 0x32);
 

src/mame/video/groundfx.cpp

@@ -197,7 +197,7 @@ void groundfx_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,co
 
 uint32_t groundfx_state::screen_update_groundfx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint8_t layer[5];
 	uint8_t scclayer[3];
 	uint16_t priority;

src/mame/video/gtia.cpp

@@ -250,7 +250,7 @@ void gtia_device::device_reset()
 
 	/* reset the GTIA read/write/helper registers */
 	for (int i = 0; i < 32; i++)
-		write(machine().driver_data()->generic_space(), i, 0);
+		write(machine().dummy_space(), i, 0);
 
 	if (is_ntsc())
 		m_r.pal = 0xff;

src/mame/video/hcastle.cpp

@@ -182,7 +182,7 @@ WRITE8_MEMBER(hcastle_state::hcastle_pf2_control_w)
 void hcastle_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, uint8_t *sbank, int bank )
 {
 	k007121_device *k007121 = bank ? m_k007121_2 : m_k007121_1;
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	int base_color = (k007121->ctrlram_r(space, 6) & 0x30) * 2;
 	int bank_base = (bank == 0) ? 0x4000 * (m_gfx_bank & 1) : 0;
 
@@ -193,7 +193,7 @@ void hcastle_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect
 
 uint32_t hcastle_state::screen_update_hcastle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 
 	uint8_t ctrl_1_0 = m_k007121_1->ctrlram_r(space, 0);
 	uint8_t ctrl_1_1 = m_k007121_1->ctrlram_r(space, 1);

src/mame/video/labyrunr.cpp

@@ -158,7 +158,7 @@ WRITE8_MEMBER(labyrunr_state::labyrunr_vram2_w)
 
 uint32_t labyrunr_state::screen_update_labyrunr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint8_t ctrl_0 = m_k007121->ctrlram_r(space, 0);
 	rectangle finalclip0, finalclip1;
 

src/mame/video/pktgaldx.cpp

@@ -7,7 +7,7 @@
 
 uint32_t pktgaldx_state::screen_update_pktgaldx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	flip_screen_set(BIT(flip, 7));

src/mame/video/rohga.cpp

@@ -21,7 +21,7 @@ WRITE16_MEMBER(rohga_state::rohga_buffer_spriteram16_w)
 
 uint32_t rohga_state::screen_update_rohga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 	uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff);
 
@@ -124,7 +124,7 @@ void rohga_state::mixwizdfirelayer(bitmap_rgb32 &bitmap, const rectangle &clipre
 
 uint32_t rohga_state::screen_update_wizdfire(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 	uint16_t priority = m_decocomn->priority_r(space, 0, 0xffff);
 
@@ -160,7 +160,7 @@ uint32_t rohga_state::screen_update_wizdfire(screen_device &screen, bitmap_rgb32
 
 uint32_t rohga_state::screen_update_nitrobal(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	/* draw sprite gfx to temp bitmaps */

src/mame/video/slapshot.cpp

@@ -448,7 +448,7 @@ a bg layer given priority over some sprites.
 
 uint32_t slapshot_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint8_t layer[5];
 	uint8_t tilepri[5];
 	uint8_t spritepri[4];

src/mame/video/sprint4.cpp

@@ -134,7 +134,7 @@ void sprint4_state::screen_eof_sprint4(screen_device &screen, bool state)
 
 		/* update sound status */
 
-		address_space &space = machine().driver_data()->generic_space();
+		address_space &space = machine().dummy_space();
 		m_discrete->write(space, SPRINT4_MOTOR_DATA_1, videoram[0x391] & 15);
 		m_discrete->write(space, SPRINT4_MOTOR_DATA_2, videoram[0x393] & 15);
 		m_discrete->write(space, SPRINT4_MOTOR_DATA_3, videoram[0x395] & 15);

src/mame/video/sshangha.cpp

@@ -39,7 +39,7 @@ uint32_t sshangha_state::screen_update_sshangha(screen_device &screen, bitmap_rg
 		m_sprgen2->draw_sprites(bitmap, cliprect, m_spriteram2, 0x800, true);
 
 	// flip screen
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 	flip_screen_set(BIT(flip, 7));
 

src/mame/video/subs.cpp

@@ -109,7 +109,7 @@ uint32_t subs_state::screen_update_left(screen_device &screen, bitmap_ind16 &bit
 	}
 
 	/* Update sound */
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	m_discrete->write(space, SUBS_LAUNCH_DATA, m_spriteram[5] & 0x0f);   // Launch data
 	m_discrete->write(space, SUBS_CRASH_DATA, m_spriteram[5] >> 4);      // Crash/explode data
 	return 0;

src/mame/video/supbtime.cpp

@@ -24,7 +24,7 @@ End sequence uses rowscroll '98 c0' on pf1 (jmp to 1d61a on supbtimj)
 
 uint32_t supbtime_state::screen_update_supbtime(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	flip_screen_set(BIT(flip, 7));

src/mame/video/taito_b.cpp

@@ -258,7 +258,7 @@ void taitob_state::draw_framebuffer( bitmap_ind16 &bitmap, const rectangle &clip
 {
 	rectangle myclip = cliprect;
 	int x, y;
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint8_t video_control = m_tc0180vcu->get_videoctrl(space, 0);
 	uint8_t framebuffer_page = m_tc0180vcu->get_fb_page(space, 0);
 
@@ -361,7 +361,7 @@ g_profiler.stop();
 
 uint32_t taitob_state::screen_update_taitob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint8_t video_control = m_tc0180vcu->get_videoctrl(space, 0);
 
 	if ((video_control & 0x20) == 0)
@@ -397,7 +397,7 @@ uint32_t taitob_state::screen_update_taitob(screen_device &screen, bitmap_ind16
 
 uint32_t taitob_state::screen_update_realpunc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	const pen_t *palette = m_palette->pens();
 	uint8_t video_control = m_tc0180vcu->get_videoctrl(space, 0);
 	int x, y;
@@ -486,7 +486,7 @@ void taitob_state::screen_eof_taitob(screen_device &screen, bool state)
 	// rising edge
 	if (state)
 	{
-		address_space &space = machine().driver_data()->generic_space();
+		address_space &space = machine().dummy_space();
 		uint8_t video_control = m_tc0180vcu->get_videoctrl(space, 0);
 		uint8_t framebuffer_page = m_tc0180vcu->get_fb_page(space, 0);
 

src/mame/video/taito_f2.cpp

@@ -1016,7 +1016,7 @@ uint32_t taitof2_state::screen_update_taitof2(screen_device &screen, bitmap_ind1
 
 uint32_t taitof2_state::screen_update_taitof2_pri(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	int layer[3];
 
 	taitof2_handle_sprite_buffering();
@@ -1061,7 +1061,7 @@ void taitof2_state::draw_roz_layer( screen_device &screen, bitmap_ind16 &bitmap,
 
 uint32_t taitof2_state::screen_update_taitof2_pri_roz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	int tilepri[3];
 	int rozpri;
 	int layer[3];
@@ -1130,7 +1130,7 @@ uint32_t taitof2_state::screen_update_taitof2_pri_roz(screen_device &screen, bit
 /* Thunderfox */
 uint32_t taitof2_state::screen_update_taitof2_thundfox(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	int tilepri[2][3];
 	int spritepri[4];
 	int layer[2][3];
@@ -1267,7 +1267,7 @@ and it changes these (and the sprite pri settings) a lot.
 
 uint32_t taitof2_state::screen_update_taitof2_metalb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint8_t layer[5], invlayer[4];
 	uint16_t priority;
 
@@ -1318,7 +1318,7 @@ uint32_t taitof2_state::screen_update_taitof2_metalb(screen_device &screen, bitm
 /* Deadconx, Footchmp */
 uint32_t taitof2_state::screen_update_taitof2_deadconx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint8_t layer[5];
 	uint8_t tilepri[5];
 	uint8_t spritepri[4];

src/mame/video/taito_h.cpp

@@ -76,7 +76,7 @@ void taitoh_state::syvalion_draw_sprites( bitmap_ind16 &bitmap, const rectangle
 	/* Y chain size is 16/32?/64/64? pixels. X chain size
 	   is always 64 pixels. */
 
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	static const int size[] = { 1, 2, 4, 4 };
 	int x0, y0, x, y, dx, ex, zx;
 	int ysize;
@@ -169,7 +169,7 @@ void taitoh_state::recordbr_draw_sprites( bitmap_ind16 &bitmap, const rectangle
 	/* Y chain size is 16/32?/64/64? pixels. X chain size
 	   is always 64 pixels. */
 
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	static const int size[] = { 1, 2, 4, 4 };
 	int x0, y0, x, y, dx, dy, ex, ey, zx, zy;
 	int ysize;
@@ -281,7 +281,7 @@ void taitoh_state::dleague_draw_sprites( bitmap_ind16 &bitmap, const rectangle &
 	/* Y chain size is 16/32?/64/64? pixels. X chain size
 	   is always 64 pixels. */
 
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	static const int size[] = { 1, 2, 4, 4 };
 	int x0, y0, x, y, dx, ex, zx;
 	int ysize;

src/mame/video/taito_o.cpp

@@ -31,7 +31,7 @@ void taitoo_state::parentj_draw_sprites( bitmap_ind16 &bitmap, const rectangle &
 	/* Y chain size is 16/32?/64/64? pixels. X chain size
 	   is always 64 pixels. */
 
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	static const int size[] = { 1, 2, 4, 4 };
 	int x0, y0, x, y, dx, dy, ex, ey, zx, zy;
 	int ysize;

src/mame/video/taitoair.cpp

@@ -84,7 +84,7 @@ int taitoair_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec
 	/* Y chain size is 16/32?/64/64? pixels. X chain size
 	   is always 64 pixels. */
 	//const uint16_t stop_values[4] = { 0xc00, 0, 0, 0 };
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	static const int size[] = { 1, 2, 4, 4 };
 	int x0, y0, x, y, dx, dy, ex, ey, zx, zy;
 	int ysize;

src/mame/video/triplhnt.cpp

@@ -119,7 +119,7 @@ uint32_t triplhnt_state::screen_update_triplhnt(screen_device &screen, bitmap_in
 
 	draw_sprites(bitmap, cliprect);
 
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	m_discrete->write(space, TRIPLHNT_BEAR_ROAR_DATA, m_playfield_ram[0xfa] & 15);
 	m_discrete->write(space, TRIPLHNT_SHOT_DATA, m_playfield_ram[0xfc] & 15);
 	return 0;

src/mame/video/tumblep.cpp

@@ -21,7 +21,7 @@ to switch between 8*8 tiles and 16*16 tiles.
 
 uint32_t tumblep_state::screen_update_tumblep(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 
 	flip_screen_set(BIT(flip, 7));

src/mame/video/ultratnk.cpp

@@ -139,7 +139,7 @@ void ultratnk_state::screen_eof_ultratnk(screen_device &screen, bool state)
 
 		/* update sound status */
 
-		address_space &space = machine().driver_data()->generic_space();
+		address_space &space = machine().dummy_space();
 		m_discrete->write(space, ULTRATNK_MOTOR_DATA_1, videoram[0x391] & 15);
 		m_discrete->write(space, ULTRATNK_MOTOR_DATA_2, videoram[0x393] & 15);
 	}

src/mame/video/undrfire.cpp

@@ -347,7 +347,7 @@ void undrfire_state::draw_sprites_cbombers(screen_device &screen, bitmap_ind16 &
 
 uint32_t undrfire_state::screen_update_undrfire(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint8_t layer[5];
 	uint8_t scclayer[3];
 	uint16_t priority;
@@ -488,7 +488,7 @@ uint32_t undrfire_state::screen_update_undrfire(screen_device &screen, bitmap_in
 
 uint32_t undrfire_state::screen_update_cbombers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint8_t layer[5];
 	uint8_t scclayer[3];
 	uint16_t priority;

src/mame/video/vaportra.cpp

@@ -51,7 +51,7 @@ WRITE16_MEMBER(vaportra_state::vaportra_palette_24bit_b_w)
 
 uint32_t vaportra_state::screen_update_vaportra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	address_space &space = machine().driver_data()->generic_space();
+	address_space &space = machine().dummy_space();
 	uint16_t flip = m_deco_tilegen1->pf_control_r(space, 0, 0xffff);
 	int pri = m_priority[0] & 0x03;
 

src/mame/video/xmen.cpp

@@ -151,7 +151,7 @@ void xmen_state::screen_eof_xmen6p(screen_device &screen, bool state)
 		cliprect.set(0, 64 * 8 - 1, 2 * 8, 30 * 8 - 1);
 
 
-		address_space &space = machine().driver_data()->generic_space();
+		address_space &space = machine().dummy_space();
 		if (m_screen->frame_number() & 0x01)
 		{
 			/* copy the desired spritelist to the chip */