summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-03-24 19:21:34 +0100
committer Ivan Vangelista <mesgnet@yahoo.it>2020-03-24 19:21:34 +0100
commit1aea20ce3eec79226d6c8b3169e3808b1bc7e8b3 (patch)
tree1d782d77395b9ce65f62196ade6c448adf590259 /src/mame
parentd1f029ca2c7e5bd1dd5119bdc3e21702506b4d4c (diff)
devices/machine: simplified handlers for various devices (nw)
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/gottlieb.cpp2
-rw-r--r--src/mame/drivers/amstr_pc.cpp8
-rw-r--r--src/mame/drivers/argo.cpp4
-rw-r--r--src/mame/drivers/asst128.cpp6
-rw-r--r--src/mame/drivers/ccastles.cpp6
-rw-r--r--src/mame/drivers/compc.cpp4
-rw-r--r--src/mame/drivers/cv1k.cpp12
-rw-r--r--src/mame/drivers/cvs.cpp12
-rw-r--r--src/mame/drivers/docastle.cpp8
-rw-r--r--src/mame/drivers/eispc.cpp8
-rw-r--r--src/mame/drivers/europc.cpp2
-rw-r--r--src/mame/drivers/firefox.cpp4
-rw-r--r--src/mame/drivers/fmtowns.cpp4
-rw-r--r--src/mame/drivers/gumbo.cpp2
-rw-r--r--src/mame/drivers/hh_tms1k.cpp8
-rw-r--r--src/mame/drivers/ibmpcjr.cpp2
-rw-r--r--src/mame/drivers/indy_indigo2.cpp2
-rw-r--r--src/mame/drivers/jedi.cpp4
-rw-r--r--src/mame/drivers/k28.cpp2
-rw-r--r--src/mame/drivers/kron.cpp2
-rw-r--r--src/mame/drivers/kyocera.cpp2
-rw-r--r--src/mame/drivers/malzak.cpp2
-rw-r--r--src/mame/drivers/mcb216.cpp2
-rw-r--r--src/mame/drivers/mz2500.cpp4
-rw-r--r--src/mame/drivers/nforcepc.cpp4
-rw-r--r--src/mame/drivers/pcw16.cpp4
-rw-r--r--src/mame/drivers/plus4.cpp12
-rw-r--r--src/mame/drivers/punchout.cpp4
-rw-r--r--src/mame/drivers/tandy1t.cpp2
-rw-r--r--src/mame/drivers/tandy2k.cpp2
-rw-r--r--src/mame/drivers/wangpc.cpp4
-rw-r--r--src/mame/drivers/wicat.cpp6
-rw-r--r--src/mame/machine/balsente.cpp4
-rw-r--r--src/mame/machine/msx.cpp4
-rw-r--r--src/mame/machine/z80ne.cpp2
-rw-r--r--src/mame/video/docastle.cpp6
-rw-r--r--src/mame/video/zac2650.cpp2
37 files changed, 83 insertions, 85 deletions
diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp
index a9227fd9f54..3bf157011b7 100644
--- a/src/mame/audio/gottlieb.cpp
+++ b/src/mame/audio/gottlieb.cpp
@@ -75,7 +75,7 @@ WRITE8_MEMBER( gottlieb_sound_r0_device::write )
uint8_t pb0_3 = data ^ 15;
uint8_t pb4_7 = ioport("SB0")->read() & 0x90;
m_sndcmd = pb0_3 | pb4_7;
- m_r6530->write(space, offset, m_sndcmd);
+ m_r6530->write(offset, m_sndcmd);
}
diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp
index 3cff81a4ba7..48a414880da 100644
--- a/src/mame/drivers/amstr_pc.cpp
+++ b/src/mame/drivers/amstr_pc.cpp
@@ -298,7 +298,7 @@ READ8_MEMBER( amstrad_pc_state::pc1640_port60_r )
if (m_port61&0x80)
data=m_port60;
else
- data = m_keyboard->read(space, 0);
+ data = m_keyboard->read();
break;
case 1:
@@ -316,7 +316,7 @@ READ8_MEMBER( amstrad_pc_state::pc1640_port60_r )
READ8_MEMBER( amstrad_pc_state::pc200_port378_r )
{
- uint8_t data = m_lpt1->read(space, offset);
+ uint8_t data = m_lpt1->read(offset);
if (offset == 1)
data = (data & ~7) | (ioport("DSW0")->read() & 7);
@@ -328,7 +328,7 @@ READ8_MEMBER( amstrad_pc_state::pc200_port378_r )
READ8_MEMBER( amstrad_pc_state::pc200_port278_r )
{
- uint8_t data = m_lpt2->read(space, offset);
+ uint8_t data = m_lpt2->read(offset);
if (offset == 1)
data = (data & ~7) | (ioport("DSW0")->read() & 7);
@@ -341,7 +341,7 @@ READ8_MEMBER( amstrad_pc_state::pc200_port278_r )
READ8_MEMBER( amstrad_pc_state::pc1640_port378_r )
{
- uint8_t data = m_lpt1->read(space, offset);
+ uint8_t data = m_lpt1->read(offset);
if (offset == 1)
data=(data & ~7) | (ioport("DSW0")->read() & 7);
diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp
index fba33d67549..64da55393f1 100644
--- a/src/mame/drivers/argo.cpp
+++ b/src/mame/drivers/argo.cpp
@@ -136,7 +136,7 @@ READ8_MEMBER(argo_state::argo_io_r)
case 0xE8: // wants bit 4 low then high
{
- u8 data = m_dma->read(space, 8);
+ u8 data = m_dma->read(8);
data |= (m_framecnt << 4); // hack because dma update_flag is not emulated
return data;
}
@@ -184,7 +184,7 @@ WRITE8_MEMBER(argo_state::argo_io_w)
memmove(m_p_videoram, m_p_videoram+80, 24*80);
m_scroll_ctrl = 0;
}
- m_dma->write(space, 8, data);
+ m_dma->write(8, data);
break;
default:
diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp
index 00aa18f5a76..0b5f71ce1ba 100644
--- a/src/mame/drivers/asst128.cpp
+++ b/src/mame/drivers/asst128.cpp
@@ -54,7 +54,7 @@ private:
required_device<pc_fdc_xt_device> m_fdc;
DECLARE_FLOPPY_FORMATS(asst128_formats);
- DECLARE_WRITE8_MEMBER(asst128_fdc_dor_w);
+ void asst128_fdc_dor_w(uint8_t data);
void machine_start() override;
void asst128_io(address_map &map);
@@ -68,10 +68,10 @@ void asst128_state::machine_start()
memcpy(font->base() + 0x0400, memregion("bios")->base() + 0x4000, 0x0400);
}
-WRITE8_MEMBER(asst128_state::asst128_fdc_dor_w)
+void asst128_state::asst128_fdc_dor_w(uint8_t data)
{
m_fdc->tc_w((data & 0x80) == 0x80);
- m_fdc->dor_w(space, offset, data, mem_mask);
+ m_fdc->dor_w(data);
}
void asst128_state::asst128_map(address_map &map)
diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp
index d054eba255d..0650a3f9463 100644
--- a/src/mame/drivers/ccastles.cpp
+++ b/src/mame/drivers/ccastles.cpp
@@ -282,14 +282,14 @@ WRITE_LINE_MEMBER(ccastles_state::nvram_store_w)
READ8_MEMBER(ccastles_state::nvram_r)
{
- return (m_nvram_4b->read(space, offset) & 0x0f) | (m_nvram_4a->read(space, offset) << 4);
+ return (m_nvram_4b->read(space, offset) & 0x0f) | (m_nvram_4a->read(space,offset) << 4);
}
WRITE8_MEMBER(ccastles_state::nvram_w)
{
- m_nvram_4b->write(space, offset, data);
- m_nvram_4a->write(space, offset, data >> 4);
+ m_nvram_4b->write(offset, data);
+ m_nvram_4a->write(offset, data >> 4);
}
diff --git a/src/mame/drivers/compc.cpp b/src/mame/drivers/compc.cpp
index 77563b5fb26..b5bfce05faa 100644
--- a/src/mame/drivers/compc.cpp
+++ b/src/mame/drivers/compc.cpp
@@ -98,7 +98,7 @@ READ8_MEMBER(compc_state::pio_r)
switch (offset)
{
case 0:
- data = m_keyboard->read(space, 0);
+ data = m_keyboard->read();
break;
case 1:
data = m_portb;
@@ -146,7 +146,7 @@ READ8_MEMBER(compc_state::pioiii_r)
switch (offset)
{
case 0:
- data = m_keyboard->read(space, 0);
+ data = m_keyboard->read();
break;
case 1:
data = m_portb;
diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp
index 528a4b946d2..404d08354bd 100644
--- a/src/mame/drivers/cv1k.cpp
+++ b/src/mame/drivers/cv1k.cpp
@@ -260,7 +260,7 @@ uint32_t cv1k_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
READ64_MEMBER( cv1k_state::flash_port_e_r )
{
- return ((m_serflash->flash_ready_r(space, offset) ? 0x20 : 0x00)) | 0xdf;
+ return ((m_serflash->flash_ready_r() ? 0x20 : 0x00)) | 0xdf;
}
@@ -281,7 +281,7 @@ READ8_MEMBER( cv1k_state::flash_io_r )
return 0xff;
case 0x00:
- return m_serflash->flash_io_r(space,offset);
+ return m_serflash->flash_io_r();
}
}
@@ -295,15 +295,15 @@ WRITE8_MEMBER( cv1k_state::flash_io_w )
break;
case 0x00:
- m_serflash->flash_data_w(space, offset, data);
+ m_serflash->flash_data_w( data);
break;
case 0x01:
- m_serflash->flash_cmd_w(space, offset, data);
+ m_serflash->flash_cmd_w(data);
break;
case 0x2:
- m_serflash->flash_addr_w(space, offset, data);
+ m_serflash->flash_addr_w(data);
break;
}
}
@@ -332,7 +332,7 @@ WRITE8_MEMBER( cv1k_state::serial_rtc_eeprom_w )
m_eepromout->write(data, 0xff);
break;
case 0x03:
- m_serflash->flash_enab_w(space,offset,data);
+ m_serflash->flash_enab_w(data);
break;
default:
diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp
index 1b9a274067c..60f78e8710d 100644
--- a/src/mame/drivers/cvs.cpp
+++ b/src/mame/drivers/cvs.cpp
@@ -159,7 +159,7 @@ READ8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_r)
if (m_s2650_flag)
return m_character_ram[(0 * 0x800) | 0x400 | m_character_ram_page_start | offset];
else
- return m_s2636[0]->read_data(space, offset);
+ return m_s2636[0]->read_data(offset);
}
WRITE8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_w)
@@ -171,7 +171,7 @@ WRITE8_MEMBER(cvs_state::cvs_s2636_0_or_character_ram_w)
m_gfxdecode->gfx(1)->mark_dirty((offset / 8) % 256);
}
else
- m_s2636[0]->write_data(space, offset, data);
+ m_s2636[0]->write_data(offset, data);
}
@@ -180,7 +180,7 @@ READ8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_r)
if (m_s2650_flag)
return m_character_ram[(1 * 0x800) | 0x400 | m_character_ram_page_start | offset];
else
- return m_s2636[1]->read_data(space, offset);
+ return m_s2636[1]->read_data(offset);
}
WRITE8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_w)
@@ -192,7 +192,7 @@ WRITE8_MEMBER(cvs_state::cvs_s2636_1_or_character_ram_w)
m_gfxdecode->gfx(1)->mark_dirty((offset / 8) % 256);
}
else
- m_s2636[1]->write_data(space, offset, data);
+ m_s2636[1]->write_data(offset, data);
}
@@ -201,7 +201,7 @@ READ8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_r)
if (m_s2650_flag)
return m_character_ram[(2 * 0x800) | 0x400 | m_character_ram_page_start | offset];
else
- return m_s2636[2]->read_data(space, offset);
+ return m_s2636[2]->read_data(offset);
}
WRITE8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_w)
@@ -213,7 +213,7 @@ WRITE8_MEMBER(cvs_state::cvs_s2636_2_or_character_ram_w)
m_gfxdecode->gfx(1)->mark_dirty((offset / 8) % 256);
}
else
- m_s2636[2]->write_data(space, offset, data);
+ m_s2636[2]->write_data(offset, data);
}
diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp
index d67cadd8e60..cd55e532254 100644
--- a/src/mame/drivers/docastle.cpp
+++ b/src/mame/drivers/docastle.cpp
@@ -547,9 +547,7 @@ GFXDECODE_END
void docastle_state::machine_reset()
{
- int i;
-
- for (i = 0; i < 9; i++)
+ for (int i = 0; i < 9; i++)
{
m_buffer0[i] = 0;
m_buffer1[i] = 0;
@@ -560,11 +558,11 @@ void docastle_state::machine_reset()
m_adpcm_data = -1;
m_adpcm_status = 0;
- for (i = 0; i < 2; i++)
+ for (int i = 0; i < 2; i++)
{
m_inp[i]->write_ms(0); // pin 5 tied low
//m_inp[i]->write_ce(1); // pin 4 tied high
- m_inp[i]->write_s(machine().dummy_space(), 0, 0); // cleared with LS273
+ m_inp[i]->write_s(0); // cleared with LS273
}
flip_screen_set(0); // cleared with LS273
}
diff --git a/src/mame/drivers/eispc.cpp b/src/mame/drivers/eispc.cpp
index 34a164ad1a3..2168bae6b31 100644
--- a/src/mame/drivers/eispc.cpp
+++ b/src/mame/drivers/eispc.cpp
@@ -445,17 +445,17 @@ void epc_state::epc_io(address_map &map)
map(0x03f4, 0x03f5).m(m_fdc, FUNC(i8272a_device::map));
map(0x03bc, 0x03be).lrw8(
- [this](address_space &space, offs_t offset, uint8_t mem_mask) -> uint8_t
+ [this](offs_t offset, uint8_t mem_mask) -> uint8_t
{
- uint8_t data = m_lpt->read(space, offset);
+ uint8_t data = m_lpt->read(offset);
LOGLPT("LPT read offset %02x: %02x\n", offset, data);
return data;
},
"lpt_r",
- [this](address_space &space, offs_t offset, uint8_t data)
+ [this](offs_t offset, uint8_t data)
{
LOGLPT("LPT write offset %02x: %02x\n", offset, data);
- m_lpt->write(space, offset, data);
+ m_lpt->write(offset, data);
},
"lpt_w"
);
diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp
index 61ff9718be5..7116d472661 100644
--- a/src/mame/drivers/europc.cpp
+++ b/src/mame/drivers/europc.cpp
@@ -417,7 +417,7 @@ READ8_MEMBER( europc_pc_state::europc_pio_r )
switch (offset)
{
case 0:
- data = m_keyboard->read(space, 0);
+ data = m_keyboard->read();
break;
case 1:
data = m_port61;
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index 10332c3008a..8e94da7359d 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -377,8 +377,8 @@ WRITE8_MEMBER(firefox_state::riot_porta_w)
WRITE8_MEMBER(firefox_state::nvram_w)
{
- m_nvram_1c->write(space, offset, data >> 4);
- m_nvram_1d->write(space, offset, data & 0xf);
+ m_nvram_1c->write(offset, data >> 4);
+ m_nvram_1d->write(offset, data & 0xf);
}
READ8_MEMBER(firefox_state::nvram_r)
diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp
index c74e40492b5..bea9210ef2f 100644
--- a/src/mame/drivers/fmtowns.cpp
+++ b/src/mame/drivers/fmtowns.cpp
@@ -498,14 +498,14 @@ template<int Chip>
READ8_MEMBER(towns_state::towns_dma_r)
{
logerror("DMA#%01x: read register %i\n",Chip,offset);
- return m_dma[Chip]->read(space, offset);
+ return m_dma[Chip]->read(offset);
}
template<int Chip>
WRITE8_MEMBER(towns_state::towns_dma_w)
{
logerror("DMA#%01x: wrote 0x%02x to register %i\n",Chip,data,offset);
- m_dma[Chip]->write(space, offset, data);
+ m_dma[Chip]->write(offset, data);
}
/*
diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp
index af7d7307055..a81397336cb 100644
--- a/src/mame/drivers/gumbo.cpp
+++ b/src/mame/drivers/gumbo.cpp
@@ -356,7 +356,7 @@ ROM_START( mspuzzlea ) /* sticker on PCB stated: MISS PUZZLE V ..8 */
ROM_LOAD( "u210.bin", 0x00000, 0x40000, CRC(0a223a38) SHA1(e5aefbdbb09c18cc230bc852df3ea1defb1a21a8) )
ROM_REGION( 0x200000, "gfx1", 0 )
- ROM_LOAD( "u421.u421", 0x000000, 0x80000, CRC(52b67ee5) SHA1(209fdf845c5ef2e65fbc0de8aeb26562b6d033ab) ) /* several more explicit pictures have been relaced compared to the set below */
+ ROM_LOAD( "u421.u421", 0x000000, 0x80000, CRC(52b67ee5) SHA1(209fdf845c5ef2e65fbc0de8aeb26562b6d033ab) ) /* several more explicit pictures have been replaced compared to the set below */
ROM_LOAD( "u420.u420", 0x100000, 0x80000, CRC(3565696e) SHA1(5234dc25f73e6245b199071fa3a9c0d2367cae9f) ) /* Starting with 204 & 205, as well as many in 300 range */
ROM_LOAD( "u425.u425", 0x080000, 0x80000, CRC(933544e3) SHA1(d77b1050c4b56d0fd3be703bec961863d5188484) )
ROM_LOAD( "u426.u426", 0x180000, 0x80000, CRC(e458eb9d) SHA1(bead05ec57d97c86ed727b2c4b95f8ffdbd7ef4c) )
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index 8af983a1c31..5f8fe1a09d7 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -5287,7 +5287,7 @@ WRITE16_MEMBER(ginv2000_state::write_r)
// R11,R12: TMS1024 S1,S0 (S2 forced high)
// R13: TMS1024 STD
- m_expander->write_s(space, 0, (data >> 12 & 1) | (data >> 10 & 2) | 4);
+ m_expander->write_s((data >> 12 & 1) | (data >> 10 & 2) | 4);
m_expander->write_std(data >> 13 & 1);
// R1-R10: VFD grid
@@ -5298,7 +5298,7 @@ WRITE16_MEMBER(ginv2000_state::write_r)
WRITE16_MEMBER(ginv2000_state::write_o)
{
// O4-O7: TMS1024 H1-H4
- m_expander->write_h(space, 0, data >> 4 & 0xf);
+ m_expander->write_h(data >> 4 & 0xf);
}
READ8_MEMBER(ginv2000_state::read_k)
@@ -11732,7 +11732,7 @@ WRITE16_MEMBER(tbreakup_state::write_r)
// R3-R5: TMS1025 port S
// R2: TMS1025 STD pin
- m_expander->write_s(space, 0, data >> 3 & 7);
+ m_expander->write_s(data >> 3 & 7);
m_expander->write_std(data >> 2 & 1);
// R0,R1: select digit
@@ -11743,7 +11743,7 @@ WRITE16_MEMBER(tbreakup_state::write_r)
WRITE16_MEMBER(tbreakup_state::write_o)
{
// O0-O3: TMS1025 port H
- m_expander->write_h(space, 0, data & 0xf);
+ m_expander->write_h(data & 0xf);
// O0-O7: led state
m_o = data;
diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp
index 2f296a5e45c..ca25960204c 100644
--- a/src/mame/drivers/ibmpcjr.cpp
+++ b/src/mame/drivers/ibmpcjr.cpp
@@ -271,7 +271,7 @@ WRITE_LINE_MEMBER(pcjr_state::keyb_interrupt)
{
int data;
- if(state && (data = m_keyboard->read(machine().dummy_space(), 0)))
+ if(state && (data = m_keyboard->read()))
{
uint8_t parity = 0;
int i;
diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp
index fe9ba3d88c3..929cf810a8b 100644
--- a/src/mame/drivers/indy_indigo2.cpp
+++ b/src/mame/drivers/indy_indigo2.cpp
@@ -500,7 +500,7 @@ void ip22_state::indigo2_4415(machine_config &config)
* 0d <- 00 High Const BRG = (CLK / (2 x Desired Rate x BR Clock period)) - 2
* 0e <- 01 Mics: BRG enable
* 03 <- c1 Receiver: as above + Receiver enable
- * 05 <- ea Transmitter: as above + Transmitetr enable
+ * 05 <- ea Transmitter: as above + Transmitter enable
* 00 <- 10 Reset External/status IE
*/
diff --git a/src/mame/drivers/jedi.cpp b/src/mame/drivers/jedi.cpp
index 9d0cf14ef59..59cc14454c8 100644
--- a/src/mame/drivers/jedi.cpp
+++ b/src/mame/drivers/jedi.cpp
@@ -225,8 +225,8 @@ READ8_MEMBER(jedi_state::novram_data_r)
WRITE8_MEMBER(jedi_state::novram_data_w)
{
- m_novram[0]->write(space, offset, data & 0x0f);
- m_novram[1]->write(space, offset, data >> 4);
+ m_novram[0]->write(offset, data & 0x0f);
+ m_novram[1]->write(offset, data >> 4);
}
diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp
index 509eb45d9ce..a5bf02afa5c 100644
--- a/src/mame/drivers/k28.cpp
+++ b/src/mame/drivers/k28.cpp
@@ -203,7 +203,7 @@ WRITE8_MEMBER(k28_state::mcu_p2_w)
m_vfd->data_w(data & 1);
// d0-d3: VSM data, input mux and SC-01 phoneme lower nibble
- m_tms6100->add_w(space, 0, data);
+ m_tms6100->add_w(data);
m_inp_mux = (m_inp_mux & ~0xf) | (~data & 0xf);
m_phoneme = (m_phoneme & ~0xf) | (data & 0xf);
}
diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp
index 15bd855a8f6..d0e8753386b 100644
--- a/src/mame/drivers/kron.cpp
+++ b/src/mame/drivers/kron.cpp
@@ -279,7 +279,7 @@ INTERRUPT_GEN_MEMBER(kron180_state::interrupt)
WRITE_LINE_MEMBER(kron180_state::keyb_interrupt)
{
- if(state && (m_kbd_data = m_keyboard->read(machine().dummy_space(), 0)))
+ if(state && (m_kbd_data = m_keyboard->read()))
{
LOGKBD("%s(%02x)\n", FUNCNAME, m_kbd_data);
m_maincpu->set_input_line(2, ASSERT_LINE);
diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp
index a1ea225a14d..fbf525ccf1e 100644
--- a/src/mame/drivers/kyocera.cpp
+++ b/src/mame/drivers/kyocera.cpp
@@ -202,7 +202,7 @@ uint8_t kc85_state::uart_r()
m_uart->drr_w(1);
}
- return m_uart->read(machine().dummy_space(), 0);
+ return m_uart->read();
}
void kc85_state::uart_ctrl_w(uint8_t data)
diff --git a/src/mame/drivers/malzak.cpp b/src/mame/drivers/malzak.cpp
index 58541cb3cc3..13262d362cb 100644
--- a/src/mame/drivers/malzak.cpp
+++ b/src/mame/drivers/malzak.cpp
@@ -76,7 +76,7 @@
READ8_MEMBER(malzak_state::fake_VRLE_r)
{
- return (m_s2636[0]->read_data(space, 0xcb) & 0x3f) + (m_screen->vblank() ? 0x40 : 0x00);
+ return (m_s2636[0]->read_data(0xcb) & 0x3f) + (m_screen->vblank() ? 0x40 : 0x00);
}
READ8_MEMBER(malzak_state::s2636_portA_r)
diff --git a/src/mame/drivers/mcb216.cpp b/src/mame/drivers/mcb216.cpp
index 43e0e5022aa..5807868b2be 100644
--- a/src/mame/drivers/mcb216.cpp
+++ b/src/mame/drivers/mcb216.cpp
@@ -69,7 +69,7 @@ READ8_MEMBER(mcb216_state::tms5501_status_r)
{
// D7 D6 D5 D4 D3 D2 D1 D0
// TBE RDA IPG TBE RDA SRV ORE FME
- return bitswap<8>(m_tms5501->sta_r(space, 0), 4, 3, 5, 4, 3, 2, 1, 0);
+ return bitswap<8>(m_tms5501->sta_r(), 4, 3, 5, 4, 3, 2, 1, 0);
}
void mcb216_state::mcb216_mem(address_map &map)
diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp
index e04a521dd53..967b4cfc2bf 100644
--- a/src/mame/drivers/mz2500.cpp
+++ b/src/mame/drivers/mz2500.cpp
@@ -1183,14 +1183,14 @@ READ8_MEMBER(mz2500_state::rp5c15_8_r)
{
uint8_t rtc_index = (m_maincpu->state_int(Z80_B));
- return m_rtc->read(space, rtc_index);
+ return m_rtc->read(rtc_index);
}
WRITE8_MEMBER(mz2500_state::rp5c15_8_w)
{
uint8_t rtc_index = (m_maincpu->state_int(Z80_B));
- m_rtc->write(space, rtc_index, data);
+ m_rtc->write(rtc_index, data);
}
diff --git a/src/mame/drivers/nforcepc.cpp b/src/mame/drivers/nforcepc.cpp
index 2d4c21dcede..6ce0f49df21 100644
--- a/src/mame/drivers/nforcepc.cpp
+++ b/src/mame/drivers/nforcepc.cpp
@@ -907,12 +907,12 @@ void it8703f_device::map_lpt(address_map& map)
READ8_MEMBER(it8703f_device::lpt_read)
{
- return pc_lpt_lptdev->read(space, offset, mem_mask);
+ return pc_lpt_lptdev->read(offset);
}
WRITE8_MEMBER(it8703f_device::lpt_write)
{
- pc_lpt_lptdev->write(space, offset, data, mem_mask);
+ pc_lpt_lptdev->write(offset, data);
}
void it8703f_device::map_lpt_addresses()
diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp
index f1772001a3b..32e3b4154f1 100644
--- a/src/mame/drivers/pcw16.cpp
+++ b/src/mame/drivers/pcw16.cpp
@@ -497,7 +497,7 @@ WRITE8_MEMBER(pcw16_state::pcw16_keyboard_control_w)
/* busy */
m_keyboard_state |= PCW16_KEYBOARD_BUSY_STATUS;
/* keyboard takes data */
- m_keyboard->write(space, 0, m_keyboard_data_shift);
+ m_keyboard->write(m_keyboard_data_shift);
/* set clock low - no furthur transmissions */
pcw16_keyboard_set_clock_state(0);
/* set int */
@@ -532,7 +532,7 @@ WRITE_LINE_MEMBER(pcw16_state::pcw16_keyboard_callback)
{
int data;
- data = m_keyboard->read(machine().dummy_space(), 0);
+ data = m_keyboard->read();
if (data)
{
diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp
index adbae9c81a7..138418eeca5 100644
--- a/src/mame/drivers/plus4.cpp
+++ b/src/mame/drivers/plus4.cpp
@@ -280,13 +280,13 @@ uint8_t plus4_state::read_memory(address_space &space, offs_t offset, int ba, in
if (!scs && m_vslsi)
{
- data = m_vslsi->read(space, offset & 0x03);
+ data = m_vslsi->read(offset & 0x03);
}
else if (!user)
{
if (m_spi_user)
{
- data = m_spi_user->read(space, 0);
+ data = m_spi_user->read();
}
data &= ~0x04;
@@ -298,7 +298,7 @@ uint8_t plus4_state::read_memory(address_space &space, offs_t offset, int ba, in
}
else if (!keyport)
{
- data = m_spi_kb->read(space, 0);
+ data = m_spi_kb->read();
}
else if (!cs0)
{
@@ -407,11 +407,11 @@ WRITE8_MEMBER( plus4_state::write )
if (!scs && m_vslsi)
{
- m_vslsi->write(space, offset & 0x03, data);
+ m_vslsi->write(offset & 0x03, data);
}
else if (!user && m_spi_user)
{
- m_spi_user->write(space, 0, data);
+ m_spi_user->write(data);
}
else if (!_6551 && m_acia)
{
@@ -423,7 +423,7 @@ WRITE8_MEMBER( plus4_state::write )
}
else if (!keyport)
{
- m_spi_kb->write(space, 0, data);
+ m_spi_kb->write(data);
}
else if (offset < 0xfd00 || offset >= 0xff20)
{
diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp
index 2b64436a90c..503d74a0a3a 100644
--- a/src/mame/drivers/punchout.cpp
+++ b/src/mame/drivers/punchout.cpp
@@ -209,7 +209,7 @@ READ8_MEMBER(punchout_state::spunchout_exp_r)
// d5: _ALARM from RP5C01
// d6: COUNTER OUT from RP5H01
// d7: DATA OUT from RP5H01 - always 0?
- uint8_t ret = m_rtc->read(space, offset >> 4 & 0xf) & 0xf;
+ uint8_t ret = m_rtc->read(offset >> 4 & 0xf) & 0xf;
ret |= 0x10;
ret |= m_rtc->alarm_r() ? 0x00 : 0x20;
ret |= m_rp5h01->counter_r() ? 0x00 : 0x40;
@@ -221,7 +221,7 @@ READ8_MEMBER(punchout_state::spunchout_exp_r)
WRITE8_MEMBER(punchout_state::spunchout_exp_w)
{
// d0-d3: D0-D3 to RP5C01
- m_rtc->write(space, offset >> 4 & 0xf, data & 0xf);
+ m_rtc->write(offset >> 4 & 0xf, data & 0xf);
}
WRITE8_MEMBER(punchout_state::spunchout_rp5h01_reset_w)
diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp
index 448f6d48ee7..4d09e517ca4 100644
--- a/src/mame/drivers/tandy1t.cpp
+++ b/src/mame/drivers/tandy1t.cpp
@@ -339,7 +339,7 @@ READ8_MEMBER(tandy1000_state::tandy1000_pio_r)
case 0:
if (m_tandy_ppi_ack)
{
- m_tandy_ppi_porta = m_keyboard->read(space, 0);
+ m_tandy_ppi_porta = m_keyboard->read();
m_tandy_ppi_ack = 0;
}
data = m_tandy_ppi_porta;
diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp
index e37a91829ae..bf2ec76d79b 100644
--- a/src/mame/drivers/tandy2k.cpp
+++ b/src/mame/drivers/tandy2k.cpp
@@ -213,7 +213,7 @@ READ8_MEMBER( tandy2k_state::kbint_clr_r )
m_kb->busy_w(1);
m_pic1->ir0_w(CLEAR_LINE);
- return m_pc_keyboard->read(space, 0);
+ return m_pc_keyboard->read();
}
return 0xff;
diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp
index 2e9e322123b..da7f603ba2e 100644
--- a/src/mame/drivers/wangpc.cpp
+++ b/src/mame/drivers/wangpc.cpp
@@ -569,7 +569,7 @@ READ8_MEMBER( wangpc_state::uart_r )
check_level2_interrupts();
- uint8_t data = m_uart->read(space, 0);
+ uint8_t data = m_uart->read();
if (LOG) logerror("%s: UART read %02x\n", machine().describe_context(), data);
@@ -608,7 +608,7 @@ WRITE8_MEMBER( wangpc_state::uart_w )
m_uart_tbre = 0;
check_level2_interrupts();
- m_uart->write(space, 0, data);
+ m_uart->write(data);
}
diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp
index 03965f3fc51..d4380542985 100644
--- a/src/mame/drivers/wicat.cpp
+++ b/src/mame/drivers/wicat.cpp
@@ -630,7 +630,7 @@ READ8_MEMBER(wicat_state::videosram_r)
WRITE8_MEMBER(wicat_state::videosram_w)
{
if(!(offset & 0x01))
- m_videosram->write(space,offset/2,data);
+ m_videosram->write(offset/2,data);
}
WRITE8_MEMBER(wicat_state::videosram_store_w)
@@ -666,7 +666,7 @@ READ8_MEMBER(wicat_state::video_timer_r)
m_videouart->drr_w(1);
m_videouart->drr_w(0);
}
- return m_videouart->read(space,0);
+ return m_videouart->read();
}
return ret;
}
@@ -675,7 +675,7 @@ WRITE8_MEMBER(wicat_state::video_timer_w)
{
logerror("I/O port 0x%04x write %02x\n",offset,data);
if(offset == 0x02)
- m_videouart->write(space,0,data);
+ m_videouart->write(data);
}
READ8_MEMBER(wicat_state::video_status_r)
diff --git a/src/mame/machine/balsente.cpp b/src/mame/machine/balsente.cpp
index b8c9939079b..af750998a90 100644
--- a/src/mame/machine/balsente.cpp
+++ b/src/mame/machine/balsente.cpp
@@ -248,8 +248,8 @@ READ8_MEMBER(balsente_state::novram_8bit_r)
WRITE8_MEMBER(balsente_state::novram_8bit_w)
{
- m_novram[0]->write(space, offset, data & 0x0f);
- m_novram[1]->write(space, offset, data >> 4);
+ m_novram[0]->write(offset, data & 0x0f);
+ m_novram[1]->write(offset, data >> 4);
}
diff --git a/src/mame/machine/msx.cpp b/src/mame/machine/msx.cpp
index 25cc0ce4aa2..2fd51da858b 100644
--- a/src/mame/machine/msx.cpp
+++ b/src/mame/machine/msx.cpp
@@ -294,12 +294,12 @@ WRITE8_MEMBER( msx2_state::msx_rtc_latch_w )
WRITE8_MEMBER( msx2_state::msx_rtc_reg_w )
{
- m_rtc->write(space, m_rtc_latch, data);
+ m_rtc->write(m_rtc_latch, data);
}
READ8_MEMBER( msx2_state::msx_rtc_reg_r )
{
- return m_rtc->read(space, m_rtc_latch);
+ return m_rtc->read(m_rtc_latch);
}
diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp
index aefb0b7dc44..916c009bb97 100644
--- a/src/mame/machine/z80ne.cpp
+++ b/src/mame/machine/z80ne.cpp
@@ -555,7 +555,7 @@ READ8_MEMBER(z80net_state::lx388_mc6847_videoram_r)
READ8_MEMBER(z80net_state::lx387_data_r)
{
- uint8_t data = m_lx387_kr2376->data_r(space, 0) & 0x7f;
+ uint8_t data = m_lx387_kr2376->data_r() & 0x7f;
data |= m_lx387_kr2376->get_output_pin(kr2376_device::KR2376_SO) << 7;
return data;
}
diff --git a/src/mame/video/docastle.cpp b/src/mame/video/docastle.cpp
index a1a46497e8a..4b2f63cacee 100644
--- a/src/mame/video/docastle.cpp
+++ b/src/mame/video/docastle.cpp
@@ -79,12 +79,12 @@ WRITE8_MEMBER(docastle_state::docastle_colorram_w)
READ8_MEMBER(docastle_state::inputs_flipscreen_r)
{
// inputs pass through LS244 non-inverting buffer
- uint8_t buf = (m_inp[1]->read_h(space, 0) << 4) | m_inp[0]->read_h(space, 0);
+ uint8_t buf = (m_inp[1]->read_h() << 4) | m_inp[0]->read_h();
// LS273 latches address bits on rising edge of address decode
flip_screen_set(BIT(offset, 7));
- m_inp[0]->write_s(space, 0, offset & 7);
- m_inp[1]->write_s(space, 0, offset & 7);
+ m_inp[0]->write_s(offset & 7);
+ m_inp[1]->write_s(offset & 7);
return buf;
}
diff --git a/src/mame/video/zac2650.cpp b/src/mame/video/zac2650.cpp
index 81cd781083f..c0ed41cd4cf 100644
--- a/src/mame/video/zac2650.cpp
+++ b/src/mame/video/zac2650.cpp
@@ -35,7 +35,7 @@ WRITE8_MEMBER(zac2650_state::zac_s2636_w)
m_gfxdecode->gfx(2)->mark_dirty(offset/8);
if (offset == 0xc7)
{
- m_s2636->write_data(space, offset, data);
+ m_s2636->write_data(offset, data);
}
}