removed more dummy_space() calls (nw)

src/devices/bus/amiga/keyboard/mitsumi.cpp

@@ -109,7 +109,7 @@ public:
 	virtual WRITE_LINE_MEMBER(kdat_w) override
 	{
 		m_kdat_in = state ? 0x01U : 0x00U;
-		m_mcu->pa_w(machine().dummy_space(), 0, m_meta->read());
+		m_mcu->pa_w(m_meta->read());
 	}
 
 	READ_LINE_MEMBER(kdat_r)

src/devices/bus/psi_kbd/hle.cpp

@@ -308,7 +308,7 @@ uint8_t psi_hle_keyboard_device::translate(uint8_t row, uint8_t column)
 
 void psi_hle_keyboard_device::send_key(uint8_t code)
 {
-	m_host->key_data_w(machine().dummy_space(), 0, code);
+	m_host->key_data_w(code);
 	m_host->key_strobe_w(1);
 	m_host->key_strobe_w(0);
 }

src/devices/bus/psi_kbd/psi_kbd.h

@@ -63,7 +63,7 @@ public:
 	// called from keyboard
 	DECLARE_WRITE_LINE_MEMBER( rx_w ) { m_rx_handler(state); }
 	DECLARE_WRITE_LINE_MEMBER( key_strobe_w ) { m_key_strobe_handler(state); }
-	DECLARE_WRITE8_MEMBER( key_data_w ) { m_key_data = data; }
+	void key_data_w(uint8_t data) { m_key_data = data; }
 
 	// called from host
 	DECLARE_WRITE_LINE_MEMBER( tx_w );

src/devices/cpu/m6502/m6500_1.cpp

@@ -103,7 +103,7 @@ m6500_1_device::m6500_1_device(machine_config const &mconfig, char const *tag, d
 }
 
 
-WRITE8_MEMBER(m6500_1_device::pa_w)
+void m6500_1_device::pa_w(uint8_t data)
 {
 	machine().scheduler().synchronize(timer_expired_delegate(FUNC(m6500_1_device::set_port_in<0>), this), unsigned(data));
 }

src/devices/cpu/m6502/m6500_1.h

@@ -60,7 +60,7 @@ public:
 	DECLARE_READ8_MEMBER(pb_r) { return m_port_buf[1]; }
 	DECLARE_READ8_MEMBER(pc_r) { return m_port_buf[2]; }
 	DECLARE_READ8_MEMBER(pd_r) { return m_port_buf[3]; }
-	DECLARE_WRITE8_MEMBER(pa_w);
+	void pa_w(uint8_t data);
 	DECLARE_WRITE8_MEMBER(pb_w);
 	DECLARE_WRITE8_MEMBER(pc_w);
 	DECLARE_WRITE8_MEMBER(pd_w);

src/devices/video/pc_vga.cpp

@@ -2221,12 +2221,12 @@ WRITE8_MEMBER(vga_device::mem_w)
 	}
 }
 
-READ8_MEMBER(vga_device::mem_linear_r)
+uint8_t vga_device::mem_linear_r(offs_t offset)
 {
 	return vga.memory[offset % vga.svga_intf.vram_size];
 }
 
-WRITE8_MEMBER(vga_device::mem_linear_w)
+void vga_device::mem_linear_w(offs_t offset, uint8_t data)
 {
 	vga.memory[offset % vga.svga_intf.vram_size] = data;
 }
@@ -3328,9 +3328,8 @@ READ8_MEMBER(ati_vga_device::port_03c0_r)
 
 void ibm8514a_device::ibm8514_write_fg(uint32_t offset)
 {
-	address_space &space = machine().dummy_space();
 	offset %= m_vga->vga.svga_intf.vram_size;
-	uint8_t dst = m_vga->mem_linear_r(space,offset,0xff);
+	uint8_t dst = m_vga->mem_linear_r(offset);
 	uint8_t src = 0;
 
 	// check clipping rectangle
@@ -3357,7 +3356,7 @@ void ibm8514a_device::ibm8514_write_fg(uint32_t offset)
 		break;
 	case 0x0060:
 		// video memory - presume the memory is sourced from the current X/Y co-ords
-		src = m_vga->mem_linear_r(space,((ibm8514.curr_y * IBM8514_LINE_LENGTH) + ibm8514.curr_x),0xff);
+		src = m_vga->mem_linear_r(((ibm8514.curr_y * IBM8514_LINE_LENGTH) + ibm8514.curr_x));
 		break;
 	}
 
