space, space, space, space, space, space, space, space, mem_mask (nw)

This commit is contained in:
smf- 2018-09-23 00:51:57 +01:00
parent 3af1087df9
commit f604bed068
81 changed files with 308 additions and 330 deletions

View File

@ -61,7 +61,7 @@ MACHINE_CONFIG_START(a2bus_agat7_ports_device::device_add_mconfig)
MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(*this, a2bus_agat7_ports_device, write_centronics_busy))
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
I8251(config, "d10", 0);
I8251(config, m_d10, 0);
MACHINE_CONFIG_END
//-------------------------------------------------
@ -118,7 +118,7 @@ uint8_t a2bus_agat7_ports_device::read_c0nx(uint8_t offset)
switch (offset & 8)
{
case 0:
data = m_d9->read(machine().dummy_space(), offset & 3);
data = m_d9->read(offset & 3);
break;
case 8:
@ -139,7 +139,7 @@ void a2bus_agat7_ports_device::write_c0nx(uint8_t offset, uint8_t data)
switch (offset & 8)
{
case 0:
m_d9->write(machine().dummy_space(), offset & 3, data);
m_d9->write(offset & 3, data);
break;
case 8:

View File

@ -264,11 +264,11 @@ uint8_t a2bus_agat840k_hle_device::read_c0nx(uint8_t offset)
switch (offset)
{
case 0: case 1: case 2: case 3:
data = m_d14->read(machine().dummy_space(), offset);
data = m_d14->read(offset);
break;
case 4: case 5: case 6: case 7:
data = m_d15->read(machine().dummy_space(), offset - 4);
data = m_d15->read(offset - 4);
break;
default:
@ -289,11 +289,11 @@ void a2bus_agat840k_hle_device::write_c0nx(uint8_t offset, uint8_t data)
switch (offset)
{
case 0: case 1: case 2: case 3:
m_d14->write(machine().dummy_space(), offset, data);
m_d14->write(offset, data);
break;
case 4: case 5: case 6: case 7:
m_d15->write(machine().dummy_space(), offset - 4, data);
m_d15->write(offset - 4, data);
break;
case 8: // write desync

View File

@ -95,7 +95,7 @@ void acorn_vib_device::device_reset()
space.install_readwrite_handler(0x0c00, 0x0c0f, 0, 0x10, 0, read8sm_delegate(FUNC(via6522_device::read), m_via6522.target()), write8sm_delegate(FUNC(via6522_device::write), m_via6522.target()));
space.install_readwrite_handler(0x0c20, 0x0c21, 0, 0x1e, 0, read8_delegate(FUNC(acia6850_device::read), m_acia.target()), write8_delegate(FUNC(acia6850_device::write), m_acia.target()));
space.install_readwrite_handler(0x0c40, 0x0c43, 0, 0x1c, 0, read8_delegate(FUNC(i8255_device::read), m_ppi8255.target()), write8_delegate(FUNC(i8255_device::write), m_ppi8255.target()));
space.install_readwrite_handler(0x0c40, 0x0c43, 0, 0x1c, 0, read8sm_delegate(FUNC(i8255_device::read), m_ppi8255.target()), write8sm_delegate(FUNC(i8255_device::write), m_ppi8255.target()));
}

View File

@ -177,14 +177,14 @@ READ8_MEMBER(bbc_tube_zep100_device::io_r)
if (!machine().side_effects_disabled())
m_rom_enabled = !BIT(offset, 2);
data = m_ppi->read(space, offset & 0x03);
data = m_ppi->read(offset & 0x03);
return data;
}
WRITE8_MEMBER(bbc_tube_zep100_device::io_w)
{
m_ppi->write(space, offset & 0x03, data);
m_ppi->write(offset & 0x03, data);
}

View File

@ -149,10 +149,10 @@ WRITE8_MEMBER(cpc_rs232_device::dart_w)
READ8_MEMBER(cpc_rs232_device::pit_r)
{
return m_pit->read(space,offset);
return m_pit->read(offset);
}
WRITE8_MEMBER(cpc_rs232_device::pit_w)
{
m_pit->write(space,offset,data);
m_pit->write(offset,data);
}

View File

@ -127,9 +127,9 @@ WRITE8_MEMBER(al_magicsound_device::timer_w)
{
// can both PITs be selected at the same time?
if(offset & 0x08)
m_timer1->write(space,offset & 0x03,data);
m_timer1->write(offset & 0x03,data);
if(offset & 0x04)
m_timer2->write(space,offset & 0x03,data);
m_timer2->write(offset & 0x03,data);
}
WRITE8_MEMBER(al_magicsound_device::volume_w)

View File

@ -99,13 +99,13 @@ MACHINE_CONFIG_END
void dmv_k210_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data)
{
if (ifsel == 0)
data = m_ppi->read(space, offset & 0x03);
data = m_ppi->read(offset & 0x03);
}
void dmv_k210_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data)
{
if (ifsel == 0)
m_ppi->write(space, offset & 0x03, data);
m_ppi->write(offset & 0x03, data);
}
READ8_MEMBER( dmv_k210_device::porta_r )

View File

@ -138,8 +138,8 @@ dmv_k220_device::dmv_k220_device(const machine_config &mconfig, const char *tag,
void dmv_k220_device::device_start()
{
address_space &space = machine().device<cpu_device>("maincpu")->space(AS_IO);
space.install_readwrite_handler(0x08, 0x0b, read8_delegate(FUNC(pit8253_device::read), &(*m_pit)), write8_delegate(FUNC(pit8253_device::write), &(*m_pit)), 0);
space.install_readwrite_handler(0x0c, 0x0f, read8_delegate(FUNC(i8255_device::read), &(*m_ppi)), write8_delegate(FUNC(i8255_device::write), &(*m_ppi)), 0);
space.install_readwrite_handler(0x08, 0x0b, read8sm_delegate(FUNC(pit8253_device::read), &(*m_pit)), write8sm_delegate(FUNC(pit8253_device::write), &(*m_pit)), 0);
space.install_readwrite_handler(0x0c, 0x0f, read8sm_delegate(FUNC(i8255_device::read), &(*m_ppi)), write8sm_delegate(FUNC(i8255_device::write), &(*m_ppi)), 0);
m_digits.resolve();
}

View File

@ -312,7 +312,7 @@ WRITE8_MEMBER( ecb_grip21_device::ppi_pc_w )
m_sti->i7_w(m_ia);
// PROF-80 handshaking
m_ppi_pc = (!BIT(data, 7) << 7) | (!BIT(data, 5) << 6) | (m_ppi->read_pa() & 0x3f);
m_ppi_pc = (!BIT(data, 7) << 7) | (!BIT(data, 5) << 6) | (m_ppi->pa_r() & 0x3f);
}
//-------------------------------------------------

View File

@ -121,7 +121,7 @@ void iq151_grafik_device::io_read(offs_t offset, uint8_t &data)
{
if (offset >= 0xd0 && offset < 0xd4)
{
data = m_ppi8255->read(machine().dummy_space(), offset & 3);
data = m_ppi8255->read(offset & 3);
}
else if (offset == 0xd4)
{
@ -140,7 +140,7 @@ void iq151_grafik_device::io_write(offs_t offset, uint8_t data)
{
if (offset >= 0xd0 && offset < 0xd4)
{
m_ppi8255->write(machine().dummy_space(), offset & 3, data);
m_ppi8255->write(offset & 3, data);
}
else if (offset == 0xd4)
{

View File

@ -88,7 +88,7 @@ void iq151_staper_device::device_timer(emu_timer &timer, device_timer_id id, int
void iq151_staper_device::io_read(offs_t offset, uint8_t &data)
{
if (offset >= 0xf8 && offset < 0xfc)
data = m_ppi->read(machine().dummy_space(), offset & 0x03);
data = m_ppi->read(offset & 0x03);
}
//-------------------------------------------------
@ -98,7 +98,7 @@ void iq151_staper_device::io_read(offs_t offset, uint8_t &data)
void iq151_staper_device::io_write(offs_t offset, uint8_t data)
{
if (offset >= 0xf8 && offset < 0xfc)
m_ppi->write(machine().dummy_space(), offset & 0x03, data);
m_ppi->write(offset & 0x03, data);
}

View File

@ -162,7 +162,7 @@ INPUT_PORTS_END
READ8_MEMBER( isa8_ibm_mfc_device::ppi0_i_a )
{
// Read data from the Z80 PIU
return m_d71055c_1->read_pa();
return m_d71055c_1->pa_r();
}
WRITE8_MEMBER( isa8_ibm_mfc_device::ppi0_o_b )
@ -210,7 +210,7 @@ WRITE8_MEMBER( isa8_ibm_mfc_device::ppi1_o_a )
READ8_MEMBER( isa8_ibm_mfc_device::ppi1_i_b )
{
// Read data from the PC PIU
return m_d71055c_0->read_pb();
return m_d71055c_0->pb_r();
}
WRITE8_MEMBER( isa8_ibm_mfc_device::ppi1_o_c )
@ -285,7 +285,7 @@ READ8_MEMBER( isa8_ibm_mfc_device::ibm_mfc_r )
case 0x2:
case 0x3:
{
val = m_d71055c_0->read(space, offset);
val = m_d71055c_0->read(offset);
break;
}
@ -317,7 +317,7 @@ WRITE8_MEMBER( isa8_ibm_mfc_device::ibm_mfc_w )
case 0x3:
{
machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(1000));
m_d71055c_0->write(space, offset, data);
m_d71055c_0->write(offset, data);
break;
}
@ -326,7 +326,7 @@ WRITE8_MEMBER( isa8_ibm_mfc_device::ibm_mfc_w )
case 0x6:
case 0x7:
{
m_d8253->write(space, offset & 3, data);
m_d8253->write(offset & 3, data);
break;
}

View File

@ -110,8 +110,8 @@ void isa8_myb3k_com_device::device_reset()
write8_delegate(FUNC(isa8_myb3k_com_device::dce_control), this) );
m_isa->install_device(base + 4, base + 7,
read8_delegate(FUNC(pit8253_device::read), subdevice<pit8253_device>("pit")),
write8_delegate(FUNC(pit8253_device::write), subdevice<pit8253_device>("pit")) );
read8sm_delegate(FUNC(pit8253_device::read), subdevice<pit8253_device>("pit")),
write8sm_delegate(FUNC(pit8253_device::write), subdevice<pit8253_device>("pit")) );
m_irq = m_isairq->read();
m_installed = true;

View File

@ -95,32 +95,32 @@ p1_sound_device::p1_sound_device(const machine_config &mconfig, const char *tag,
READ8_MEMBER(p1_sound_device::d14_r)
{
return m_d14->read(space, offset >> 1);
return m_d14->read(offset >> 1);
}
WRITE8_MEMBER(p1_sound_device::d14_w)
{
m_d14->write(space, offset >> 1, data);
m_d14->write(offset >> 1, data);
}
READ8_MEMBER(p1_sound_device::d16_r)
{
return m_d16->read(space, offset >> 1);
return m_d16->read(offset >> 1);
}
WRITE8_MEMBER(p1_sound_device::d16_w)
{
m_d16->write(space, offset >> 1, data);
m_d16->write(offset >> 1, data);
}
READ8_MEMBER(p1_sound_device::d17_r)
{
return m_d17->read(space, offset >> 1);
return m_d17->read(offset >> 1);
}
WRITE8_MEMBER(p1_sound_device::d17_w)
{
m_d17->write(space, offset >> 1, data);
m_d17->write(offset >> 1, data);
}
READ8_MEMBER(p1_sound_device::adc_r)

View File

@ -32,14 +32,14 @@ isa8_pds_device::isa8_pds_device(const machine_config &mconfig, const char *tag,
READ8_MEMBER(isa8_pds_device::ppi_r)
{
if(!(offset & 0x01))
return m_ppi->read(space,offset/2);
return m_ppi->read(offset/2);
return 0xff;
}
WRITE8_MEMBER(isa8_pds_device::ppi_w)
{
if(!(offset & 0x01))
m_ppi->write(space,offset/2,data);
m_ppi->write(offset/2,data);
}
void isa8_pds_device::device_start()

View File

@ -217,11 +217,11 @@ void southbridge_device::device_start()
spaceio = &machine().device(":maincpu")->memory().space(AS_IO);
spaceio->install_readwrite_handler(0x0000, 0x001f, read8_delegate(FUNC(am9517a_device::read), &(*m_dma8237_1)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma8237_1)), 0xffffffff);
spaceio->install_readwrite_handler(0x0020, 0x003f, read8_delegate(FUNC(pic8259_device::read), &(*m_pic8259_master)), write8_delegate(FUNC(pic8259_device::write), &(*m_pic8259_master)), 0xffffffff);
spaceio->install_readwrite_handler(0x0040, 0x005f, read8_delegate(FUNC(pit8254_device::read), &(*m_pit8254)), write8_delegate(FUNC(pit8254_device::write), &(*m_pit8254)), 0xffffffff);
spaceio->install_readwrite_handler(0x0020, 0x003f, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic8259_master)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic8259_master)), 0xffffffff);
spaceio->install_readwrite_handler(0x0040, 0x005f, read8sm_delegate(FUNC(pit8254_device::read), &(*m_pit8254)), write8sm_delegate(FUNC(pit8254_device::write), &(*m_pit8254)), 0xffffffff);
spaceio->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(southbridge_device::at_portb_r), this), write8_delegate(FUNC(southbridge_device::at_portb_w), this), 0x0000ff00);
spaceio->install_readwrite_handler(0x0080, 0x009f, read8_delegate(FUNC(southbridge_device::at_page8_r), this), write8_delegate(FUNC(southbridge_device::at_page8_w), this), 0xffffffff);
spaceio->install_readwrite_handler(0x00a0, 0x00bf, read8_delegate(FUNC(pic8259_device::read), &(*m_pic8259_slave)), write8_delegate(FUNC(pic8259_device::write), &(*m_pic8259_slave)), 0xffffffff);
spaceio->install_readwrite_handler(0x00a0, 0x00bf, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic8259_slave)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic8259_slave)), 0xffffffff);
spaceio->install_readwrite_handler(0x00c0, 0x00df, read8_delegate(FUNC(southbridge_device::at_dma8237_2_r), this), write8_delegate(FUNC(southbridge_device::at_dma8237_2_w), this), 0xffffffff);
spaceio->install_readwrite_handler(0x0170, 0x0177, read32_delegate(FUNC(southbridge_device::ide2_read32_cs0_r), this), write32_delegate(FUNC(southbridge_device::ide2_write32_cs0_w), this), 0xffffffff);
spaceio->install_readwrite_handler(0x01f0, 0x01f7, read32_delegate(FUNC(southbridge_device::ide1_read32_cs0_r), this), write32_delegate(FUNC(southbridge_device::ide1_write32_cs0_w), this), 0xffffffff);

