diff options
author | 2020-04-01 17:33:12 +0100 | |
---|---|---|
committer | 2020-04-01 22:25:31 +0100 | |
commit | 70591d6faea1f85d25de9e8e32027aad2f5f44a1 (patch) | |
tree | e655b5c5e1d1be136f1b8a6f0cbf68891bacafd2 | |
parent | 942e64a546ef11886b1d77e0a35b0a05a2efbc18 (diff) |
removed last remaining uses of generic_space() (nw)
-rw-r--r-- | src/emu/driver.h | 3 | ||||
-rw-r--r-- | src/mame/drivers/pasopia.cpp | 6 | ||||
-rw-r--r-- | src/mame/drivers/pasopia7.cpp | 6 | ||||
-rw-r--r-- | src/mame/drivers/vt240.cpp | 8 | ||||
-rw-r--r-- | src/mame/includes/mbee.h | 2 | ||||
-rw-r--r-- | src/mame/includes/super80.h | 2 | ||||
-rw-r--r-- | src/mame/machine/mbee.cpp | 6 | ||||
-rw-r--r-- | src/mame/machine/super80.cpp | 6 | ||||
-rw-r--r-- | src/mame/video/mbee.cpp | 2 |
9 files changed, 19 insertions, 22 deletions
diff --git a/src/emu/driver.h b/src/emu/driver.h index 88363437275..43697f2d109 100644 --- a/src/emu/driver.h +++ b/src/emu/driver.h @@ -105,9 +105,6 @@ public: // dummy driver_init callback void empty_init(); - // memory helpers - address_space &generic_space() const { return machine().dummy_space(); } - // output heler output_manager &output() const { return machine().output(); } diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp index d4baccd0d58..7fe2af76b2e 100644 --- a/src/mame/drivers/pasopia.cpp +++ b/src/mame/drivers/pasopia.cpp @@ -72,7 +72,7 @@ private: DECLARE_WRITE8_MEMBER(vram_addr_hi_w); DECLARE_WRITE8_MEMBER(screen_mode_w); DECLARE_READ8_MEMBER(rombank_r); - DECLARE_READ8_MEMBER(keyb_r); + uint8_t keyb_r(); DECLARE_WRITE8_MEMBER(mux_w); DECLARE_WRITE_LINE_MEMBER(speaker_w); MC6845_UPDATE_ROW(crtc_update_row); @@ -112,7 +112,7 @@ private: // needed to scan the keyboard, as the pio emulation doesn't do it. TIMER_CALLBACK_MEMBER( pasopia_state::pio_timer ) { - m_pio->port_b_write(keyb_r(generic_space(),0,0xff)); + m_pio->port_b_write(keyb_r()); } MC6845_UPDATE_ROW( pasopia_state::crtc_update_row ) @@ -268,7 +268,7 @@ READ8_MEMBER( pasopia_state::rombank_r ) return (m_ram_bank) ? 4 : 0; } -READ8_MEMBER( pasopia_state::keyb_r ) +uint8_t pasopia_state::keyb_r() { u8 data = 0xff; for (u8 i = 0; i < 3; i++) diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp index 35360246447..b89f1628813 100644 --- a/src/mame/drivers/pasopia7.cpp +++ b/src/mame/drivers/pasopia7.cpp @@ -87,7 +87,7 @@ private: DECLARE_WRITE8_MEMBER(pasopia7_io_w); DECLARE_READ8_MEMBER(pasopia7_fdc_r); DECLARE_WRITE8_MEMBER(pasopia7_fdc_w); - DECLARE_READ8_MEMBER(keyb_r); + uint8_t keyb_r(); DECLARE_WRITE8_MEMBER(mux_w); DECLARE_READ8_MEMBER(crtc_portb_r); DECLARE_WRITE8_MEMBER(screen_mode_w); @@ -167,7 +167,7 @@ private: // needed to scan the keyboard, as the pio emulation doesn't do it. TIMER_CALLBACK_MEMBER( pasopia7_state::pio_timer ) { - m_pio->port_b_write(keyb_r(generic_space(),0,0xff)); + m_pio->port_b_write(keyb_r()); } VIDEO_START_MEMBER(pasopia7_state,pasopia7) @@ -789,7 +789,7 @@ static GFXDECODE_START( gfx_pasopia7 ) GFXDECODE_ENTRY( "kanji", 0x00000, p7_chars_16x16, 0, 0x10 ) GFXDECODE_END -READ8_MEMBER( pasopia7_state::keyb_r ) +uint8_t pasopia7_state::keyb_r() { u8 data = 0xff; for (u8 j=0; j<3; j++) diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp index c2d9295884b..667f2142c79 100644 --- a/src/mame/drivers/vt240.cpp +++ b/src/mame/drivers/vt240.cpp @@ -84,7 +84,7 @@ private: DECLARE_WRITE8_MEMBER(patmult_w); DECLARE_WRITE8_MEMBER(vpat_w); DECLARE_READ16_MEMBER(vram_r); - DECLARE_WRITE16_MEMBER(vram_w); + void vram_w(offs_t offset, uint16_t data); DECLARE_READ8_MEMBER(vom_r); DECLARE_WRITE8_MEMBER(vom_w); DECLARE_READ8_MEMBER(nvr_store_r); @@ -208,8 +208,8 @@ UPD7220_DISPLAY_PIXELS_MEMBER( vt240_state::hgdc_draw ) if(!BIT(m_reg0, 7)) { - vram_w(generic_space(), address >> 1, 0); - vram_w(generic_space(), (0x20000 + address) >> 1, 0); + vram_w(address >> 1, 0); + vram_w((0x20000 + address) >> 1, 0); } gfx1 = m_video_ram[(address & 0x7fff) >> 1]; @@ -386,7 +386,7 @@ READ16_MEMBER(vt240_state::vram_r) return 0; } -WRITE16_MEMBER(vt240_state::vram_w) +void vt240_state::vram_w(offs_t offset, uint16_t data) { uint8_t *video_ram = (uint8_t *)(&m_video_ram[0]); offset <<= 1; diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h index 0aaa193cdcf..cc8fd0fa0fe 100644 --- a/src/mame/includes/mbee.h +++ b/src/mame/includes/mbee.h @@ -109,7 +109,7 @@ private: DECLARE_WRITE8_MEMBER(video_low_w); DECLARE_WRITE8_MEMBER(video_high_w); DECLARE_WRITE8_MEMBER(pio_port_b_w); - DECLARE_READ8_MEMBER(pio_port_b_r); + uint8_t pio_port_b_r(); DECLARE_WRITE_LINE_MEMBER(pio_ardy); DECLARE_WRITE_LINE_MEMBER(crtc_vs); DECLARE_READ8_MEMBER(fdc_status_r); diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h index c8bae09b8c6..a58ce727a8e 100644 --- a/src/mame/includes/super80.h +++ b/src/mame/includes/super80.h @@ -90,7 +90,7 @@ private: DECLARE_READ8_MEMBER(io_read_byte); DECLARE_WRITE8_MEMBER(io_write_byte); DECLARE_WRITE8_MEMBER(pio_port_a_w); - DECLARE_READ8_MEMBER(pio_port_b_r); + uint8_t pio_port_b_r(); DECLARE_MACHINE_RESET(super80); DECLARE_MACHINE_RESET(super80r); DECLARE_VIDEO_START(super80); diff --git a/src/mame/machine/mbee.cpp b/src/mame/machine/mbee.cpp index a9bddd6c112..f8225e1074f 100644 --- a/src/mame/machine/mbee.cpp +++ b/src/mame/machine/mbee.cpp @@ -56,7 +56,7 @@ WRITE8_MEMBER( mbee_state::pio_port_b_w ) m_speaker->level_w(BIT(data, 6)); } -READ8_MEMBER( mbee_state::pio_port_b_r ) +uint8_t mbee_state::pio_port_b_r() { uint8_t data = 0; @@ -185,7 +185,7 @@ TIMER_CALLBACK_MEMBER( mbee_state::timer_newkb ) m_b2 = 1; // set irq if (m_b2) - m_pio->port_b_write(pio_port_b_r(generic_space(),0,0xff)); + m_pio->port_b_write(pio_port_b_r()); timer_set(attotime::from_hz(50), TIMER_MBEE_NEWKB); } @@ -252,7 +252,7 @@ WRITE_LINE_MEMBER( mbee_state::rtc_irq_w ) m_b7_rtc = (state) ? 0 : 1; // inverted by IC15 (pins 8,9,10) if ((m_io_config->read() & 0xc0) == 0x40) // RTC selected in config menu - m_pio->port_b_write(pio_port_b_r(generic_space(),0,0xff)); + m_pio->port_b_write(pio_port_b_r()); } diff --git a/src/mame/machine/super80.cpp b/src/mame/machine/super80.cpp index 5dfaad799f6..bbf5a4040d6 100644 --- a/src/mame/machine/super80.cpp +++ b/src/mame/machine/super80.cpp @@ -12,10 +12,10 @@ WRITE8_MEMBER( super80_state::pio_port_a_w ) { m_keylatch = data; - m_pio->port_b_write(pio_port_b_r(generic_space(),0,0xff)); // refresh kbd int + m_pio->port_b_write(pio_port_b_r()); // refresh kbd int } -READ8_MEMBER( super80_state::pio_port_b_r ) +uint8_t super80_state::pio_port_b_r() { uint8_t data = 0xff; @@ -60,7 +60,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( super80_state::timer_k ) m_key_pressed--; else if (!m_key_pressed) - m_pio->port_b_write(pio_port_b_r(generic_space(),0,0xff)); + m_pio->port_b_write(pio_port_b_r()); } /* cassette load circuit diff --git a/src/mame/video/mbee.cpp b/src/mame/video/mbee.cpp index 0724f991cf7..61f8c8c2a92 100644 --- a/src/mame/video/mbee.cpp +++ b/src/mame/video/mbee.cpp @@ -50,7 +50,7 @@ WRITE_LINE_MEMBER( mbee_state::crtc_vs ) { m_b7_vs = state; if ((m_io_config->read() & 0xc0) == 0) // VS selected in config menu - m_pio->port_b_write(pio_port_b_r(generic_space(),0,0xff)); + m_pio->port_b_write(pio_port_b_r()); } /*********************************************************** |