@@ -3365,61 +3364,60 @@ void ibm8514a_device::ibm8514_write_fg(uint32_t offset)
 	switch(ibm8514.fgmix & 0x000f)
 	{
 	case 0x0000:
-		m_vga->mem_linear_w(space,offset,~dst,0xff);
+		m_vga->mem_linear_w(offset,~dst);
 		break;
 	case 0x0001:
-		m_vga->mem_linear_w(space,offset,0x00,0xff);
+		m_vga->mem_linear_w(offset,0x00);
 		break;
 	case 0x0002:
-		m_vga->mem_linear_w(space,offset,0xff,0xff);
+		m_vga->mem_linear_w(offset,0xff);
 		break;
 	case 0x0003:
-		m_vga->mem_linear_w(space,offset,dst,0xff);
+		m_vga->mem_linear_w(offset,dst);
 		break;
 	case 0x0004:
-		m_vga->mem_linear_w(space,offset,~src,0xff);
+		m_vga->mem_linear_w(offset,~src);
 		break;
 	case 0x0005:
-		m_vga->mem_linear_w(space,offset,src ^ dst,0xff);
+		m_vga->mem_linear_w(offset,src ^ dst);
 		break;
 	case 0x0006:
-		m_vga->mem_linear_w(space,offset,~(src ^ dst),0xff);
+		m_vga->mem_linear_w(offset,~(src ^ dst));
 		break;
 	case 0x0007:
-		m_vga->mem_linear_w(space,offset,src,0xff);
+		m_vga->mem_linear_w(offset,src);
 		break;
 	case 0x0008:
-		m_vga->mem_linear_w(space,offset,~(src & dst),0xff);
+		m_vga->mem_linear_w(offset,~(src & dst));
 		break;
 	case 0x0009:
-		m_vga->mem_linear_w(space,offset,(~src) | dst,0xff);
+		m_vga->mem_linear_w(offset,(~src) | dst);
 		break;
 	case 0x000a:
-		m_vga->mem_linear_w(space,offset,src | (~dst),0xff);
+		m_vga->mem_linear_w(offset,src | (~dst));
 		break;
 	case 0x000b:
-		m_vga->mem_linear_w(space,offset,src | dst,0xff);
+		m_vga->mem_linear_w(offset,src | dst);
 		break;
 	case 0x000c:
-		m_vga->mem_linear_w(space,offset,src & dst,0xff);
+		m_vga->mem_linear_w(offset,src & dst);
 		break;
 	case 0x000d:
-		m_vga->mem_linear_w(space,offset,src & (~dst),0xff);
+		m_vga->mem_linear_w(offset,src & (~dst));
 		break;
 	case 0x000e:
-		m_vga->mem_linear_w(space,offset,(~src) & dst,0xff);
+		m_vga->mem_linear_w(offset,(~src) & dst);
 		break;
 	case 0x000f:
-		m_vga->mem_linear_w(space,offset,~(src | dst),0xff);
+		m_vga->mem_linear_w(offset,~(src | dst));
 		break;
 	}
 }
 
 void ibm8514a_device::ibm8514_write_bg(uint32_t offset)
 {
-	address_space &space = machine().dummy_space();
 	offset %= m_vga->vga.svga_intf.vram_size;
-	uint8_t dst = m_vga->mem_linear_r(space,offset,0xff);
+	uint8_t dst = m_vga->mem_linear_r(offset);
 	uint8_t src = 0;
 
 	// check clipping rectangle
@@ -3446,7 +3444,7 @@ void ibm8514a_device::ibm8514_write_bg(uint32_t offset)
 		break;
 	case 0x0060:
 		// video memory - presume the memory is sourced from the current X/Y co-ords
-		src = m_vga->mem_linear_r(space,((ibm8514.curr_y * IBM8514_LINE_LENGTH) + ibm8514.curr_x),0xff);
+		src = m_vga->mem_linear_r(((ibm8514.curr_y * IBM8514_LINE_LENGTH) + ibm8514.curr_x));
 		break;
 	}
 
@@ -3454,52 +3452,52 @@ void ibm8514a_device::ibm8514_write_bg(uint32_t offset)
 	switch(ibm8514.bgmix & 0x000f)
 	{
 	case 0x0000:
-		m_vga->mem_linear_w(space,offset,~dst,0xff);
+		m_vga->mem_linear_w(offset,~dst);
 		break;
 	case 0x0001:
-		m_vga->mem_linear_w(space,offset,0x00,0xff);
+		m_vga->mem_linear_w(offset,0x00);
 		break;
 	case 0x0002:
-		m_vga->mem_linear_w(space,offset,0xff,0xff);
+		m_vga->mem_linear_w(offset,0xff);
 		break;
 	case 0x0003:
-		m_vga->mem_linear_w(space,offset,dst,0xff);
+		m_vga->mem_linear_w(offset,dst);
 		break;
 	case 0x0004:
-		m_vga->mem_linear_w(space,offset,~src,0xff);
+		m_vga->mem_linear_w(offset,~src);
 		break;
 	case 0x0005:
-		m_vga->mem_linear_w(space,offset,src ^ dst,0xff);
+		m_vga->mem_linear_w(offset,src ^ dst);
 		break;
 	case 0x0006:
-		m_vga->mem_linear_w(space,offset,~(src ^ dst),0xff);
+		m_vga->mem_linear_w(offset,~(src ^ dst));
 		break;
 	case 0x0007:
-		m_vga->mem_linear_w(space,offset,src,0xff);
+		m_vga->mem_linear_w(offset,src);
 		break;
 	case 0x0008:
-		m_vga->mem_linear_w(space,offset,~(src & dst),0xff);
+		m_vga->mem_linear_w(offset,~(src & dst));
 		break;
 	case 0x0009:
-		m_vga->mem_linear_w(space,offset,(~src) | dst,0xff);
+		m_vga->mem_linear_w(offset,(~src) | dst);
 		break;
 	case 0x000a:
-		m_vga->mem_linear_w(space,offset,src | (~dst),0xff);
+		m_vga->mem_linear_w(offset,src | (~dst));
 		break;
 	case 0x000b:
-		m_vga->mem_linear_w(space,offset,src | dst,0xff);
+		m_vga->mem_linear_w(offset,src | dst);
 		break;
 	case 0x000c:
-		m_vga->mem_linear_w(space,offset,src & dst,0xff);
+		m_vga->mem_linear_w(offset,src & dst);
 		break;
 	case 0x000d:
-		m_vga->mem_linear_w(space,offset,src & (~dst),0xff);
+		m_vga->mem_linear_w(offset,src & (~dst));
 		break;
 	case 0x000e:
-		m_vga->mem_linear_w(space,offset,(~src) & dst,0xff);
+		m_vga->mem_linear_w(offset,(~src) & dst);
 		break;
 	case 0x000f:
-		m_vga->mem_linear_w(space,offset,~(src | dst),0xff);
+		m_vga->mem_linear_w(offset,~(src | dst));
 		break;
 	}
 }