View File

@ -107,7 +107,7 @@ uint8_t pofo_hpc101_device::nrdi_r(address_space &space, offs_t offset, uint8_t
if ((offset & 0x0c) == 0x08)
{
data = m_ppi->read(space, offset & 0x03);
data = m_ppi->read(offset & 0x03);
}
}
@ -125,7 +125,7 @@ void pofo_hpc101_device::nwri_w(address_space &space, offs_t offset, uint8_t dat
{
if ((offset & 0x0c) == 0x08)
{
m_ppi->write(space, offset & 0x03, data);
m_ppi->write(offset & 0x03, data);
}
}
}

View File

@ -377,7 +377,7 @@ uint8_t s100_wunderbus_device::s100_sinp_r(address_space &space, offs_t offset)
case 4: // 8259 0 register
case 5: // 8259 1 register
data = m_pic->read(space, offset & 0x01);
data = m_pic->read(offset & 0x01);
break;
case 6: // not used
@ -486,7 +486,7 @@ void s100_wunderbus_device::s100_sout_w(address_space &space, offs_t offset, uin
case 4: // 8259 0 register
case 5: // 8259 1 register
m_pic->write(space, offset & 0x01, data);
m_pic->write(offset & 0x01, data);
break;
case 6: // Par. port cntrl.

View File

@ -210,7 +210,7 @@ void sega_sk1100_device::device_start()
READ8_MEMBER(sega_sk1100_device::peripheral_r)
{
return m_ppi->read(space, offset & 0x03);
return m_ppi->read(offset & 0x03);
}
@ -220,7 +220,7 @@ READ8_MEMBER(sega_sk1100_device::peripheral_r)
WRITE8_MEMBER(sega_sk1100_device::peripheral_w)
{
m_ppi->write(space, offset & 0x03, data);
m_ppi->write(offset & 0x03, data);
}

View File

@ -215,7 +215,7 @@ WRITE8_MEMBER(spc1000_fdd_exp_device::write)
switch (offset)
{
case 0:
m_ppi->write(space, 1, data);
m_ppi->write(1, data);
break;
case 2:
m_i8255_0_pc = data;

View File

@ -277,11 +277,11 @@ void v53_base_device::install_peripheral_io()
if (IOAG) // 8-bit
{
space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8_delegate(FUNC(pic8259_device::read), (pic8259_device*)m_v53icu), write8_delegate(FUNC(pic8259_device::write), (pic8259_device*)m_v53icu), 0xffff);
space(AS_IO).install_readwrite_handler(base+0x00, base+0x01, read8sm_delegate(FUNC(pic8259_device::read), (pic8259_device*)m_v53icu), write8sm_delegate(FUNC(pic8259_device::write), (pic8259_device*)m_v53icu), 0xffff);
}
else
{
space(AS_IO).install_readwrite_handler(base+0x00, base+0x03, read8_delegate(FUNC(pic8259_device::read), (pic8259_device*)m_v53icu), write8_delegate(FUNC(pic8259_device::write), (pic8259_device*)m_v53icu), 0x00ff);
space(AS_IO).install_readwrite_handler(base+0x00, base+0x03, read8sm_delegate(FUNC(pic8259_device::read), (pic8259_device*)m_v53icu), write8sm_delegate(FUNC(pic8259_device::write), (pic8259_device*)m_v53icu), 0x00ff);
}
}
@ -352,15 +352,15 @@ WRITE8_MEMBER(v53_base_device::scu_simk_w)
/*** TCU ***/
WRITE8_MEMBER(v53_base_device::tmu_tct0_w) { m_v53tcu->write(space, 0, data); }
WRITE8_MEMBER(v53_base_device::tmu_tct1_w) { m_v53tcu->write(space, 1, data); }
WRITE8_MEMBER(v53_base_device::tmu_tct2_w) { m_v53tcu->write(space, 2, data); }
WRITE8_MEMBER(v53_base_device::tmu_tmd_w) { m_v53tcu->write(space, 3, data); }
WRITE8_MEMBER(v53_base_device::tmu_tct0_w) { m_v53tcu->write(0, data); }
WRITE8_MEMBER(v53_base_device::tmu_tct1_w) { m_v53tcu->write(1, data); }
WRITE8_MEMBER(v53_base_device::tmu_tct2_w) { m_v53tcu->write(2, data); }
WRITE8_MEMBER(v53_base_device::tmu_tmd_w) { m_v53tcu->write(3, data); }
READ8_MEMBER(v53_base_device::tmu_tst0_r) { return m_v53tcu->read(space, 0); }
READ8_MEMBER(v53_base_device::tmu_tst1_r) { return m_v53tcu->read(space, 1); }
READ8_MEMBER(v53_base_device::tmu_tst2_r) { return m_v53tcu->read(space, 2); }
READ8_MEMBER(v53_base_device::tmu_tst0_r) { return m_v53tcu->read(0); }
READ8_MEMBER(v53_base_device::tmu_tst1_r) { return m_v53tcu->read(1); }
READ8_MEMBER(v53_base_device::tmu_tst2_r) { return m_v53tcu->read(2); }

View File

@ -262,17 +262,17 @@ void cs4031_device::device_start()
// install i/o accesses
m_space_io->install_readwrite_handler(0x0000, 0x000f, read8_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffffffff);
m_space_io->install_readwrite_handler(0x0020, 0x0023, read8_delegate(FUNC(pic8259_device::read), &(*m_intc1)), write8_delegate(FUNC(pic8259_device::write), &(*m_intc1)), 0x0000ffff);
m_space_io->install_readwrite_handler(0x0020, 0x0023, read8sm_delegate(FUNC(pic8259_device::read), &(*m_intc1)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_intc1)), 0x0000ffff);
m_space_io->install_write_handler(0x0020, 0x0023, write8_delegate(FUNC(cs4031_device::config_address_w), this), 0x00ff0000);
m_space_io->install_readwrite_handler(0x0020, 0x0023, read8_delegate(FUNC(cs4031_device::config_data_r), this), write8_delegate(FUNC(cs4031_device::config_data_w), this), 0xff000000);
m_space_io->install_readwrite_handler(0x0040, 0x0043, read8_delegate(FUNC(pit8254_device::read), &(*m_ctc)), write8_delegate(FUNC(pit8254_device::write), &(*m_ctc)), 0xffffffff);
m_space_io->install_readwrite_handler(0x0040, 0x0043, read8sm_delegate(FUNC(pit8254_device::read), &(*m_ctc)), write8sm_delegate(FUNC(pit8254_device::write), &(*m_ctc)), 0xffffffff);
m_space_io->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(cs4031_device::keyb_data_r), this), write8_delegate(FUNC(cs4031_device::keyb_data_w), this), 0x000000ff);
m_space_io->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(cs4031_device::portb_r), this), write8_delegate(FUNC(cs4031_device::portb_w), this), 0x0000ff00);
m_space_io->install_readwrite_handler(0x0064, 0x0067, read8_delegate(FUNC(cs4031_device::keyb_status_r), this), write8_delegate(FUNC(cs4031_device::keyb_command_w), this), 0x000000ff);
m_space_io->install_readwrite_handler(0x0070, 0x0073, read8_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8_delegate(FUNC(cs4031_device::rtc_w), this), 0x0000ffff);
m_space_io->install_readwrite_handler(0x0080, 0x008f, read8_delegate(FUNC(cs4031_device::dma_page_r), this), write8_delegate(FUNC(cs4031_device::dma_page_w), this), 0xffffffff);
m_space_io->install_readwrite_handler(0x0090, 0x0093, read8_delegate(FUNC(cs4031_device::sysctrl_r), this), write8_delegate(FUNC(cs4031_device::sysctrl_w), this), 0x00ff0000);
m_space_io->install_readwrite_handler(0x00a0, 0x00a3, read8_delegate(FUNC(pic8259_device::read), &(*m_intc2)), write8_delegate(FUNC(pic8259_device::write), &(*m_intc2)), 0x0000ffff);
m_space_io->install_readwrite_handler(0x00a0, 0x00a3, read8sm_delegate(FUNC(pic8259_device::read), &(*m_intc2)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_intc2)), 0x0000ffff);
m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8_delegate(FUNC(cs4031_device::dma2_r),this), write8_delegate(FUNC(cs4031_device::dma2_w),this), 0xffffffff);
}

View File

@ -40,14 +40,14 @@ READ16_MEMBER( i80130_device::io_r )
case 0: case 1:
if (ACCESSING_BITS_0_7)
{
data = m_pic->read(space, offset & 0x01);
data = m_pic->read(offset & 0x01);
}
break;
case 4: case 5: case 6: case 7:
if (ACCESSING_BITS_0_7)
{
data = m_pit->read(space, offset & 0x03);
data = m_pit->read(offset & 0x03);
}
break;
}
@ -62,14 +62,14 @@ WRITE16_MEMBER( i80130_device::io_w )
case 0: case 1:
if (ACCESSING_BITS_0_7)
{
m_pic->write(space, offset & 0x01, data & 0xff);
m_pic->write(offset & 0x01, data & 0xff);
}
break;
case 4: case 5: case 6: case 7:
if (ACCESSING_BITS_0_7)
{
m_pit->write(space, offset & 0x03, data & 0xff);
m_pit->write(offset & 0x03, data & 0xff);
}
break;
}

View File

@ -714,7 +714,7 @@ void i8255_device::set_pc_bit(int bit, int state)
}
READ8_MEMBER( i8255_device::read )
uint8_t i8255_device::read(offs_t offset)
{
uint8_t data = 0;
@ -754,7 +754,7 @@ READ8_MEMBER( i8255_device::read )
}
WRITE8_MEMBER( i8255_device::write )
void i8255_device::write(offs_t offset, uint8_t data)
{
switch (offset & 0x03)
{
@ -807,17 +807,11 @@ WRITE8_MEMBER( i8255_device::write )
}
READ8_MEMBER( i8255_device::pa_r )
{
return read_pa();
}
//-------------------------------------------------
// read_pa - port A read
// pa_r - port A read
//-------------------------------------------------
uint8_t i8255_device::read_pa()
uint8_t i8255_device::pa_r()
{
uint8_t data = 0xff;
@ -832,12 +826,12 @@ uint8_t i8255_device::read_pa()
// acka_r - port A read with PC6 strobe
//-------------------------------------------------
READ8_MEMBER( i8255_device::acka_r )
uint8_t i8255_device::acka_r()
{
if (!machine().side_effects_disabled())
pc6_w(0);
uint8_t data = read_pa();
uint8_t data = pa_r();
if (!machine().side_effects_disabled())
pc6_w(1);
@ -846,17 +840,11 @@ READ8_MEMBER( i8255_device::acka_r )
}
READ8_MEMBER( i8255_device::pb_r )
{
return read_pb();
}
//-------------------------------------------------
// read_pb - port B read
// pb_r - port B read
//-------------------------------------------------
uint8_t i8255_device::read_pb()
uint8_t i8255_device::pb_r()
{
uint8_t data = 0xff;
@ -873,12 +861,12 @@ uint8_t i8255_device::read_pb()
// ackb_r - port B read with PC2 strobe
//-------------------------------------------------
READ8_MEMBER( i8255_device::ackb_r )
uint8_t i8255_device::ackb_r()
{
if (!machine().side_effects_disabled())
pc2_w(0);
uint8_t data = read_pb();
uint8_t data = pb_r();
if (!machine().side_effects_disabled())
pc2_w(1);

View File

@ -93,16 +93,14 @@ public:
auto tri_pa_callback() { return m_tri_pa_cb.bind(); }
auto tri_pb_callback() { return m_tri_pb_cb.bind(); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
uint8_t read(offs_t offset);
void write(offs_t offset, uint8_t data );
DECLARE_READ8_MEMBER( pa_r );
uint8_t read_pa();
DECLARE_READ8_MEMBER( acka_r );
uint8_t pa_r();
uint8_t acka_r();
DECLARE_READ8_MEMBER( pb_r );
uint8_t read_pb();
DECLARE_READ8_MEMBER( ackb_r );
uint8_t pb_r();
uint8_t ackb_r();
DECLARE_WRITE_LINE_MEMBER( pc2_w );
DECLARE_WRITE_LINE_MEMBER( pc4_w );

View File

@ -120,17 +120,17 @@ WRITE8_MEMBER(mb89363b_device::i8255_b_port_c_w) { m_out_b_pc_cb(space, offset,
READ8_MEMBER( mb89363b_device::read )
{
if (offset & 4)
return m_i8255_b->read(space, offset & 3);
return m_i8255_b->read(offset & 3);
else
return m_i8255_a->read(space, offset & 3);
return m_i8255_a->read(offset & 3);
}
WRITE8_MEMBER( mb89363b_device::write )
{
if (offset & 4)
m_i8255_b->write(space, offset & 3, data);
m_i8255_b->write(offset & 3, data);
else
m_i8255_a->write(space, offset & 3, data);
m_i8255_a->write(offset & 3, data);
}

View File

@ -137,7 +137,7 @@ IRQ_CALLBACK_MEMBER(pic8259_device::inta_cb)
}
READ8_MEMBER( pic8259_device::read )
uint8_t pic8259_device::read(offs_t offset)
{
/* NPW 18-May-2003 - Changing 0xFF to 0x00 as per Ruslan */
uint8_t data = 0x00;
@ -187,7 +187,7 @@ READ8_MEMBER( pic8259_device::read )
}
WRITE8_MEMBER( pic8259_device::write )
void pic8259_device::write(offs_t offset, uint8_t data)
{
switch(offset)
{

View File

@ -57,8 +57,8 @@ public:
auto in_sp_callback() { return m_in_sp_func.bind(); }
auto read_slave_ack_callback() { return m_read_slave_ack_func.bind(); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
uint8_t read(offs_t offset);
void write(offs_t offset, uint8_t data);
uint32_t acknowledge();
DECLARE_WRITE_LINE_MEMBER( ir0_w ) { set_irq_line(0, state); }

View File

@ -809,7 +809,7 @@ uint8_t pit_counter_device::read()
return data;
}
READ8_MEMBER( pit8253_device::read )
uint8_t pit8253_device::read(offs_t offset)
{
offset &= 3;
@ -1023,7 +1023,7 @@ void pit_counter_device::count_w(uint8_t data)
}
}
WRITE8_MEMBER( pit8253_device::write )
void pit8253_device::write(offs_t offset, uint8_t data)
{
offset &= 3;

View File

@ -135,8 +135,8 @@ public:
template <unsigned N, class Object> devcb_base &set_out_handler(Object &&cb) { return m_out_handler[N].set_callback(std::forward<Object>(cb)); }
template <unsigned N> auto out_handler() { return m_out_handler[N].bind(); }
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
uint8_t read(offs_t offset);
void write(offs_t offset, uint8_t data);
WRITE_LINE_MEMBER(write_gate0) { m_counter[0]->gate_w(state); }
WRITE_LINE_MEMBER(write_gate1) { m_counter[1]->gate_w(state); }

View File

@ -160,15 +160,15 @@ void wd7600_device::device_start()
{
// FIXME: are all these address ranges correct?
m_space_io->install_readwrite_handler(0x0000, 0x000f, read8_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffff);
m_space_io->install_readwrite_handler(0x0020, 0x003f, read8_delegate(FUNC(pic8259_device::read), &(*m_pic1)), write8_delegate(FUNC(pic8259_device::write), &(*m_pic1)), 0xffff);
m_space_io->install_readwrite_handler(0x0040, 0x0043, read8_delegate(FUNC(pit8254_device::read), &(*m_ctc)), write8_delegate(FUNC(pit8254_device::write), &(*m_ctc)), 0xffff);
m_space_io->install_readwrite_handler(0x0020, 0x003f, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic1)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic1)), 0xffff);
m_space_io->install_readwrite_handler(0x0040, 0x0043, read8sm_delegate(FUNC(pit8254_device::read), &(*m_ctc)), write8sm_delegate(FUNC(pit8254_device::write), &(*m_ctc)), 0xffff);
m_space_io->install_readwrite_handler(0x0060, 0x0061, read8_delegate(FUNC(wd7600_device::keyb_data_r), this), write8_delegate(FUNC(wd7600_device::keyb_data_w), this), 0x00ff);
m_space_io->install_readwrite_handler(0x0060, 0x0061, read8_delegate(FUNC(wd7600_device::portb_r), this), write8_delegate(FUNC(wd7600_device::portb_w), this), 0xff00);
m_space_io->install_readwrite_handler(0x0064, 0x0065, read8_delegate(FUNC(wd7600_device::keyb_status_r), this), write8_delegate(FUNC(wd7600_device::keyb_cmd_w), this), 0x00ff);
m_space_io->install_readwrite_handler(0x0070, 0x007f, read8_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8_delegate(FUNC(wd7600_device::rtc_w), this), 0xffff);
m_space_io->install_readwrite_handler(0x0080, 0x008f, read8_delegate(FUNC(wd7600_device::dma_page_r), this), write8_delegate(FUNC(wd7600_device::dma_page_w), this), 0xffff);
m_space_io->install_readwrite_handler(0x0092, 0x0093, read8_delegate(FUNC(wd7600_device::a20_reset_r), this), write8_delegate(FUNC(wd7600_device::a20_reset_w), this), 0x00ff);
m_space_io->install_readwrite_handler(0x00a0, 0x00a3, read8_delegate(FUNC(pic8259_device::read), &(*m_pic2)), write8_delegate(FUNC(pic8259_device::write), &(*m_pic2)), 0xffff);
m_space_io->install_readwrite_handler(0x00a0, 0x00a3, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic2)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic2)), 0xffff);
m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8_delegate(FUNC(am9517a_device::read), &(*m_dma2)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma2)), 0x00ff);
m_space_io->install_readwrite_handler(0x2072, 0x2073, read16_delegate(FUNC(wd7600_device::refresh_r), this), write16_delegate(FUNC(wd7600_device::refresh_w), this));
m_space_io->install_readwrite_handler(0x2872, 0x2873, read16_delegate(FUNC(wd7600_device::chipsel_r), this), write16_delegate(FUNC(wd7600_device::chipsel_w), this));
@ -182,15 +182,15 @@ void wd7600_device::device_start()
{
assert(m_space_io->data_width() == 32);
m_space_io->install_readwrite_handler(0x0000, 0x000f, read8_delegate(FUNC(am9517a_device::read), &(*m_dma1)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma1)), 0xffffffff);
m_space_io->install_readwrite_handler(0x0020, 0x003f, read8_delegate(FUNC(pic8259_device::read), &(*m_pic1)), write8_delegate(FUNC(pic8259_device::write), &(*m_pic1)), 0x0000ffff);
m_space_io->install_readwrite_handler(0x0040, 0x0043, read8_delegate(FUNC(pit8254_device::read), &(*m_ctc)), write8_delegate(FUNC(pit8254_device::write), &(*m_ctc)), 0xffffffff);
m_space_io->install_readwrite_handler(0x0020, 0x003f, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic1)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic1)), 0x0000ffff);
m_space_io->install_readwrite_handler(0x0040, 0x0043, read8sm_delegate(FUNC(pit8254_device::read), &(*m_ctc)), write8sm_delegate(FUNC(pit8254_device::write), &(*m_ctc)), 0xffffffff);
m_space_io->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(wd7600_device::keyb_data_r), this), write8_delegate(FUNC(wd7600_device::keyb_data_w), this), 0x000000ff);
m_space_io->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(wd7600_device::portb_r), this), write8_delegate(FUNC(wd7600_device::portb_w), this), 0x0000ff00);
m_space_io->install_readwrite_handler(0x0064, 0x0067, read8_delegate(FUNC(wd7600_device::keyb_status_r), this), write8_delegate(FUNC(wd7600_device::keyb_cmd_w), this), 0x000000ff);
m_space_io->install_readwrite_handler(0x0070, 0x007f, read8_delegate(FUNC(mc146818_device::read), &(*m_rtc)), write8_delegate(FUNC(wd7600_device::rtc_w), this), 0x0000ffff);
m_space_io->install_readwrite_handler(0x0080, 0x008f, read8_delegate(FUNC(wd7600_device::dma_page_r), this), write8_delegate(FUNC(wd7600_device::dma_page_w), this), 0xffffffff);
m_space_io->install_readwrite_handler(0x0090, 0x0093, read8_delegate(FUNC(wd7600_device::a20_reset_r), this), write8_delegate(FUNC(wd7600_device::a20_reset_w), this), 0x00ff0000);
m_space_io->install_readwrite_handler(0x00a0, 0x00a3, read8_delegate(FUNC(pic8259_device::read), &(*m_pic2)), write8_delegate(FUNC(pic8259_device::write), &(*m_pic2)), 0x0000ffff);
m_space_io->install_readwrite_handler(0x00a0, 0x00a3, read8sm_delegate(FUNC(pic8259_device::read), &(*m_pic2)), write8sm_delegate(FUNC(pic8259_device::write), &(*m_pic2)), 0x0000ffff);
m_space_io->install_readwrite_handler(0x00c0, 0x00df, read8_delegate(FUNC(am9517a_device::read), &(*m_dma2)), write8_delegate(FUNC(am9517a_device::write), &(*m_dma2)), 0x00ff00ff);
m_space_io->install_readwrite_handler(0x2070, 0x2073, read16_delegate(FUNC(wd7600_device::refresh_r), this), write16_delegate(FUNC(wd7600_device::refresh_w), this), 0xffff0000);
m_space_io->install_readwrite_handler(0x2870, 0x2873, read16_delegate(FUNC(wd7600_device::chipsel_r), this), write16_delegate(FUNC(wd7600_device::chipsel_w), this), 0xffff0000);