@@ -3547,7 +3545,7 @@ void ibm8514a_device::ibm8514_write(uint32_t offset, uint32_t src)
 			ibm8514.src_x = 0;
 		break;
 	case 0x00c0:  // use source plane
-		if (m_vga->mem_linear_r(machine().dummy_space(), src, 0xff) != 0x00)
+		if (m_vga->mem_linear_r(src) != 0x00)
 			ibm8514_write_fg(offset);
 		else
 			ibm8514_write_bg(offset);
@@ -3885,7 +3883,7 @@ WRITE16_MEMBER(ibm8514a_device::ibm8514_cmd_w)
 				if((ibm8514.pixel_control & 0xc0) == 0xc0)
 				{
 					// only check read mask if Mix Select is set to 11 (VRAM determines mix)
-					if(m_vga->mem_linear_r(space,(src+x),0xff) & ~readmask)
+					if(m_vga->mem_linear_r((src+x)) & ~readmask)
 					{
 						// presumably every program is going to be smart enough to set the FG mix to use VRAM (0x6x)
 						if(data & 0x0020)

src/devices/video/pc_vga.h

@@ -34,8 +34,8 @@ public:
 	virtual WRITE8_MEMBER(port_03d0_w);
 	virtual READ8_MEMBER(mem_r);
 	virtual WRITE8_MEMBER(mem_w);
-	virtual READ8_MEMBER(mem_linear_r);
+	virtual uint8_t mem_linear_r(offs_t offset);
-	virtual WRITE8_MEMBER(mem_linear_w);
+	virtual void mem_linear_w(offs_t offset,uint8_t data);
 	virtual TIMER_CALLBACK_MEMBER(vblank_timer_cb);
 
 	void set_offset(uint16_t val) { vga.crtc.offset = val; }

src/devices/video/ps2gif.cpp

@@ -291,8 +291,8 @@ void ps2_gif_device::process_tag(tag_t &tag, uint64_t hi, uint64_t lo)
 			tag.loop();
 			break;
 		default:
-			m_gs->regs_w(machine().dummy_space(), 0x54, lo);
+			m_gs->regs_w(0x54, lo);
-			m_gs->regs_w(machine().dummy_space(), 0x54, hi);
+			m_gs->regs_w(0x54, hi);
 			tag.loop();
 			break;
 	}

src/devices/video/ps2gs.cpp

@@ -433,7 +433,7 @@ void ps2_gs_device::write_packed(const uint8_t reg, const uint64_t hi, const uin
 	switch (reg)
 	{
 		case 0x0e:
-			regs_w(machine().dummy_space(), (uint32_t)hi, lo, ~0ULL);
+			regs_w((uint32_t)hi, lo);
 			break;
 		default:
 			logerror("%s: write_packed: Unknown register %02x = %08x%08x%08x%08x\n", machine().describe_context(), reg, (uint32_t)(hi >> 32), (uint32_t)hi, (uint32_t)(lo >> 32), (uint32_t)lo);
@@ -441,7 +441,7 @@ void ps2_gs_device::write_packed(const uint8_t reg, const uint64_t hi, const uin
 	}
 }
 
-WRITE64_MEMBER(ps2_gs_device::regs_w)
+void ps2_gs_device::regs_w(offs_t offset, uint64_t data)
 {
 	static char const *const dir_strs[4] = {
 		"Host->Local", "Local->Host", "Local->Local", "None"

src/devices/video/ps2gs.h

@@ -40,7 +40,7 @@ public:
 	DECLARE_READ64_MEMBER(priv_regs1_r);
 	DECLARE_WRITE64_MEMBER(priv_regs1_w);
 
-	DECLARE_WRITE64_MEMBER(regs_w);
+	void regs_w(offs_t offset, uint64_t data);
 
 	DECLARE_READ32_MEMBER(gif_r);
 	DECLARE_WRITE32_MEMBER(gif_w);

src/mame/audio/polepos.cpp

@@ -308,8 +308,8 @@ WRITE_LINE_MEMBER(polepos_sound_device::clson_w)
 {
 	if (!state)
 	{
-		polepos_engine_sound_lsb_w(machine().dummy_space(), 0, 0);
+		polepos_engine_sound_lsb_w(0);
-		polepos_engine_sound_msb_w(machine().dummy_space(), 0, 0);
+		polepos_engine_sound_msb_w(0);
 	}
 }
 
@@ -317,7 +317,7 @@ WRITE_LINE_MEMBER(polepos_sound_device::clson_w)
 /************************************/
 /* Write LSB of engine sound        */
 /************************************/
-WRITE8_MEMBER(polepos_sound_device::polepos_engine_sound_lsb_w)
+void polepos_sound_device::polepos_engine_sound_lsb_w(uint8_t data)
 {
 	/* Update stream first so all samples at old frequency are updated. */
 	m_stream->update();
@@ -328,7 +328,7 @@ WRITE8_MEMBER(polepos_sound_device::polepos_engine_sound_lsb_w)
 /************************************/
 /* Write MSB of engine sound        */
 /************************************/
-WRITE8_MEMBER(polepos_sound_device::polepos_engine_sound_msb_w)
+void polepos_sound_device::polepos_engine_sound_msb_w(uint8_t data)
 {
 	m_stream->update();
 	m_sample_msb = data & 63;

src/mame/audio/polepos.h

@@ -23,8 +23,8 @@ protected:
 
 public:
 	DECLARE_WRITE_LINE_MEMBER(clson_w);
-	DECLARE_WRITE8_MEMBER(polepos_engine_sound_lsb_w);
+	void polepos_engine_sound_lsb_w(uint8_t data);
-	DECLARE_WRITE8_MEMBER(polepos_engine_sound_msb_w);
+	void polepos_engine_sound_msb_w(uint8_t data);
 
 private:
 	struct filter2_context

src/mame/drivers/asteroid.cpp

@@ -301,7 +301,7 @@ WRITE8_MEMBER(asteroid_state::earom_write)
 	m_earom->set_data(data);
 }
 
-WRITE8_MEMBER(asteroid_state::earom_control_w)
+void asteroid_state::earom_control_w(uint8_t data)
 {
 	// CK = DB0, C1 = /DB2, C2 = DB1, CS1 = DB3, /CS2 = GND
 	m_earom->set_control(BIT(data, 3), 1, !BIT(data, 2), BIT(data, 1));

src/mame/drivers/beezer.cpp

@@ -92,7 +92,7 @@ public:
 	DECLARE_READ8_MEMBER(via_system_pb_r);
 	DECLARE_WRITE8_MEMBER(via_system_pa_w);
 	DECLARE_WRITE8_MEMBER(via_system_pb_w);
-	DECLARE_WRITE8_MEMBER(bankswitch_w);
+	void bankswitch_w(uint8_t data);
 
 	void beezer(machine_config &config);
 	void banked_map(address_map &map);
@@ -445,7 +445,7 @@ WRITE8_MEMBER( beezer_state::via_system_pb_w )
 	m_pbus = data;
 }
 
-WRITE8_MEMBER( beezer_state::bankswitch_w )
+void beezer_state::bankswitch_w(uint8_t data)
 {
 	m_x = BIT(data, 3);
 	m_y = BIT(data, 4);
@@ -483,7 +483,7 @@ void beezer_state::machine_reset()
 	m_pbus = 0xff;
 
 	// initialize memory banks
-	bankswitch_w(machine().dummy_space(), 0, 0);
+	bankswitch_w(0);
 
 	// start timer
 	m_dac_timer->adjust(attotime::zero, 0, attotime::from_hz((XTAL(4'000'000) / 4) / 16));

src/mame/drivers/bwidow.cpp

@@ -373,7 +373,7 @@ WRITE8_MEMBER(bwidow_state::earom_write)
 	m_earom->set_data(data);
 }
 
-WRITE8_MEMBER(bwidow_state::earom_control_w)
+void bwidow_state::earom_control_w(uint8_t data)
 {
 	// CK = DB0, C1 = /DB2, C2 = DB1, CS1 = DB3, /CS2 = GND
 	m_earom->set_control(BIT(data, 3), 1, !BIT(data, 2), BIT(data, 1));
@@ -382,7 +382,7 @@ WRITE8_MEMBER(bwidow_state::earom_control_w)
 
 void bwidow_state::machine_reset()
 {
-	earom_control_w(machine().dummy_space(), 0, 0);
+	earom_control_w(0);
 }
 
 

src/mame/drivers/centiped.cpp

@@ -457,7 +457,7 @@ MACHINE_RESET_MEMBER(centiped_state,centiped)
 	m_prg_bank = 0;
 
 	if (m_earom.found())
-		earom_control_w(machine().dummy_space(), 0, 0);
+		earom_control_w(0);
 }
 
 
@@ -663,7 +663,7 @@ WRITE8_MEMBER(centiped_state::earom_write)
 	m_earom->set_data(data);
 }
 
-WRITE8_MEMBER(centiped_state::earom_control_w)
+void centiped_state::earom_control_w(uint8_t data)
 {
 	// CK = DB0, C1 = /DB1, C2 = DB2, CS1 = DB3, /CS2 = GND
 	m_earom->set_control(BIT(data, 3), 1, !BIT(data, 1), BIT(data, 2));

src/mame/drivers/dec8.cpp

@@ -250,7 +250,7 @@ WRITE8_MEMBER(dec8_state::dec8_bank_w)
 }
 
 /* Used by Ghostbusters, Meikyuu Hunter G & Gondomania */
-WRITE8_MEMBER(dec8_state::ghostb_bank_w)
+void dec8_state::ghostb_bank_w(uint8_t data)
 {
 	/* Bit 0: SECCLR - acknowledge interrupt from I8751
 	   Bit 1: NMI enable/disable
@@ -1874,7 +1874,7 @@ void dec8_state::machine_reset()
 
 	// reset clears LS273 latch, which disables NMI
 	if (m_nmigate.found())
-		ghostb_bank_w(machine().dummy_space(), 0, 0);
+		ghostb_bank_w(0);
 }
 
 

src/mame/drivers/galaga.cpp

@@ -820,7 +820,7 @@ WRITE8_MEMBER(digdug_state::earom_write)
 	m_earom->set_data(data);
 }
 
-WRITE8_MEMBER(digdug_state::earom_control_w)
+void digdug_state::earom_control_w(uint8_t data)
 {
 	// CK = DB0, C1 = /DB1, C2 = DB2, CS1 = DB3, /CS2 = GND
 	m_earom->set_control(BIT(data, 3), 1, !BIT(data, 1), BIT(data, 2));
@@ -841,7 +841,7 @@ void galaga_state::machine_start()
 void digdug_state::machine_start()
 {
 	galaga_state::machine_start();
-	earom_control_w(machine().dummy_space(), 0, 0);
+	earom_control_w(0);
 }
 
 void galaga_state::machine_reset()

src/mame/drivers/hh_sm510.cpp

@@ -279,7 +279,7 @@ u8 hh_sm510_state::read_inputs(int columns, int fixed)
 void hh_sm510_state::update_k_line()
 {
 	// this is necessary because the MCU can wake up on K input activity
-	m_maincpu->set_input_line(SM510_INPUT_LINE_K, input_r(machine().dummy_space(), 0, 0xff) ? ASSERT_LINE : CLEAR_LINE);
+	m_maincpu->set_input_line(SM510_INPUT_LINE_K, input_r() ? ASSERT_LINE : CLEAR_LINE);
 }
 
 INPUT_CHANGED_MEMBER(hh_sm510_state::input_changed)
@@ -293,7 +293,7 @@ WRITE8_MEMBER(hh_sm510_state::input_w)
 	update_k_line();
 }
 
-READ8_MEMBER(hh_sm510_state::input_r)
+uint8_t hh_sm510_state::input_r()
 {
 	return read_inputs(m_inp_lines, m_inp_fixed);
 }

src/mame/drivers/hh_tms1k.cpp

@@ -12238,7 +12238,7 @@ public:
 	void update_display();
 	DECLARE_WRITE16_MEMBER(write_r);
 	DECLARE_WRITE16_MEMBER(write_o);
-	DECLARE_READ8_MEMBER(read_k);
+	uint8_t read_k();
 	void xl25(machine_config &config);
 
 protected:
@@ -12256,7 +12256,7 @@ void xl25_state::machine_reset()
 void xl25_state::update_halt()
 {
 	// O5+K4 go to HALT pin (used when pressing store/recall button)
-	bool halt = !((m_o & 0x20) || (read_k(machine().dummy_space(), 0) & 4));
+	bool halt = !((m_o & 0x20) || (read_k() & 4));
 	m_maincpu->set_input_line(INPUT_LINE_HALT, halt ? ASSERT_LINE : CLEAR_LINE);
 }
 
@@ -12286,7 +12286,7 @@ WRITE16_MEMBER(xl25_state::write_o)
 	update_halt();
 }
 
-READ8_MEMBER(xl25_state::read_k)
+uint8_t xl25_state::read_k()
 {
 	// K: multiplexed inputs
 	// K4 also goes to MCU halt

src/mame/drivers/konamigs.cpp

@@ -114,7 +114,7 @@ protected:
 
 	// Q2SD GPU
 	DECLARE_READ16_MEMBER(gpu_r);
-	DECLARE_WRITE16_MEMBER(gpu_w);
+	void gpu_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff);
 	DECLARE_READ16_MEMBER(vram_r);
 	DECLARE_WRITE16_MEMBER(vram_w);
 	DECLARE_WRITE_LINE_MEMBER(vblank);
@@ -332,7 +332,7 @@ READ16_MEMBER(gsan_state::gpu_r)
 	return m_gpuregs[offset];
 }
 
-WRITE16_MEMBER(gsan_state::gpu_w)
+void gsan_state::gpu_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
 	u16 prevval = m_gpuregs[offset];
 	COMBINE_DATA(&m_gpuregs[offset]);
@@ -688,7 +688,7 @@ void gsan_state::do_render(bool vbkem)
 			m_uymax = m_gpuregs[0x8e / 2] = m_vram[listoffs++];
 			break;
 		case 0x16: // WPR
-			gpu_w(machine().dummy_space(), m_vram[listoffs] & 0x3ff, m_vram[listoffs + 1]);
+			gpu_w(m_vram[listoffs] & 0x3ff, m_vram[listoffs + 1]);
 			listoffs += 2;
 			break;
 		case 0x17: // SCLIP

src/mame/drivers/ms0515.cpp

@@ -88,7 +88,7 @@ private:
 	uint32_t screen_update_ms0515(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	DECLARE_WRITE_LINE_MEMBER(screen_vblank);
 
-	DECLARE_WRITE16_MEMBER(ms0515_bank_w);
+	void ms0515_bank_w(uint16_t data);
 
 	DECLARE_READ16_MEMBER(ms0515_halt_r);
 	DECLARE_WRITE16_MEMBER(ms0515_halt_w);
@@ -189,11 +189,11 @@ void ms0515_state::ms0515_mem(address_map &map)
  * 13   parallel port ... signal
  * 14-15 unused
  */
-WRITE16_MEMBER(ms0515_state::ms0515_bank_w)
+void ms0515_state::ms0515_bank_w(uint16_t data)
 {
 	uint8_t *ram = m_ram->pointer();
 
-	LOGBANK("Bank <- %04x & %04x (vblank %d timer %d)\n", data, mem_mask, BIT(data, 8), BIT(data, 9));
+	LOGBANK("Bank <- %04x (vblank %d timer %d)\n", data, BIT(data, 8), BIT(data, 9));
 
 	if (BIT(data ^ m_bankreg, 8)) irq2_w(BIT(data, 8) ? ASSERT_LINE : CLEAR_LINE);
 
@@ -355,7 +355,7 @@ WRITE_LINE_MEMBER(ms0515_state::pit8253_out2_changed)
 void ms0515_state::machine_reset()
 {
 	uint8_t *ram = m_ram->pointer();
-	ms0515_bank_w(machine().dummy_space(), 0, 0);
+	ms0515_bank_w(0);
 
 	m_video_ram = ram + 0000000 + 0340000;
 	m_blink = 0;

src/mame/drivers/runaway.cpp

@@ -45,7 +45,7 @@ void runaway_state::machine_reset()
 {
 	m_interrupt_timer->adjust(m_screen->time_until_pos(16), 16);
 	if (m_earom.found())
-		earom_control_w(machine().dummy_space(), 0, 0);
+		earom_control_w(0);
 }
 
 
@@ -89,7 +89,7 @@ WRITE8_MEMBER(runaway_state::earom_write)
 	m_earom->set_data(data);
 }
 
-WRITE8_MEMBER(runaway_state::earom_control_w)
+void runaway_state::earom_control_w(uint8_t data)
 {
 	// CK = DB0, C1 = /DB2, C2 = DB1, CS1 = DB3, /CS2 = GND
 	m_earom->set_control(BIT(data, 3), 1, !BIT(data, 2), BIT(data, 1));

src/mame/drivers/rzone.cpp

@@ -69,7 +69,7 @@ private:
 
 	DECLARE_WRITE8_MEMBER(t1_write_r);
 	DECLARE_WRITE8_MEMBER(t1_write_s);
-	virtual DECLARE_READ8_MEMBER(input_r) override;
+	virtual uint8_t input_r() override;
 
 	void t2_update_audio();
 	DECLARE_WRITE8_MEMBER(t2_write_r);
@@ -173,7 +173,7 @@ WRITE8_MEMBER(rzone_state::t1_write_s)
 	sclock_w(data >> 1 & 1);
 }
 
-READ8_MEMBER(rzone_state::input_r)
+uint8_t rzone_state::input_r()
 {
 	// K1: SDATA
 	return sdata_r();

src/mame/drivers/saitek_mark5.cpp

@@ -112,7 +112,7 @@ private:
 	DECLARE_WRITE8_MEMBER(lcd_data_w);
 	DECLARE_WRITE8_MEMBER(sound_w);
 	DECLARE_READ8_MEMBER(sound_r);
-	DECLARE_WRITE8_MEMBER(reset_irq_w);
+	void reset_irq_w(uint8_t data);
 	DECLARE_READ8_MEMBER(reset_irq_r);
 	DECLARE_READ8_MEMBER(input_r);
 	DECLARE_READ8_MEMBER(cb_rom_r);
@@ -152,7 +152,7 @@ void mark5_state::machine_start()
 
 void mark5_state::machine_reset()
 {
-	reset_irq_w(machine().dummy_space(), 0, 0);
+	reset_irq_w(0);
 }
 
 
@@ -210,7 +210,7 @@ TIMER_CALLBACK_MEMBER(mark5_state::interrupt)
 	write_lcd(m_lcd_lcd ^ 1);
 }
 
-WRITE8_MEMBER(mark5_state::reset_irq_w)
+void mark5_state::reset_irq_w(uint8_t data)
 {
 	// MC14020 R
 	m_irqtimer->adjust(attotime::from_hz((19.6608_MHz_XTAL / 10 / 0x1000) * 2));
@@ -220,7 +220,7 @@ WRITE8_MEMBER(mark5_state::reset_irq_w)
 READ8_MEMBER(mark5_state::reset_irq_r)
 {
 	if (!machine().side_effects_disabled())
-		reset_irq_w(space, offset, 0);
+		reset_irq_w(0);
 
 	return 0xff;
 }

src/mame/drivers/vis.cpp

@@ -446,14 +446,14 @@ READ8_MEMBER(vis_vga_device::visvgamem_r)
 	if(!(vga.sequencer.data[0x25] & 0x40))
 		return mem_r(space, offset, mem_mask);
 	u16 win = (vga.sequencer.data[0x1e] & 0x0f) == 3 ? m_wina : m_winb; // this doesn't seem quite right
-	return mem_linear_r(space, (offset + (win * 64)) & 0x3ffff, mem_mask);
+	return mem_linear_r((offset + (win * 64)) & 0x3ffff);
 }
 
 WRITE8_MEMBER(vis_vga_device::visvgamem_w)
 {
 	if(!(vga.sequencer.data[0x25] & 0x40))
 		return mem_w(space, offset, data, mem_mask);
-	return mem_linear_w(space, (offset + (m_wina * 64)) & 0x3ffff, data, mem_mask);
+	return mem_linear_w((offset + (m_wina * 64)) & 0x3ffff, data);
 }
 
 READ8_MEMBER(vis_vga_device::vga_r)

src/mame/includes/asteroid.h

@@ -55,7 +55,7 @@ public:
 
 	DECLARE_READ8_MEMBER(earom_read);
 	DECLARE_WRITE8_MEMBER(earom_write);
-	DECLARE_WRITE8_MEMBER(earom_control_w);
+	void earom_control_w(uint8_t data);
 
 	DECLARE_READ_LINE_MEMBER(clock_r);
 

src/mame/includes/bwidow.h

@@ -41,7 +41,7 @@ protected:
 	DECLARE_WRITE8_MEMBER(irq_ack_w);
 	DECLARE_READ8_MEMBER(earom_read);
 	DECLARE_WRITE8_MEMBER(earom_write);
-	DECLARE_WRITE8_MEMBER(earom_control_w);
+	void earom_control_w(uint8_t data);
 
 	void bwidow_map(address_map &map);
 	void bwidowp_map(address_map &map);

src/mame/includes/centiped.h

@@ -98,7 +98,7 @@ private:
 	DECLARE_WRITE_LINE_MEMBER(bullsdrt_coin_count_w);
 	DECLARE_READ8_MEMBER(earom_read);
 	DECLARE_WRITE8_MEMBER(earom_write);
-	DECLARE_WRITE8_MEMBER(earom_control_w);
+	void earom_control_w(uint8_t data);
 	DECLARE_READ8_MEMBER(caterplr_unknown_r);
 	DECLARE_WRITE8_MEMBER(caterplr_AY8910_w);
 	DECLARE_READ8_MEMBER(caterplr_AY8910_r);

src/mame/includes/dec8.h

@@ -136,7 +136,7 @@ private:
 	DECLARE_WRITE8_MEMBER(dec8_i8751_w);
 	DECLARE_WRITE8_MEMBER(csilver_i8751_w);
 	DECLARE_WRITE8_MEMBER(dec8_bank_w);
-	DECLARE_WRITE8_MEMBER(ghostb_bank_w);
+	void ghostb_bank_w(uint8_t data);
 	DECLARE_WRITE8_MEMBER(csilver_control_w);
 	DECLARE_WRITE8_MEMBER(dec8_sound_w);
 	DECLARE_WRITE8_MEMBER(csilver_adpcm_data_w);

src/mame/includes/digdug.h

@@ -47,7 +47,7 @@ private:
 
 	DECLARE_READ8_MEMBER(earom_read);
 	DECLARE_WRITE8_MEMBER(earom_write);
-	DECLARE_WRITE8_MEMBER(earom_control_w);
+	void earom_control_w(uint8_t data);
 	virtual void machine_start() override;
 
 	void digdug_map(address_map &map);

src/mame/includes/hh_sm510.h

@@ -55,7 +55,7 @@ protected:
 	virtual void update_k_line();
 	virtual DECLARE_WRITE16_MEMBER(sm510_lcd_segment_w);
 	virtual DECLARE_WRITE16_MEMBER(sm500_lcd_segment_w);
-	virtual DECLARE_READ8_MEMBER(input_r);
+	virtual uint8_t input_r();
 	virtual DECLARE_WRITE8_MEMBER(input_w);
 	virtual DECLARE_WRITE8_MEMBER(piezo_r1_w);
 	virtual DECLARE_WRITE8_MEMBER(piezo_r2_w);

src/mame/includes/irobot.h

@@ -65,9 +65,9 @@ private:
 	DECLARE_WRITE8_MEMBER(irobot_clearfirq_w);
 	DECLARE_READ8_MEMBER(irobot_sharedmem_r);
 	DECLARE_WRITE8_MEMBER(irobot_sharedmem_w);
-	DECLARE_WRITE8_MEMBER(irobot_statwr_w);
+	void irobot_statwr_w(uint8_t data);
-	DECLARE_WRITE8_MEMBER(irobot_out0_w);
+	void irobot_out0_w(uint8_t data);
-	DECLARE_WRITE8_MEMBER(irobot_rom_banksel_w);
+	void irobot_rom_banksel_w(uint8_t data);
 	DECLARE_READ8_MEMBER(irobot_status_r);
 	DECLARE_WRITE8_MEMBER(irobot_paletteram_w);
 	DECLARE_READ8_MEMBER(quad_pokeyn_r);

src/mame/includes/runaway.h

@@ -32,7 +32,7 @@ private:
 	DECLARE_WRITE8_MEMBER(runaway_irq_ack_w);
 	DECLARE_READ8_MEMBER(earom_read);
 	DECLARE_WRITE8_MEMBER(earom_write);
-	DECLARE_WRITE8_MEMBER(earom_control_w);
+	void earom_control_w(uint8_t data);
 	DECLARE_WRITE8_MEMBER(runaway_paletteram_w);
 	DECLARE_WRITE8_MEMBER(runaway_video_ram_w);
 	DECLARE_WRITE_LINE_MEMBER(tile_bank_w);

src/mame/machine/asteroid.cpp

@@ -133,7 +133,7 @@ void asteroid_state::machine_reset()
 {
 	m_dvg->reset_w();
 	if (m_earom.found())
-		earom_control_w(machine().dummy_space(), 0, 0);
+		earom_control_w(0);
 
 	/* reset RAM banks if present */
 	if (m_ram1.target() != nullptr)

src/mame/machine/irobot.cpp

@@ -62,7 +62,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(irobot_state::irobot_irvg_done_callback)
 	m_irvg_running = 0;
 }
 
-WRITE8_MEMBER(irobot_state::irobot_statwr_w)
+void irobot_state::irobot_statwr_w(uint8_t data)
 {
 	logerror("write %2x ", data);
 	IR_CPU_STATE();
@@ -96,7 +96,7 @@ WRITE8_MEMBER(irobot_state::irobot_statwr_w)
 	m_statwr = data;
 }
 
-WRITE8_MEMBER(irobot_state::irobot_out0_w)
+void irobot_state::irobot_out0_w(uint8_t data)
 {
 	uint8_t *RAM = memregion("maincpu")->base();
 
@@ -118,7 +118,7 @@ WRITE8_MEMBER(irobot_state::irobot_out0_w)
 	m_alphamap = (data & 0x80);
 }
 
-WRITE8_MEMBER(irobot_state::irobot_rom_banksel_w)
+void irobot_state::irobot_rom_banksel_w(uint8_t data)
 {
 	uint8_t *RAM = memregion("maincpu")->base();
 
@@ -188,10 +188,9 @@ void irobot_state::machine_reset()
 	m_irvg_running = 0;
 	m_irmb_running = 0;
 
-	address_space &space = machine().dummy_space();
+	irobot_rom_banksel_w(0);
-	irobot_rom_banksel_w(space, 0, 0);
+	irobot_out0_w(0);
-	irobot_out0_w(space, 0, 0);
+	irobot_statwr_w(0);
-	irobot_statwr_w(space, 0, 0);
 	m_outx = 0;
 }
 

src/mame/video/antic.cpp

@@ -2043,16 +2043,16 @@ TIMER_CALLBACK_MEMBER( antic_device::scanline_render )
 			if( m_w.dmactl & DMA_MISSILE )
 			{
 				m_steal_cycles += 1;
-				m_gtia->write(space, 0x11, RDPMGFXD(space, 3*256));
+				m_gtia->write(0x11, RDPMGFXD(space, 3*256));
 			}
 			/* transport player data to GTIA ? */
 			if( m_w.dmactl & DMA_PLAYER )
 			{
 				m_steal_cycles += 4;
-				m_gtia->write(space, 0x0d, RDPMGFXD(space, 4*256));
+				m_gtia->write(0x0d, RDPMGFXD(space, 4*256));
-				m_gtia->write(space, 0x0e, RDPMGFXD(space, 5*256));
+				m_gtia->write(0x0e, RDPMGFXD(space, 5*256));
-				m_gtia->write(space, 0x0f, RDPMGFXD(space, 6*256));
+				m_gtia->write(0x0f, RDPMGFXD(space, 6*256));
-				m_gtia->write(space, 0x10, RDPMGFXD(space, 7*256));
+				m_gtia->write(0x10, RDPMGFXD(space, 7*256));
 			}
 		}
 		else
@@ -2062,17 +2062,17 @@ TIMER_CALLBACK_MEMBER( antic_device::scanline_render )
 			{
 				if( (m_scanline & 1) == 0 )      /* even line ? */
 					m_steal_cycles += 1;
-				m_gtia->write(space, 0x11, RDPMGFXS(space, 3*128));
+				m_gtia->write(0x11, RDPMGFXS(space, 3*128));
 			}
 			/* transport player data to GTIA ? */
 			if( m_w.dmactl & DMA_PLAYER )
 			{
 				if( (m_scanline & 1) == 0 )      /* even line ? */
 					m_steal_cycles += 4;
-				m_gtia->write(space, 0x0d, RDPMGFXS(space, 4*128));
+				m_gtia->write(0x0d, RDPMGFXS(space, 4*128));
-				m_gtia->write(space, 0x0e, RDPMGFXS(space, 5*128));
+				m_gtia->write(0x0e, RDPMGFXS(space, 5*128));
-				m_gtia->write(space, 0x0f, RDPMGFXS(space, 6*128));
+				m_gtia->write(0x0f, RDPMGFXS(space, 6*128));
-				m_gtia->write(space, 0x10, RDPMGFXS(space, 7*128));
+				m_gtia->write(0x10, RDPMGFXS(space, 7*128));
 			}
 		}
 	}

src/mame/video/gtia.cpp

@@ -252,7 +252,7 @@ void gtia_device::device_reset()
 
 	/* reset the GTIA read/write/helper registers */
 	for (int i = 0; i < 32; i++)
-		write(machine().dummy_space(), i, 0);
+		write(i, 0);
 
 	if (is_ntsc())
 		m_r.pal = 0xff;
@@ -509,7 +509,7 @@ void gtia_device::recalc_m3()
 
 
 
-WRITE8_MEMBER( gtia_device::write )
+void gtia_device::write(offs_t offset, uint8_t data)
 {
 	/* used for mixing hue/lum of different colors */
 //  static uint8_t lumpm0=0,lumpm1=0,lumpm2=0,lumpm3=0,lumpm4=0;

src/mame/video/gtia.h

@@ -35,7 +35,7 @@ public:
 	auto write_callback() { return m_write_cb.bind(); }
 
 	DECLARE_READ8_MEMBER( read );
-	DECLARE_WRITE8_MEMBER( write );
+	void write(offs_t offset, uint8_t data);
 
 	uint16_t *get_color_lookup() { return m_color_lookup; }
 	void set_color_lookup(int i, uint16_t data) { m_color_lookup[i] = data; }