View File

@ -690,14 +690,14 @@ READ16_MEMBER( leland_80186_sound_device::peripheral_r )
case 2:
if (ACCESSING_BITS_0_7)
return m_pit[0]->read(space, offset & 3);
return m_pit[0]->read(offset & 3);
break;
case 3:
if (m_type <= TYPE_REDLINE)
{
if (ACCESSING_BITS_0_7)
return m_pit[1]->read(space, offset & 3);
return m_pit[1]->read(offset & 3);
}
else if (m_type == TYPE_WSF)
return m_ymsnd->read(space, offset);
@ -707,7 +707,7 @@ READ16_MEMBER( leland_80186_sound_device::peripheral_r )
if (m_type == TYPE_REDLINE)
{
if (ACCESSING_BITS_0_7)
return m_pit[2]->read(space, offset & 3);
return m_pit[2]->read(offset & 3);
}
else
logerror("%s:Unexpected peripheral read %d/%02X\n", machine().describe_context(), select, offset*2);
@ -735,14 +735,14 @@ WRITE16_MEMBER( leland_80186_sound_device::peripheral_w )
case 2:
if (ACCESSING_BITS_0_7)
m_pit[0]->write(space, offset & 3, data);
m_pit[0]->write(offset & 3, data);
break;
case 3:
if (m_type <= TYPE_REDLINE)
{
if (ACCESSING_BITS_0_7)
m_pit[1]->write(space, offset & 3, data);
m_pit[1]->write(offset & 3, data);
}
else if(m_type == TYPE_WSF)
m_ymsnd->write(space, offset, data);
@ -752,7 +752,7 @@ WRITE16_MEMBER( leland_80186_sound_device::peripheral_w )
if (m_type == TYPE_REDLINE)
{
if (ACCESSING_BITS_0_7)
m_pit[2]->write(space, offset & 3, data);
m_pit[2]->write(offset & 3, data);
}
else if (mem_mask == 0xffff)
{

View File

@ -309,7 +309,7 @@ READ8_MEMBER(apc_state::apc_port_28_r)
uint8_t res;
if(offset & 1)
res = m_pit->read(space, (offset & 6) >> 1);
res = m_pit->read((offset & 6) >> 1);
else
{
if(offset & 4)
@ -318,7 +318,7 @@ READ8_MEMBER(apc_state::apc_port_28_r)
res = 0xff;
}
else
res = m_i8259_s->read(space, (offset & 2) >> 1);
res = m_i8259_s->read((offset & 2) >> 1);
}
return res;
@ -327,13 +327,13 @@ READ8_MEMBER(apc_state::apc_port_28_r)
WRITE8_MEMBER(apc_state::apc_port_28_w)
{
if(offset & 1)
m_pit->write(space, (offset & 6) >> 1, data);
m_pit->write((offset & 6) >> 1, data);
else
{
if(offset & 4)
printf("Write undefined port %02x\n",offset+0x28);
else
m_i8259_s->write(space, (offset & 2) >> 1, data);
m_i8259_s->write((offset & 2) >> 1, data);
}
}

View File

@ -340,9 +340,9 @@ READ8_MEMBER(astinvad_state::kamikaze_ppi_r)
/* the address lines are used for /CS; yes, they can overlap! */
if (!(offset & 4))
result &= m_ppi8255_0->read(space, offset);
result &= m_ppi8255_0->read(offset);
if (!(offset & 8))
result &= m_ppi8255_1->read(space, offset);
result &= m_ppi8255_1->read(offset);
return result;
}
@ -351,9 +351,9 @@ WRITE8_MEMBER(astinvad_state::kamikaze_ppi_w)
{
/* the address lines are used for /CS; yes, they can overlap! */
if (!(offset & 4))
m_ppi8255_0->write(space, offset, data);
m_ppi8255_0->write(offset, data);
if (!(offset & 8))
m_ppi8255_1->write(space, offset, data);
m_ppi8255_1->write(offset, data);
}

View File

@ -148,9 +148,9 @@ WRITE8_MEMBER(dribling_state::shr_w)
READ8_MEMBER(dribling_state::ioread)
{
if (offset & 0x08)
return m_ppi8255_0->read(space, offset & 3);
return m_ppi8255_0->read(offset & 3);
else if (offset & 0x10)
return m_ppi8255_1->read(space, offset & 3);
return m_ppi8255_1->read(offset & 3);
return 0xff;
}
@ -158,9 +158,9 @@ READ8_MEMBER(dribling_state::ioread)
WRITE8_MEMBER(dribling_state::iowrite)
{
if (offset & 0x08)
m_ppi8255_0->write(space, offset & 3, data);
m_ppi8255_0->write(offset & 3, data);
else if (offset & 0x10)
m_ppi8255_1->write(space, offset & 3, data);
m_ppi8255_1->write(offset & 3, data);
else if (offset & 0x40)
{
m_dr = m_ds;

View File

@ -94,12 +94,12 @@ void duet16_state::machine_reset()
READ8_MEMBER(duet16_state::pic_r)
{
return m_pic->read(space, offset ^ 1, mem_mask);
return m_pic->read(offset ^ 1);
}
WRITE8_MEMBER(duet16_state::pic_w)
{
m_pic->write(space, offset ^ 1, data);
m_pic->write(offset ^ 1, data);
}
WRITE8_MEMBER(duet16_state::fdcctrl_w)

View File

@ -277,7 +277,7 @@ READ8_MEMBER(elwro800_state::elwro800jr_io_r)
else if (!BIT(cs,2))
{
// CS55
return m_i8255->read(space, (offset & 0x03) ^ 0x03);
return m_i8255->read((offset & 0x03) ^ 0x03);
}
else if (!BIT(cs,3))
{
@ -325,7 +325,7 @@ WRITE8_MEMBER(elwro800_state::elwro800jr_io_w)
else if (!BIT(cs,2))
{
// CS55
m_i8255->write(space, (offset & 0x03) ^ 0x03, data);
m_i8255->write((offset & 0x03) ^ 0x03, data);
}
else if (!BIT(cs,3))
{

View File

@ -1203,7 +1203,7 @@ READ8_MEMBER(fidelz80_state::vsc_io_trampoline_r)
{
u8 data = 0xff; // open bus
if (~offset & 4)
data &= m_ppi8255->read(space, offset & 3);
data &= m_ppi8255->read(offset & 3);
if (~offset & 8)
data &= m_z80pio->read(space, offset & 3);
@ -1213,7 +1213,7 @@ READ8_MEMBER(fidelz80_state::vsc_io_trampoline_r)
WRITE8_MEMBER(fidelz80_state::vsc_io_trampoline_w)
{
if (~offset & 4)
m_ppi8255->write(space, offset & 3, data);
m_ppi8255->write(offset & 3, data);
if (~offset & 8)
m_z80pio->write(space, offset & 3, data);
}

View File

@ -867,8 +867,8 @@ READ8_MEMBER(galaxian_state::theend_ppi8255_r)
{
/* the decoding here is very simplistic, and you can address both simultaneously */
uint8_t result = 0xff;
if (offset & 0x0100) result &= m_ppi8255[0]->read(space, offset & 3);
if (offset & 0x0200) result &= m_ppi8255[1]->read(space, offset & 3);
if (offset & 0x0100) result &= m_ppi8255[0]->read(offset & 3);
if (offset & 0x0200) result &= m_ppi8255[1]->read(offset & 3);
return result;
}
@ -876,8 +876,8 @@ READ8_MEMBER(galaxian_state::theend_ppi8255_r)
WRITE8_MEMBER(galaxian_state::theend_ppi8255_w)
{
/* the decoding here is very simplistic, and you can address both simultaneously */
if (offset & 0x0100) m_ppi8255[0]->write(space, offset & 3, data);
if (offset & 0x0200) m_ppi8255[1]->write(space, offset & 3, data);
if (offset & 0x0100) m_ppi8255[0]->write(offset & 3, data);
if (offset & 0x0200) m_ppi8255[1]->write(offset & 3, data);
}
@ -972,7 +972,7 @@ READ8_MEMBER(galaxian_state::sfx_sample_io_r)
{
/* the decoding here is very simplistic, and you can address both simultaneously */
uint8_t result = 0xff;
if (offset & 0x04) result &= m_ppi8255[2]->read(space, offset & 3);
if (offset & 0x04) result &= m_ppi8255[2]->read(offset & 3);
return result;
}
@ -980,7 +980,7 @@ READ8_MEMBER(galaxian_state::sfx_sample_io_r)
WRITE8_MEMBER(galaxian_state::sfx_sample_io_w)
{
/* the decoding here is very simplistic, and you can address both simultaneously */
if (offset & 0x04) m_ppi8255[2]->write(space, offset & 3, data);
if (offset & 0x04) m_ppi8255[2]->write(offset & 3, data);
if (offset & 0x10) m_dac->write(data);
}
@ -1064,8 +1064,8 @@ READ8_MEMBER(galaxian_state::frogger_ppi8255_r)
{
/* the decoding here is very simplistic, and you can address both simultaneously */
uint8_t result = 0xff;
if (offset & 0x1000) result &= m_ppi8255[1]->read(space, (offset >> 1) & 3);
if (offset & 0x2000) result &= m_ppi8255[0]->read(space, (offset >> 1) & 3);
if (offset & 0x1000) result &= m_ppi8255[1]->read((offset >> 1) & 3);
if (offset & 0x2000) result &= m_ppi8255[0]->read((offset >> 1) & 3);
return result;
}
@ -1073,8 +1073,8 @@ READ8_MEMBER(galaxian_state::frogger_ppi8255_r)
WRITE8_MEMBER(galaxian_state::frogger_ppi8255_w)
{
/* the decoding here is very simplistic, and you can address both simultaneously */
if (offset & 0x1000) m_ppi8255[1]->write(space, (offset >> 1) & 3, data);
if (offset & 0x2000) m_ppi8255[0]->write(space, (offset >> 1) & 3, data);
if (offset & 0x1000) m_ppi8255[1]->write((offset >> 1) & 3, data);
if (offset & 0x2000) m_ppi8255[0]->write((offset >> 1) & 3, data);
}
@ -1129,8 +1129,8 @@ READ8_MEMBER(galaxian_state::frogf_ppi8255_r)
{
/* the decoding here is very simplistic, and you can address both simultaneously */
uint8_t result = 0xff;
if (offset & 0x1000) result &= m_ppi8255[0]->read(space, (offset >> 3) & 3);
if (offset & 0x2000) result &= m_ppi8255[1]->read(space, (offset >> 3) & 3);
if (offset & 0x1000) result &= m_ppi8255[0]->read((offset >> 3) & 3);
if (offset & 0x2000) result &= m_ppi8255[1]->read((offset >> 3) & 3);
return result;
}
@ -1138,8 +1138,8 @@ READ8_MEMBER(galaxian_state::frogf_ppi8255_r)
WRITE8_MEMBER(galaxian_state::frogf_ppi8255_w)
{
/* the decoding here is very simplistic, and you can address both simultaneously */
if (offset & 0x1000) m_ppi8255[0]->write(space, (offset >> 3) & 3, data);
if (offset & 0x2000) m_ppi8255[1]->write(space, (offset >> 3) & 3, data);
if (offset & 0x1000) m_ppi8255[0]->write((offset >> 3) & 3, data);
if (offset & 0x2000) m_ppi8255[1]->write((offset >> 3) & 3, data);
}
@ -1150,10 +1150,10 @@ WRITE8_MEMBER(galaxian_state::frogf_ppi8255_w)
*
*************************************/
READ8_MEMBER(galaxian_state::turtles_ppi8255_0_r){ return m_ppi8255[0]->read(space, (offset >> 4) & 3); }
READ8_MEMBER(galaxian_state::turtles_ppi8255_1_r){ return m_ppi8255[1]->read(space, (offset >> 4) & 3); }
WRITE8_MEMBER(galaxian_state::turtles_ppi8255_0_w){ m_ppi8255[0]->write(space, (offset >> 4) & 3, data); }
WRITE8_MEMBER(galaxian_state::turtles_ppi8255_1_w){ m_ppi8255[1]->write(space, (offset >> 4) & 3, data); }
READ8_MEMBER(galaxian_state::turtles_ppi8255_0_r){ return m_ppi8255[0]->read((offset >> 4) & 3); }
READ8_MEMBER(galaxian_state::turtles_ppi8255_1_r){ return m_ppi8255[1]->read((offset >> 4) & 3); }
WRITE8_MEMBER(galaxian_state::turtles_ppi8255_0_w){ m_ppi8255[0]->write((offset >> 4) & 3, data); }
WRITE8_MEMBER(galaxian_state::turtles_ppi8255_1_w){ m_ppi8255[1]->write((offset >> 4) & 3, data); }
@ -2191,8 +2191,8 @@ READ8_MEMBER(galaxian_state::froggeram_ppi8255_r)
{
// same as theend, but accesses are scrambled
uint8_t result = 0xff;
if (offset & 0x0100) result &= m_ppi8255[0]->read(space, offset & 3);
if (offset & 0x0200) result &= m_ppi8255[1]->read(space, offset & 3);
if (offset & 0x0100) result &= m_ppi8255[0]->read(offset & 3);
if (offset & 0x0200) result &= m_ppi8255[1]->read(offset & 3);
return bitswap<8>(result, 0, 1, 2, 3, 4, 5, 6, 7);
}
@ -2200,8 +2200,8 @@ WRITE8_MEMBER(galaxian_state::froggeram_ppi8255_w)
{
// same as theend, but accesses are scrambled
data = bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7);
if (offset & 0x0100) m_ppi8255[0]->write(space, offset & 3, data);
if (offset & 0x0200) m_ppi8255[1]->write(space, offset & 3, data);
if (offset & 0x0100) m_ppi8255[0]->write(offset & 3, data);
if (offset & 0x0200) m_ppi8255[1]->write(offset & 3, data);
}
void galaxian_state::froggeram_map(address_map &map)

View File

@ -251,9 +251,9 @@ WRITE8_MEMBER( idsa_state::ppi_control_w )
{
//logerror("%s: AY1 port A = %02X\n", machine().describe_context(), data);
if (!BIT(data, 2))
m_ppi[0]->write(space, data & 0x03, m_ppi_data);
m_ppi[0]->write(data & 0x03, m_ppi_data);
if (!BIT(data, 3))
m_ppi[1]->write(space, data & 0x03, m_ppi_data);
m_ppi[1]->write(data & 0x03, m_ppi_data);
}
WRITE8_MEMBER( idsa_state::ppi_data_w )

View File

@ -196,22 +196,22 @@ WRITE_LINE_MEMBER(imds2_state::ipc_intr_w)
READ8_MEMBER(imds2_state::ipcsyspic_r)
{
return m_ipcsyspic->read(space, !BIT(offset, 0));
return m_ipcsyspic->read(!BIT(offset, 0));
}
READ8_MEMBER(imds2_state::ipclocpic_r)
{
return m_ipclocpic->read(space, !BIT(offset, 0));
return m_ipclocpic->read(!BIT(offset, 0));
}
WRITE8_MEMBER(imds2_state::ipcsyspic_w)
{
m_ipcsyspic->write(space, !BIT(offset, 0), data);
m_ipcsyspic->write(!BIT(offset, 0), data);
}
WRITE8_MEMBER(imds2_state::ipclocpic_w)
{
m_ipclocpic->write(space, !BIT(offset, 0), data);
m_ipclocpic->write(!BIT(offset, 0), data);
}
void imds2_state::driver_start()

View File

@ -363,19 +363,19 @@ WRITE8_MEMBER(istrebiteli_state::road_ctrl_w)
READ8_MEMBER(istrebiteli_state::ppi0_r)
{
return m_ppi0->read(space, offset ^ 3) ^ 0xff;
return m_ppi0->read(offset ^ 3) ^ 0xff;
}
WRITE8_MEMBER(istrebiteli_state::ppi0_w)
{
m_ppi0->write(space, offset ^ 3, data ^ 0xff);
m_ppi0->write(offset ^ 3, data ^ 0xff);
}
READ8_MEMBER(istrebiteli_state::ppi1_r)
{
return m_ppi1->read(space, offset ^ 3) ^ 0xff;
return m_ppi1->read(offset ^ 3) ^ 0xff;
}
WRITE8_MEMBER(istrebiteli_state::ppi1_w)
{
m_ppi1->write(space, offset ^ 3, data ^ 0xff);
m_ppi1->write(offset ^ 3, data ^ 0xff);
}
WRITE8_MEMBER(istrebiteli_state::sound_w)

View File

@ -313,22 +313,22 @@ WRITE8_MEMBER( ace_state::io_w )
READ8_MEMBER( ace_state::ppi_pa_r )
{
return m_ppi->read(space, 0);
return m_ppi->read(0);
}
READ8_MEMBER( ace_state::ppi_pb_r )
{
return m_ppi->read(space, 1);
return m_ppi->read(1);
}
READ8_MEMBER( ace_state::ppi_pc_r )
{
return m_ppi->read(space, 2);
return m_ppi->read(2);
}
READ8_MEMBER( ace_state::ppi_control_r )
{
return m_ppi->read(space, 3);
return m_ppi->read(3);
}
@ -338,22 +338,22 @@ READ8_MEMBER( ace_state::ppi_control_r )
WRITE8_MEMBER( ace_state::ppi_pa_w )
{
m_ppi->write(space, 0, data);
m_ppi->write(0, data);
}
WRITE8_MEMBER( ace_state::ppi_pb_w )
{
m_ppi->write(space, 1, data);
m_ppi->write(1, data);
}
WRITE8_MEMBER( ace_state::ppi_pc_w )
{
m_ppi->write(space, 2, data);
m_ppi->write(2, data);
}
WRITE8_MEMBER( ace_state::ppi_control_w )
{
m_ppi->write(space, 3, data);
m_ppi->write(3, data);
}

View File

@ -106,21 +106,13 @@ void konin_state::konin_io(address_map &map)
map.global_mask(0xff);
map(0x24, 0x24).w(FUNC(konin_state::picu_b_w));
map(0x80, 0x83).lrw8("ioppi_rw",
[this](address_space &space, offs_t offset, u8 mem_mask) {
return m_ioppi->read(space, offset^3, mem_mask);
},
[this](address_space &space, offs_t offset, u8 data, u8 mem_mask) {
m_ioppi->write(space, offset^3, data, mem_mask);
});
[this](offs_t offset) { return m_ioppi->read(offset^3); },
[this](offs_t offset, u8 data) { m_ioppi->write(offset^3, data); });
map(0xf6, 0xf6).rw("uart", FUNC(i8251_device::status_r), FUNC(i8251_device::control_w));
map(0xf7, 0xf7).rw("uart", FUNC(i8251_device::data_r), FUNC(i8251_device::data_w));
map(0xf8, 0xfb).lrw8("iopit_rw",
[this](address_space &space, offs_t offset, u8 mem_mask) {
return m_iopit->read(space, offset^3, mem_mask);
},
[this](address_space &space, offs_t offset, u8 data, u8 mem_mask) {
m_iopit->write(space, offset^3, data, mem_mask);
});
[this](offs_t offset) { return m_iopit->read(offset^3); },
[this](offs_t offset, u8 data) { m_iopit->write(offset^3, data); });
}
/* Input ports */

View File

@ -394,12 +394,12 @@ WRITE8_MEMBER(luckybal_state::port90_bitswap_w)
READ8_MEMBER(luckybal_state::ppi_bitswap_r)
{
return bitswap<8>(m_ppi->read(space, offset), 6, 7, 4, 5, 2, 3, 0, 1);
return bitswap<8>(m_ppi->read(offset), 6, 7, 4, 5, 2, 3, 0, 1);
}
WRITE8_MEMBER(luckybal_state::ppi_bitswap_w)
{
m_ppi->write(space, offset, bitswap<8>(data, 6, 7, 4, 5, 2, 3, 0, 1));
m_ppi->write(offset, bitswap<8>(data, 6, 7, 4, 5, 2, 3, 0, 1));
}
WRITE8_MEMBER(luckybal_state::output_port_a_w)
@ -428,7 +428,7 @@ WRITE8_MEMBER(luckybal_state::output_port_b_w)
READ8_MEMBER(luckybal_state::input_port_c_r)
{
uint8_t mux_player, sel_line, bit5, bit6, bit7, ret;
sel_line = m_ppi->read_pb() & 0x7f;
sel_line = m_ppi->pb_r() & 0x7f;
mux_player = m_latch[0]->output_state();
bit5 = BIT(m_aux->read(), sel_line & 0x07) ? 0xff : 0xdf; // Operator & Page.

View File

@ -203,12 +203,12 @@ WRITE16_MEMBER(m20_state::port21_w)
READ16_MEMBER(m20_state::m20_i8259_r)
{
return m_i8259->read(space, offset)<<1;
return m_i8259->read(offset)<<1;
}
WRITE16_MEMBER(m20_state::m20_i8259_w)
{
m_i8259->write(space, offset, (data>>1));
m_i8259->write(offset, (data>>1));
}
WRITE_LINE_MEMBER( m20_state::tty_clock_tick_w )

View File

@ -102,7 +102,7 @@ READ8_MEMBER( mm1_state::read )
break;
case 3:
data = m_pit->read(space, offset & 0x03);
data = m_pit->read(offset & 0x03);
break;
case 4:
@ -171,7 +171,7 @@ WRITE8_MEMBER( mm1_state::write )
break;
case 3:
m_pit->write(space, offset & 0x03, data);
m_pit->write(offset & 0x03, data);
break;
case 4:

View File

@ -320,18 +320,18 @@ WRITE16_MEMBER(ngen_state::peripheral_w)
break;
case 0x10c:
if(ACCESSING_BITS_0_7)
m_pic->write(space,0,data & 0xff);
m_pic->write(0,data & 0xff);
break;
case 0x10d:
if(ACCESSING_BITS_0_7)
m_pic->write(space,1,data & 0xff);
m_pic->write(1,data & 0xff);
break;
case 0x110:
case 0x111:
case 0x112:
case 0x113:
if(ACCESSING_BITS_0_7)
m_pit->write(space,offset-0x110,data & 0xff);
m_pit->write(offset-0x110,data & 0xff);
break;
case 0x141:
// bit 1 enables speaker?
@ -392,18 +392,18 @@ READ16_MEMBER(ngen_state::peripheral_r)
break;
case 0x10c:
if(ACCESSING_BITS_0_7)
ret = m_pic->read(space,0);
ret = m_pic->read(0);
break;
case 0x10d:
if(ACCESSING_BITS_0_7)
ret = m_pic->read(space,1);
ret = m_pic->read(1);
break;
case 0x110:
case 0x111:
case 0x112:
case 0x113:
if(ACCESSING_BITS_0_7)
ret = m_pit->read(space,offset-0x110);
ret = m_pit->read(offset-0x110);
break;
case 0x141:
ret = m_periph141;
@ -522,7 +522,7 @@ WRITE16_MEMBER(ngen_state::hfd_w)
case 0x0a:
case 0x0b:
if(ACCESSING_BITS_0_7)
m_fdc_timer->write(space,offset-0x08,data & 0xff);
m_fdc_timer->write(offset-0x08,data & 0xff);
break;
case 0x10:
case 0x11:
@ -541,7 +541,7 @@ WRITE16_MEMBER(ngen_state::hfd_w)
case 0x1a:
case 0x1b:
if(ACCESSING_BITS_0_7)
m_hdc_timer->write(space,offset-0x18,data & 0xff);
m_hdc_timer->write(offset-0x18,data & 0xff);
break;
}
}
@ -571,7 +571,7 @@ READ16_MEMBER(ngen_state::hfd_r)
case 0x0a:
case 0x0b:
if(ACCESSING_BITS_0_7)
ret = m_fdc_timer->read(space,offset-0x08);
ret = m_fdc_timer->read(offset-0x08);
break;
case 0x10:
case 0x11:
@ -590,7 +590,7 @@ READ16_MEMBER(ngen_state::hfd_r)
case 0x1a:
case 0x1b:
if(ACCESSING_BITS_0_7)
ret = m_hdc_timer->read(space,offset-0x18);
ret = m_hdc_timer->read(offset-0x18);
break;
}

View File

@ -732,8 +732,8 @@ TIMER_CALLBACK_MEMBER(norautp_state::ppi2_ack)
m_ppi8255[2]->pc6_w(param);
if (param == 0)
{
uint8_t const np_addr = m_ppi8255[2]->read_pb();
uint8_t const vram_data = m_ppi8255[2]->read_pa();
uint8_t const np_addr = m_ppi8255[2]->pb_r();
uint8_t const vram_data = m_ppi8255[2]->pa_r();
m_np_vram[np_addr] = vram_data;
}
}

View File

@ -614,10 +614,10 @@ READ8_MEMBER( pasopia7_state::pasopia7_io_r )
io_port = offset & 0xff; //trim down to 8-bit bus
if(io_port >= 0x08 && io_port <= 0x0b)
return m_ppi0->read(space, io_port & 3);
return m_ppi0->read(io_port & 3);
else
if(io_port >= 0x0c && io_port <= 0x0f)
return m_ppi1->read(space, io_port & 3);
return m_ppi1->read(io_port & 3);
// else if(io_port == 0x10 || io_port == 0x11) { M6845 read }
else
if(io_port >= 0x18 && io_port <= 0x1b)
@ -626,7 +626,7 @@ READ8_MEMBER( pasopia7_state::pasopia7_io_r )
if(io_port >= 0x20 && io_port <= 0x23)
{
pasopia_nmi_trap();
return m_ppi2->read(space, io_port & 3);
return m_ppi2->read(io_port & 3);
}
else
if(io_port >= 0x28 && io_port <= 0x2b)
@ -663,10 +663,10 @@ WRITE8_MEMBER( pasopia7_state::pasopia7_io_w )
io_port = offset & 0xff; //trim down to 8-bit bus
if(io_port >= 0x08 && io_port <= 0x0b)
m_ppi0->write(space, io_port & 3, data);
m_ppi0->write(io_port & 3, data);
else
if(io_port >= 0x0c && io_port <= 0x0f)
m_ppi1->write(space, io_port & 3, data);
m_ppi1->write(io_port & 3, data);
else
if(io_port >= 0x10 && io_port <= 0x11)
pasopia7_6845_w(space, io_port-0x10, data);
@ -676,7 +676,7 @@ WRITE8_MEMBER( pasopia7_state::pasopia7_io_w )
else
if(io_port >= 0x20 && io_port <= 0x23)
{
m_ppi2->write(space, io_port & 3, data);
m_ppi2->write(io_port & 3, data);
pasopia_nmi_trap();
}
else

View File

@ -559,8 +559,8 @@ READ8_MEMBER( pc1640_state::io_r )
bool decoded = false;
if ( addr <= 0x00f) { data = m_dmac->read(space, offset & 0x0f); decoded = true; }
else if (addr >= 0x020 && addr <= 0x021) { data = m_pic->read(space, offset & 0x01); decoded = true; }
else if (addr >= 0x040 && addr <= 0x043) { data = m_pit->read(space, offset & 0x03); decoded = true; }
else if (addr >= 0x020 && addr <= 0x021) { data = m_pic->read(offset & 0x01); decoded = true; }
else if (addr >= 0x040 && addr <= 0x043) { data = m_pit->read(offset & 0x03); decoded = true; }
else if (addr >= 0x060 && addr <= 0x06f) { data = system_r(space, offset & 0x0f); decoded = true; }
else if (addr >= 0x070 && addr <= 0x073) { data = m_rtc->read(space, offset & 0x01); decoded = true; }
else if (addr >= 0x078 && addr <= 0x07f) { data = mouse_r(space, offset & 0x07); decoded = true; }

View File

@ -208,7 +208,7 @@ READ8_MEMBER(pc6001_state::nec_ppi8255_r)
return res;
}
return m_ppi->read(space, offset);
return m_ppi->read(offset);
}
WRITE8_MEMBER(pc6001_state::nec_ppi8255_w)
@ -224,7 +224,7 @@ WRITE8_MEMBER(pc6001_state::nec_ppi8255_w)
m_bank1->set_base(m_region_gfx1->base());
}
m_ppi->write(space,offset,data);
m_ppi->write(offset,data);
}
void pc6001_state::pc6001_map(address_map &map)
@ -566,7 +566,7 @@ WRITE8_MEMBER(pc6001mk2_state::necmk2_ppi8255_w)
}
}
m_ppi->write(space,offset,data);
m_ppi->write(offset,data);
}
void pc6001mk2_state::vram_bank_change(uint8_t vram_bank)
@ -902,7 +902,7 @@ WRITE8_MEMBER(pc6001sr_state::necsr_ppi8255_w)
}
}
m_ppi->write(space,offset,data);
m_ppi->write(offset,data);
}
READ8_MEMBER(pc6001sr_state::hw_rev_r)

View File

@ -784,8 +784,8 @@ WRITE8_MEMBER(pc9801_state::a20_ctrl_w)
uint8_t por;
/* reset POR bit */
// TODO: is there any other way that doesn't involve direct r/w of ppi address?
por = m_ppi_sys->read(space, 2) & ~0x20;
m_ppi_sys->write(space, 2, por);
por = m_ppi_sys->read(2) & ~0x20;
m_ppi_sys->write(2, por);
m_maincpu->set_input_line(INPUT_LINE_A20, CLEAR_LINE);
m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
m_gate_a20 = 0;
@ -1026,12 +1026,12 @@ READ8_MEMBER( pc9801_state::midi_r )
READ8_MEMBER(pc9801_state::pic_r)
{
return ((offset >= 4) ? m_pic2 : m_pic1)->read(space, offset & 3);
return ((offset >= 4) ? m_pic2 : m_pic1)->read(offset & 3);
}
WRITE8_MEMBER(pc9801_state::pic_w)
{
((offset >= 4) ? m_pic2 : m_pic1)->write(space, offset & 3, data);
((offset >= 4) ? m_pic2 : m_pic1)->write(offset & 3, data);
}
READ16_MEMBER(pc9801_state::grcg_gvram_r)

View File

@ -553,17 +553,17 @@ READ8_MEMBER(p1_state::p1_ppi_r)
switch (offset)
{
case 0:
return m_ppi8255n1->read(space, 0);
return m_ppi8255n1->read(0);
case 9:
case 10:
case 11:
return m_ppi8255n1->read(space, offset - 8);
return m_ppi8255n1->read(offset - 8);
case 8:
return m_ppi8255n2->read(space, 0);
return m_ppi8255n2->read(0);
case 1:
case 2:
case 3:
return m_ppi8255n2->read(space, offset);
return m_ppi8255n2->read(offset);
default:
DBG_LOG(1, "p1ppi", ("R %.2x (unimp)\n", 0x60 + offset));
return 0xff;
@ -575,17 +575,17 @@ WRITE8_MEMBER(p1_state::p1_ppi_w)
switch (offset)
{
case 0:
return m_ppi8255n1->write(space, 0, data);
return m_ppi8255n1->write(0, data);
case 9:
case 10:
case 11:
return m_ppi8255n1->write(space, offset - 8, data);
return m_ppi8255n1->write(offset - 8, data);
case 8:
return m_ppi8255n2->write(space, 0, data);
return m_ppi8255n2->write(0, data);
case 1:
case 2:
case 3:
return m_ppi8255n2->write(space, offset, data);
return m_ppi8255n2->write(offset, data);
default:
DBG_LOG(1, "p1ppi", ("W %.2x $%02x (unimp)\n", 0x60 + offset, data));
return;

View File

@ -142,7 +142,7 @@ READ8_MEMBER(qtsbc_state::io_r)
case 2:
case 3:
default:
return m_pit->read(space, offset & 3);
return m_pit->read(offset & 3);
case 4:
case 5:
@ -181,7 +181,7 @@ WRITE8_MEMBER(qtsbc_state::io_w)
case 2:
case 3:
default:
m_pit->write(space, offset & 3, data);
m_pit->write(offset & 3, data);
break;
case 4:

View File

@ -131,15 +131,15 @@ static GFXDECODE_START( gfx_scobra )
GFXDECODE_END
READ8_MEMBER(scobra_state::scobra_type2_ppi8255_0_r){ return m_ppi8255_0->read(space, offset >> 2); }
READ8_MEMBER(scobra_state::scobra_type2_ppi8255_1_r){ return m_ppi8255_1->read(space, offset >> 2); }
WRITE8_MEMBER(scobra_state::scobra_type2_ppi8255_0_w){ m_ppi8255_0->write(space, offset >> 2, data); }
WRITE8_MEMBER(scobra_state::scobra_type2_ppi8255_1_w){ m_ppi8255_1->write(space, offset >> 2, data); }
READ8_MEMBER(scobra_state::scobra_type2_ppi8255_0_r){ return m_ppi8255_0->read(offset >> 2); }
READ8_MEMBER(scobra_state::scobra_type2_ppi8255_1_r){ return m_ppi8255_1->read(offset >> 2); }
WRITE8_MEMBER(scobra_state::scobra_type2_ppi8255_0_w){ m_ppi8255_0->write(offset >> 2, data); }
WRITE8_MEMBER(scobra_state::scobra_type2_ppi8255_1_w){ m_ppi8255_1->write(offset >> 2, data); }
READ8_MEMBER(scobra_state::hustler_ppi8255_0_r){ return m_ppi8255_0->read(space, offset >> 3); }
READ8_MEMBER(scobra_state::hustler_ppi8255_1_r){ return m_ppi8255_1->read(space, offset >> 3); }
WRITE8_MEMBER(scobra_state::hustler_ppi8255_0_w){ m_ppi8255_0->write(space, offset >> 3, data); }
WRITE8_MEMBER(scobra_state::hustler_ppi8255_1_w){ m_ppi8255_1->write(space, offset >> 3, data); }
READ8_MEMBER(scobra_state::hustler_ppi8255_0_r){ return m_ppi8255_0->read(offset >> 3); }
READ8_MEMBER(scobra_state::hustler_ppi8255_1_r){ return m_ppi8255_1->read(offset >> 3); }
WRITE8_MEMBER(scobra_state::hustler_ppi8255_0_w){ m_ppi8255_0->write(offset >> 3, data); }
WRITE8_MEMBER(scobra_state::hustler_ppi8255_1_w){ m_ppi8255_1->write(offset >> 3, data); }
void scobra_state::type1_map(address_map &map)
{

View File

@ -111,22 +111,22 @@ void scramble_state::ckongs_map(address_map &map)
READ8_MEMBER(scramble_state::mars_ppi8255_0_r)
{
return m_ppi8255_0->read(space, ((offset >> 2) & 0x02) | ((offset >> 1) & 0x01));
return m_ppi8255_0->read(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01));
}
READ8_MEMBER(scramble_state::mars_ppi8255_1_r)
{
return m_ppi8255_1->read(space, ((offset >> 2) & 0x02) | ((offset >> 1) & 0x01));
return m_ppi8255_1->read(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01));
}
WRITE8_MEMBER(scramble_state::mars_ppi8255_0_w)
{
m_ppi8255_0->write(space, ((offset >> 2) & 0x02) | ((offset >> 1) & 0x01), data);
m_ppi8255_0->write(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01), data);
}
WRITE8_MEMBER(scramble_state::mars_ppi8255_1_w)
{
m_ppi8255_1->write(space, ((offset >> 2) & 0x02) | ((offset >> 1) & 0x01), data);
m_ppi8255_1->write(((offset >> 2) & 0x02) | ((offset >> 1) & 0x01), data);
}
void scramble_state::mars_map(address_map &map)

View File

@ -167,7 +167,7 @@ READ16_MEMBER( segahang_state::hangon_io_r )
switch (offset & 0x3020/2)
{
case 0x0000/2: // PPI @ 4B
return m_i8255_1->read(space, offset & 3);
return m_i8255_1->read(offset & 3);
case 0x1000/2: // Input ports and DIP switches
{
@ -176,7 +176,7 @@ READ16_MEMBER( segahang_state::hangon_io_r )
}
case 0x3000/2: // PPI @ 4C
return m_i8255_2->read(space, offset & 3);
return m_i8255_2->read(offset & 3);
case 0x3020/2: // ADC0804 data output
return m_adc_ports[m_adc_select].read_safe(0);
@ -203,7 +203,7 @@ WRITE16_MEMBER( segahang_state::hangon_io_w )
return;
case 0x3000/2: // PPI @ 4C
m_i8255_2->write(space, offset & 3, data & 0xff);
m_i8255_2->write(offset & 3, data & 0xff);
return;
case 0x3020/2: // ADC0804
@ -224,7 +224,7 @@ READ16_MEMBER( segahang_state::sharrier_io_r )
switch (offset & 0x0030/2)
{
case 0x0000/2:
return m_i8255_1->read(space, offset & 3);
return m_i8255_1->read(offset & 3);
case 0x0010/2: // Input ports and DIP switches
{
@ -234,7 +234,7 @@ READ16_MEMBER( segahang_state::sharrier_io_r )
case 0x0020/2: // PPI @ 4C
if (offset == 2) return 0;
return m_i8255_2->read(space, offset & 3);
return m_i8255_2->read(offset & 3);
case 0x0030/2: // ADC0804 data output
return m_adc_ports[m_adc_select].read_safe(0);
@ -262,7 +262,7 @@ WRITE16_MEMBER( segahang_state::sharrier_io_w )
return;
case 0x0020/2: // PPI @ 4C
m_i8255_2->write(space, offset & 3, data & 0xff);
m_i8255_2->write(offset & 3, data & 0xff);
return;
case 0x0030/2: // ADC0804
@ -362,7 +362,7 @@ void segahang_state::device_timer(emu_timer &timer, device_timer_id id, int para
// synchronize writes to the 8255 PPI
case TID_PPI_WRITE:
m_i8255_1->write(m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
m_i8255_1->write(param >> 8, param & 0xff);
break;
}
}

View File

@ -642,7 +642,7 @@ READ16_MEMBER( segaorun_state::outrun_custom_io_r )
switch (offset & 0x70/2)
{
case 0x00/2:
return m_i8255->read(space, offset & 3);
return m_i8255->read(offset & 3);
case 0x10/2:
{
@ -678,7 +678,7 @@ WRITE16_MEMBER( segaorun_state::outrun_custom_io_w )
{
case 0x00/2:
if (ACCESSING_BITS_0_7)
m_i8255->write(space, offset & 3, data);
m_i8255->write(offset & 3, data);
return;
case 0x20/2:

View File

@ -247,7 +247,7 @@ READ16_MEMBER( segas16a_state::standard_io_r )
switch (offset & (0x3000/2))
{
case 0x0000/2:
return m_i8255->read(space, offset & 3);
return m_i8255->read(offset & 3);
case 0x1000/2:
{
@ -627,7 +627,7 @@ void segas16a_state::device_timer(emu_timer &timer, device_timer_id id, int para
// synchronize writes to the 8255 PPI
case TID_PPI_WRITE:
m_i8255->write(m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
m_i8255->write(param >> 8, param & 0xff);
break;
}
}

View File

@ -261,7 +261,7 @@ WRITE8_MEMBER( sitcom_timer_state::update_ppi_pa )
WRITE8_MEMBER( sitcom_timer_state::update_ppi_pb )
{
if (!m_dac_cs && !BIT(data, 0))
update_dac(m_ppi->read_pa());
update_dac(m_ppi->pa_r());
m_dac_wr = BIT(data, 0);
m_dac_cs = BIT(data, 1);

View File

@ -647,7 +647,7 @@ WRITE8_MEMBER( spc1500_state::double_w)
if (offset < 0x1800) { pcg_w(space, offset, data); } else
if (offset < 0x1900) { crtc_w(space, offset, data); } else
if (offset < 0x1a00) {} else
if (offset < 0x1b00) { m_pio->write(space, offset, data);} else
if (offset < 0x1b00) { m_pio->write(offset, data); } else
if (offset < 0x1c00) { m_sound->data_w(space, offset, data);} else
if (offset < 0x1d00) { m_sound->address_w(space, offset, data);} else
if (offset < 0x1e00) { romsel(space, offset, data);} else
@ -674,7 +674,7 @@ READ8_MEMBER( spc1500_state::io_r)
if (offset < 0x1800) { return pcg_r(space, offset); } else
if (offset < 0x1900) { return crtc_r(space, offset); } else
if (offset < 0x1a00) { return keyboard_r(space, offset); } else
if (offset < 0x1b00) { return m_pio->read(space, offset); } else
if (offset < 0x1b00) { return m_pio->read(offset); } else
if (offset < 0x1c00) { return m_sound->data_r(space, offset); } else
if (offset < 0x2000) {} else
if (offset < 0x10000){

View File

@ -88,11 +88,11 @@ READ8_MEMBER( tk80bs_state::ppi_custom_r )
switch(offset)
{
case 1:
return m_ppi->read(space, 2);
return m_ppi->read(2);
case 2:
return m_ppi->read(space, 1);
return m_ppi->read(1);
default:
return m_ppi->read(space, offset);
return m_ppi->read(offset);
}
}
@ -101,13 +101,13 @@ WRITE8_MEMBER( tk80bs_state::ppi_custom_w )
switch(offset)
{
case 1:
m_ppi->write(space, 2, data);
m_ppi->write(2, data);
break;
case 2:
m_ppi->write(space, 1, data);
m_ppi->write(1, data);
break;
default:
m_ppi->write(space, offset, data);
m_ppi->write(offset, data);
}
}

View File

@ -469,7 +469,7 @@ READ8_MEMBER(turbo_state::buckrog_port_3_r)
TIMER_CALLBACK_MEMBER(turbo_state::delayed_i8255_w)
{
m_i8255_0->write(m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
m_i8255_0->write(param >> 8, param & 0xff);
}

View File

@ -146,7 +146,7 @@ WRITE8_MEMBER( upscope_state::upscope_cia_1_porta_w )
/* if SEL == 1 && BUSY == 1, we write data to internal registers */
else if ((data & 5) == 5)
{
m_ppi->write(space, m_nvram_address_latch & 0x03, m_parallel_data);
m_ppi->write(m_nvram_address_latch & 0x03, m_parallel_data);
}
/* if SEL == 0 && BUSY == 1, we write data to NVRAM */
@ -170,7 +170,7 @@ WRITE8_MEMBER( upscope_state::upscope_cia_1_porta_w )
if (data & 4)
{
if (LOG_IO) logerror("Internal register (%d) read\n", m_nvram_address_latch);
m_nvram_data_latch = m_ppi->read(space, m_nvram_address_latch & 0x03);
m_nvram_data_latch = m_ppi->read(m_nvram_address_latch & 0x03);
}
/* if SEL == 0, we read NVRAM */

View File

@ -44,10 +44,10 @@ void vector06_state::vector06_io(address_map &map)
{
map.global_mask(0xff);
map.unmap_value_high();
;
map(0x00, 0x03).lrw8("ppi8255_rw", [this](address_space &space, offs_t offset, u8 mem_mask) -> u8 { return m_ppi8255->read(space, offset^3, mem_mask); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_ppi8255->write(space, offset^3, data, mem_mask); });
map(0x04, 0x07).lrw8("ppi8255_2_rw", [this](address_space &space, offs_t offset, u8 mem_mask) -> u8 { return m_ppi8255_2->read(space, offset^3, mem_mask); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_ppi8255_2->write(space, offset^3, data, mem_mask); });
map(0x08, 0x0b).lrw8("pit8253_rw", [this](address_space &space, offs_t offset, u8 mem_mask) -> u8 { return m_pit8253->read(space, offset^3, mem_mask); }, [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) { m_pit8253->write(space, offset^3, data, mem_mask); });
map(0x00, 0x03).lrw8("ppi8255_rw", [this](offs_t offset) -> u8 { return m_ppi8255->read(offset^3); }, [this](offs_t offset, u8 data) { m_ppi8255->write(offset^3, data); });
map(0x04, 0x07).lrw8("ppi8255_2_rw", [this](offs_t offset) -> u8 { return m_ppi8255_2->read(offset^3); }, [this](offs_t offset, u8 data) { m_ppi8255_2->write(offset^3, data); });
map(0x08, 0x0b).lrw8("pit8253_rw", [this](offs_t offset) -> u8 { return m_pit8253->read(offset^3); }, [this](offs_t offset, u8 data) { m_pit8253->write(offset^3, data); });
map(0x0c, 0x0c).w(FUNC(vector06_state::vector06_color_set));
map(0x10, 0x10).w(FUNC(vector06_state::vector06_ramdisk_w));
map(0x14, 0x15).rw(m_ay, FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_address_w));

View File

@ -184,7 +184,7 @@ WRITE8_MEMBER(vega_state::extern_w)
case 0: /* 00-03 */
{
/* PPI 8255 /CS */
m_i8255->write(space, (m_p2_data>>6)&3, data);
m_i8255->write((m_p2_data>>6)&3, data);
}
break;
@ -313,7 +313,7 @@ READ8_MEMBER(vega_state::extern_r)
{
case 0: /* PPI 8255 /CS */
{
return m_i8255->read( space, m_p2_data>>6); /* A6,A7 -> A0,A1 */
return m_i8255->read(m_p2_data>>6); /* A6,A7 -> A0,A1 */
}
case 1: /* 04-07 */

View File

@ -831,12 +831,12 @@ READ16_MEMBER(x68k_state::sysport_r)
WRITE16_MEMBER(x68k_state::ppi_w)
{
m_ppi->write(space,offset & 0x03,data);
m_ppi->write(offset & 0x03,data);
}
READ16_MEMBER(x68k_state::ppi_r)
{
return m_ppi->read(space,offset & 0x03);
return m_ppi->read(offset & 0x03);
}

View File

@ -1923,7 +1923,7 @@ b9 b8 | PPI Function Read/Write status
if ((offset & (1<<11)) == 0)
{
if (r1r0 < 0x03 )
data = m_ppi->read(space, r1r0);
data = m_ppi->read(r1r0);
if ( m_system_type == SYSTEM_PLUS || m_system_type == SYSTEM_GX4000 ) // Plus systems return the data written to port C (I/O status is ignored)
if(r1r0 == 0x02)
data = m_last_write;
@ -2128,7 +2128,7 @@ WRITE8_MEMBER(amstrad_state::amstrad_cpc_io_w)
{
unsigned int idx = ((offset & 0x0300) >> 8);
m_ppi->write(space, idx, data);
m_ppi->write(idx, data);
if(idx == 0x02)
m_last_write = data;
}
@ -2311,11 +2311,11 @@ void amstrad_state::amstrad_handle_snapshot(unsigned char *pSnapshot)
m_gate_array.upper_bank = pSnapshot[0x055];
/* PPI */
m_ppi->write(space, 3, pSnapshot[0x059] & 0x0ff);
m_ppi->write(3, pSnapshot[0x059] & 0x0ff);
m_ppi->write(space, 0, pSnapshot[0x056] & 0x0ff);
m_ppi->write(space, 1, pSnapshot[0x057] & 0x0ff);
m_ppi->write(space, 2, pSnapshot[0x058] & 0x0ff);
m_ppi->write(0, pSnapshot[0x056] & 0x0ff);
m_ppi->write(1, pSnapshot[0x057] & 0x0ff);
m_ppi->write(2, pSnapshot[0x058] & 0x0ff);
/* PSG */
for (i=0; i<16; i++)

View File

@ -190,12 +190,12 @@ WRITE8_MEMBER(dai_state::dai_io_discrete_devices_w)
READ8_MEMBER(dai_state::dai_pit_r)
{
return m_pit->read(space, (offset >> 1) & 3);
return m_pit->read((offset >> 1) & 3);
}
WRITE8_MEMBER(dai_state::dai_pit_w)
{
m_pit->write(space, (offset >> 1) & 3, data);
m_pit->write((offset >> 1) & 3, data);
}
/***************************************************************************

View File

@ -260,7 +260,7 @@ READ32_MEMBER( ioc2_device::read )
case TIMER_COUNT1_REG:
case TIMER_COUNT2_REG:
case TIMER_CONTROL_REG:
return m_pit->read(space, offset - TIMER_COUNT0_REG);
return m_pit->read(offset - TIMER_COUNT0_REG);
}
return 0;
@ -386,7 +386,7 @@ WRITE32_MEMBER( ioc2_device::write )
case TIMER_COUNT1_REG:
case TIMER_COUNT2_REG:
case TIMER_CONTROL_REG:
m_pit->write(space, offset - TIMER_COUNT0_REG, data & 0xff);
m_pit->write(offset - TIMER_COUNT0_REG, data & 0xff);
return;
}
}

View File

@ -136,7 +136,7 @@ READ8_MEMBER(lviv_state::io_r)
{
case 0:
case 1:
return m_ppi[switch_val]->read(space, offset & 3);
return m_ppi[switch_val]->read(offset & 3);
case 2:
case 3:
@ -173,7 +173,7 @@ WRITE8_MEMBER(lviv_state::io_w)
{
case 0:
case 1:
m_ppi[switch_val]->write(space, offset & 3, data);
m_ppi[switch_val]->write(offset & 3, data);
break;
case 2:

View File

@ -42,12 +42,12 @@ static int instruction_hook(device_t &device, offs_t curpc);
READ8_MEMBER( mbc55x_state::ppi8255_r )
{
return m_ppi->read(space, offset>>1);
return m_ppi->read(offset>>1);
}
WRITE8_MEMBER( mbc55x_state::ppi8255_w )
{
m_ppi->write(space, offset>>1, data);
m_ppi->write(offset>>1, data);
}
READ8_MEMBER( mbc55x_state::mbc55x_ppi_porta_r )
@ -109,22 +109,22 @@ WRITE8_MEMBER( mbc55x_state::mbc55x_usart_w )
READ8_MEMBER(mbc55x_state::mbcpic8259_r)
{
return m_pic->read(space, offset>>1);
return m_pic->read(offset>>1);
}
WRITE8_MEMBER(mbc55x_state::mbcpic8259_w)
{
m_pic->write(space, offset>>1, data);
m_pic->write(offset>>1, data);
}
READ8_MEMBER(mbc55x_state::mbcpit8253_r)
{
return m_pit->read(space, offset >> 1);
return m_pit->read(offset >> 1);
}
WRITE8_MEMBER(mbc55x_state::mbcpit8253_w)
{
m_pit->write(space, offset >> 1, data);
m_pit->write(offset >> 1, data);
}
WRITE_LINE_MEMBER( mbc55x_state::pit8253_t2 )

View File

@ -80,12 +80,12 @@ void mikro80_state::machine_reset()
READ8_MEMBER(mikro80_state::mikro80_keyboard_r)
{
return m_ppi8255->read(space, offset^0x03);
return m_ppi8255->read(offset^0x03);
}
WRITE8_MEMBER(mikro80_state::mikro80_keyboard_w)
{
m_ppi8255->write(space, offset^0x03, data);
m_ppi8255->write(offset^0x03, data);
}

View File

@ -49,22 +49,22 @@ void orion_state::machine_start()
READ8_MEMBER(orion_state::orion128_system_r)
{
return m_ppi8255_2->read(space, offset & 3);
return m_ppi8255_2->read(offset & 3);
}
WRITE8_MEMBER(orion_state::orion128_system_w)
{
m_ppi8255_2->write(space, offset & 3, data);
m_ppi8255_2->write(offset & 3, data);
}
READ8_MEMBER(orion_state::orion128_romdisk_r)
{
return m_ppi8255_1->read(space, offset & 3);
return m_ppi8255_1->read(offset & 3);
}
WRITE8_MEMBER(orion_state::orion128_romdisk_w)
{
m_ppi8255_1->write(space, offset & 3, data);
m_ppi8255_1->write(offset & 3, data);
}
void orion_state::orion_set_video_mode(int width)

View File

@ -149,14 +149,14 @@ READ8_MEMBER(pk8020_state::devices_r)
{
switch(offset & 0x38)
{
case 0x00: return m_pit8253->read(space, offset & 3);
case 0x08: return m_ppi8255_3->read(space,offset & 3);
case 0x00: return m_pit8253->read(offset & 3);
case 0x08: return m_ppi8255_3->read(offset & 3);
case 0x10: return m_rs232->read(offset & 1);
case 0x18: return m_wd1793->read(offset & 0x03);
case 0x20: return m_lan->read(offset & 1);
case 0x28: return m_pic8259->read(space, offset & 1);
case 0x30: return m_ppi8255_2->read(space,offset & 3);
case 0x38: return m_ppi8255_1->read(space,offset & 3);
case 0x28: return m_pic8259->read(offset & 1);
case 0x30: return m_ppi8255_2->read(offset & 3);
case 0x38: return m_ppi8255_1->read(offset & 3);
}
return 0xff;
}
@ -165,14 +165,14 @@ WRITE8_MEMBER(pk8020_state::devices_w)
{
switch(offset & 0x38)
{
case 0x00: m_pit8253->write(space, offset & 3, data); break;
case 0x08: m_ppi8255_3->write(space,offset & 3,data); break;
case 0x00: m_pit8253->write(offset & 3, data); break;
case 0x08: m_ppi8255_3->write(offset & 3,data); break;
case 0x10: m_rs232->write(offset & 1, data); break;
case 0x18: m_wd1793->write(offset & 0x03, data); break;
case 0x20: m_lan->write(offset & 1, data); break;
case 0x28: m_pic8259->write(space, offset & 1,data);break;
case 0x30: m_ppi8255_2->write(space,offset & 3,data); break;
case 0x38: m_ppi8255_1->write(space,offset & 3,data); break;
case 0x28: m_pic8259->write(offset & 1,data);break;
case 0x30: m_ppi8255_2->write(offset & 3,data); break;
case 0x38: m_ppi8255_1->write(offset & 3,data); break;
}
}

View File

@ -469,7 +469,7 @@ READ8_MEMBER(pmd85_state::pmd85_io_r)
switch (offset & 0x80)
{
case 0x80: /* Motherboard 8255 */
return m_ppi8255_0->read(space, offset & 0x03);
return m_ppi8255_0->read(offset & 0x03);
}
break;
case 0x08: /* ROM module connector */
@ -485,7 +485,7 @@ READ8_MEMBER(pmd85_state::pmd85_io_r)
switch (offset & 0x80)
{
case 0x80: /* ROM module 8255 */
return m_ppi8255_3->read(space, offset & 0x03);
return m_ppi8255_3->read(offset & 0x03);
}
}
break;
@ -500,11 +500,11 @@ READ8_MEMBER(pmd85_state::pmd85_io_r)
case 0x10: /* 8251 (casette recorder, V24) */
return m_uart->read(offset & 0x01);
case 0x40: /* 8255 (GPIO/0, GPIO/1) */
return m_ppi8255_1->read(space, offset & 0x03);
return m_ppi8255_1->read(offset & 0x03);
case 0x50: /* 8253 */
return m_pit8253->read(space, offset & 0x03);
return m_pit8253->read(offset & 0x03);
case 0x70: /* 8255 (IMS-2) */
return m_ppi8255_2->read(space, offset & 0x03);
return m_ppi8255_2->read(offset & 0x03);
}
break;
case 0x80: /* external interfaces */
@ -531,7 +531,7 @@ WRITE8_MEMBER(pmd85_state::pmd85_io_w)
switch (offset & 0x80)
{
case 0x80: /* Motherboard 8255 */
m_ppi8255_0->write(space, offset & 0x03, data);
m_ppi8255_0->write(offset & 0x03, data);
/* PMD-85.3 memory banking */
if ((offset & 0x03) == 0x03)
{
@ -554,7 +554,7 @@ WRITE8_MEMBER(pmd85_state::pmd85_io_w)
switch (offset & 0x80)
{
case 0x80: /* ROM module 8255 */
m_ppi8255_3->write(space, offset & 0x03, data);
m_ppi8255_3->write(offset & 0x03, data);
break;
}
}
@ -571,14 +571,14 @@ WRITE8_MEMBER(pmd85_state::pmd85_io_w)
m_uart->write(offset & 0x01, data);
break;
case 0x40: /* 8255 (GPIO/0, GPIO/0) */
m_ppi8255_1->write(space, offset & 0x03, data);
m_ppi8255_1->write(offset & 0x03, data);
break;
case 0x50: /* 8253 */
m_pit8253->write(space, offset & 0x03, data);
m_pit8253->write(offset & 0x03, data);
logerror ("8253 writing. Address: %02x, Data: %02x\n", offset, data);
break;
case 0x70: /* 8255 (IMS-2) */
m_ppi8255_2->write(space, offset & 0x03, data);
m_ppi8255_2->write(offset & 0x03, data);
break;
}
break;
@ -612,7 +612,7 @@ READ8_MEMBER(pmd85_state::mato_io_r)
switch (offset & 0x80)
{
case 0x80: /* Motherboard 8255 */
return m_ppi8255_0->read(space, offset & 0x03);
return m_ppi8255_0->read(offset & 0x03);
}
break;
}
@ -635,7 +635,7 @@ WRITE8_MEMBER(pmd85_state::mato_io_w)
switch (offset & 0x80)
{
case 0x80: /* Motherboard 8255 */
return m_ppi8255_0->write(space, offset & 0x03, data);
return m_ppi8255_0->write(offset & 0x03, data);
}
break;
}

View File

@ -93,9 +93,9 @@ READ8_MEMBER(scramble_state::cavelon_banksw_r )
cavelon_banksw();
if ((offset >= 0x0100) && (offset <= 0x0103))
return m_ppi8255_0->read(space, offset - 0x0100);
return m_ppi8255_0->read(offset - 0x0100);
else if ((offset >= 0x0200) && (offset <= 0x0203))
return m_ppi8255_1->read(space, offset - 0x0200);
return m_ppi8255_1->read(offset - 0x0200);
return 0xff;
}
@ -105,9 +105,9 @@ WRITE8_MEMBER(scramble_state::cavelon_banksw_w )
cavelon_banksw();
if ((offset >= 0x0100) && (offset <= 0x0103))
m_ppi8255_0->write(space, offset - 0x0100, data);
m_ppi8255_0->write(offset - 0x0100, data);
else if ((offset >= 0x0200) && (offset <= 0x0203))
m_ppi8255_1->write(space, offset - 0x0200, data);
m_ppi8255_1->write(offset - 0x0200, data);
}

View File

@ -323,7 +323,7 @@ void special_state::erik_set_bank()
m_bank4->set_base(mem + 0x1c000);
space.unmap_write(0xf000, 0xf7ff);
space.nop_read(0xf000, 0xf7ff);
space.install_readwrite_handler(0xf800, 0xf803, 0, 0x7fc, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi));
space.install_readwrite_handler(0xf800, 0xf803, 0, 0x7fc, 0, read8sm_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi), write8sm_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi));
break;
}
}

View File

@ -97,13 +97,13 @@ MACHINE_RESET_MEMBER(ut88_state,ut88)
READ8_MEMBER( ut88_state::ut88_keyboard_r )
{
return m_ppi->read(space, offset^0x03);
return m_ppi->read(offset^0x03);
}
WRITE8_MEMBER( ut88_state::ut88_keyboard_w )
{
m_ppi->write(space, offset^0x03, data);
m_ppi->write(offset^0x03, data);
}
WRITE8_MEMBER( ut88_state::ut88_sound_w )

View File

@ -35,7 +35,7 @@ void igs017_igs031_device::map(address_map &map)
READ8_MEMBER(igs017_igs031_device::i8255_r)
{
if (m_i8255)
return m_i8255->read(space, offset);
return m_i8255->read(offset);
logerror("igs017_igs031_device::i8255_r(%02x) with no 8255 device\n", offset);
return 0;