summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/i82371sb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/i82371sb.cpp')
-rw-r--r--src/devices/machine/i82371sb.cpp124
1 files changed, 62 insertions, 62 deletions
diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp
index d8feaeb05c1..9140b0d4216 100644
--- a/src/devices/machine/i82371sb.cpp
+++ b/src/devices/machine/i82371sb.cpp
@@ -189,71 +189,71 @@ void i82371sb_isa_device::reset_all_mappings()
pci_device::reset_all_mappings();
}
-WRITE8_MEMBER (i82371sb_isa_device::boot_state_w)
+void i82371sb_isa_device::boot_state_w(uint8_t data)
{
m_boot_state_hook((offs_t)0, data);
}
-WRITE8_MEMBER (i82371sb_isa_device::nop_w)
+void i82371sb_isa_device::nop_w(uint8_t data)
{
}
-READ8_MEMBER (i82371sb_isa_device::iort_r)
+uint8_t i82371sb_isa_device::iort_r()
{
return iort;
}
-WRITE8_MEMBER(i82371sb_isa_device::iort_w)
+void i82371sb_isa_device::iort_w(uint8_t data)
{
iort = data;
logerror("iort = %02x\n", iort);
}
-READ16_MEMBER (i82371sb_isa_device::xbcs_r)
+uint16_t i82371sb_isa_device::xbcs_r()
{
return xbcs;
}
-WRITE16_MEMBER(i82371sb_isa_device::xbcs_w)
+void i82371sb_isa_device::xbcs_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&xbcs);
logerror("xbcs = %04x\n", xbcs);
}
-READ8_MEMBER (i82371sb_isa_device::pirqrc_r)
+uint8_t i82371sb_isa_device::pirqrc_r(offs_t offset)
{
return pirqrc[offset];
}
-WRITE8_MEMBER(i82371sb_isa_device::pirqrc_w)
+void i82371sb_isa_device::pirqrc_w(offs_t offset, uint8_t data)
{
pirqrc[offset] = data;
logerror("pirqrc[%d] = %02x\n", offset, pirqrc[offset]);
}
-READ8_MEMBER (i82371sb_isa_device::tom_r)
+uint8_t i82371sb_isa_device::tom_r()
{
return tom;
}
-WRITE8_MEMBER(i82371sb_isa_device::tom_w)
+void i82371sb_isa_device::tom_w(uint8_t data)
{
tom = data;
logerror("tom = %02x\n", tom);
}
-READ16_MEMBER (i82371sb_isa_device::mstat_r)
+uint16_t i82371sb_isa_device::mstat_r()
{
return mstat;
}
-WRITE16_MEMBER(i82371sb_isa_device::mstat_w)
+void i82371sb_isa_device::mstat_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&mstat);
logerror("mstat = %04x\n", mstat);
}
-READ8_MEMBER (i82371sb_isa_device::mbirq01_r)
+uint8_t i82371sb_isa_device::mbirq01_r(offs_t offset)
{
if (offset == 0)
return mbirq0;
@@ -261,7 +261,7 @@ READ8_MEMBER (i82371sb_isa_device::mbirq01_r)
return mbirq1;
}
-WRITE8_MEMBER(i82371sb_isa_device::mbirq01_w)
+void i82371sb_isa_device::mbirq01_w(offs_t offset, uint8_t data)
{
if (offset == 0)
{
@@ -275,114 +275,114 @@ WRITE8_MEMBER(i82371sb_isa_device::mbirq01_w)
}
}
-READ8_MEMBER (i82371sb_isa_device::mbdma_r)
+uint8_t i82371sb_isa_device::mbdma_r(offs_t offset)
{
return mbdma[offset];
}
-WRITE8_MEMBER(i82371sb_isa_device::mbdma_w)
+void i82371sb_isa_device::mbdma_w(offs_t offset, uint8_t data)
{
mbdma[offset] = data;
logerror("mbdma[%d] = %02x\n", offset, mbdma);
}
-READ8_MEMBER (i82371sb_isa_device::apicbase_r)
+uint8_t i82371sb_isa_device::apicbase_r()
{
return apicbase;
}
-WRITE8_MEMBER(i82371sb_isa_device::apicbase_w)
+void i82371sb_isa_device::apicbase_w(uint8_t data)
{
apicbase = data;
logerror("apicbase = %02x\n", apicbase);
}
-READ8_MEMBER (i82371sb_isa_device::dlc_r)
+uint8_t i82371sb_isa_device::dlc_r()
{
return dlc;
}
-WRITE8_MEMBER(i82371sb_isa_device::dlc_w)
+void i82371sb_isa_device::dlc_w(uint8_t data)
{
dlc = data;
logerror("dlc = %02x\n", dlc);
}
-READ8_MEMBER (i82371sb_isa_device::smicntl_r)
+uint8_t i82371sb_isa_device::smicntl_r()
{
return smicntl;
}
-WRITE8_MEMBER(i82371sb_isa_device::smicntl_w)
+void i82371sb_isa_device::smicntl_w(uint8_t data)
{
smicntl = data;
update_smireq_line();
logerror("smicntl = %02x\n", smicntl);
}
-READ16_MEMBER (i82371sb_isa_device::smien_r)
+uint16_t i82371sb_isa_device::smien_r()
{
return smien;
}
-WRITE16_MEMBER(i82371sb_isa_device::smien_w)
+void i82371sb_isa_device::smien_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&smien);
update_smireq_line();
logerror("smien = %04x\n", smien);
}
-READ32_MEMBER (i82371sb_isa_device::see_r)
+uint32_t i82371sb_isa_device::see_r()
{
return see;
}
-WRITE32_MEMBER(i82371sb_isa_device::see_w)
+void i82371sb_isa_device::see_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
COMBINE_DATA(&see);
logerror("see = %08x\n", see);
}
-READ8_MEMBER (i82371sb_isa_device::ftmr_r)
+uint8_t i82371sb_isa_device::ftmr_r()
{
return ftmr;
}
-WRITE8_MEMBER(i82371sb_isa_device::ftmr_w)
+void i82371sb_isa_device::ftmr_w(uint8_t data)
{
ftmr = data;
logerror("ftmr = %02x\n", ftmr);
}
-READ16_MEMBER (i82371sb_isa_device::smireq_r)
+uint16_t i82371sb_isa_device::smireq_r()
{
return smireq;
}
-WRITE16_MEMBER(i82371sb_isa_device::smireq_w)
+void i82371sb_isa_device::smireq_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&smireq);
update_smireq_line();
logerror("smireq = %04x\n", smireq);
}
-READ8_MEMBER (i82371sb_isa_device::ctltmr_r)
+uint8_t i82371sb_isa_device::ctltmr_r()
{
return ctlmtr;
}
-WRITE8_MEMBER(i82371sb_isa_device::ctltmr_w)
+void i82371sb_isa_device::ctltmr_w(uint8_t data)
{
ctlmtr = data;
logerror("ctlmtr = %02x\n", ctlmtr);
}
-READ8_MEMBER (i82371sb_isa_device::cthtmr_r)
+uint8_t i82371sb_isa_device::cthtmr_r()
{
return cthmtr;
}
-WRITE8_MEMBER(i82371sb_isa_device::cthtmr_w)
+void i82371sb_isa_device::cthtmr_w(uint8_t data)
{
cthmtr = data;
logerror("cthmtr = %02x\n", cthmtr);
@@ -526,7 +526,7 @@ WRITE_LINE_MEMBER( i82371sb_isa_device::at_pit8254_out2_changed )
m_speaker->level_w(m_at_spkrdata & m_pit_out2);
}
-READ8_MEMBER( i82371sb_isa_device::at_page8_r )
+uint8_t i82371sb_isa_device::at_page8_r(offs_t offset)
{
uint8_t data = m_at_pages[offset % 0x10];
@@ -549,7 +549,7 @@ READ8_MEMBER( i82371sb_isa_device::at_page8_r )
}
-WRITE8_MEMBER( i82371sb_isa_device::at_page8_w )
+void i82371sb_isa_device::at_page8_w(offs_t offset, uint8_t data)
{
m_at_pages[offset % 0x10] = data;
@@ -801,7 +801,7 @@ WRITE_LINE_MEMBER( i82371sb_isa_device::pc_irq14_w ) { m_pic8259_slave->ir6_w(s
WRITE_LINE_MEMBER( i82371sb_isa_device::pc_irq15_w ) { m_pic8259_slave->ir7_w(state); }
-READ8_MEMBER( i82371sb_isa_device::at_portb_r )
+uint8_t i82371sb_isa_device::at_portb_r()
{
uint8_t data = m_at_speaker;
@@ -816,7 +816,7 @@ READ8_MEMBER( i82371sb_isa_device::at_portb_r )
return data;
}
-WRITE8_MEMBER( i82371sb_isa_device::at_portb_w )
+void i82371sb_isa_device::at_portb_w(uint8_t data)
{
m_at_speaker = data;
m_pit8254->write_gate2(BIT(data, 0));
@@ -832,17 +832,17 @@ WRITE_LINE_MEMBER( i82371sb_isa_device::iochck_w )
m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
}
-READ8_MEMBER( i82371sb_isa_device::at_dma8237_2_r )
+uint8_t i82371sb_isa_device::at_dma8237_2_r(offs_t offset)
{
return m_dma8237_2->read(offset / 2);
}
-WRITE8_MEMBER( i82371sb_isa_device::at_dma8237_2_w )
+void i82371sb_isa_device::at_dma8237_2_w(offs_t offset, uint8_t data)
{
m_dma8237_2->write(offset / 2, data);
}
-READ8_MEMBER(i82371sb_isa_device::eisa_irq_read)
+uint8_t i82371sb_isa_device::eisa_irq_read(offs_t offset)
{
if (offset == 0)
return m_eisa_irq_mode & 0xff;
@@ -850,7 +850,7 @@ READ8_MEMBER(i82371sb_isa_device::eisa_irq_read)
return m_eisa_irq_mode >> 8;
}
-WRITE8_MEMBER(i82371sb_isa_device::eisa_irq_write)
+void i82371sb_isa_device::eisa_irq_write(offs_t offset, uint8_t data)
{
if (offset == 0)
m_eisa_irq_mode = (m_eisa_irq_mode & 0xff00) | data;
@@ -859,7 +859,7 @@ WRITE8_MEMBER(i82371sb_isa_device::eisa_irq_write)
// TODO: update m_pic8259_master and m_pic8259_slave with the new configuration
}
-READ8_MEMBER( i82371sb_isa_device::read_apmcapms )
+uint8_t i82371sb_isa_device::read_apmcapms(offs_t offset)
{
if (offset == 0)
return apmc;
@@ -867,7 +867,7 @@ READ8_MEMBER( i82371sb_isa_device::read_apmcapms )
return apms;
}
-WRITE8_MEMBER( i82371sb_isa_device::write_apmcapms )
+void i82371sb_isa_device::write_apmcapms(offs_t offset, uint8_t data)
{
if (offset == 0)
{
@@ -976,12 +976,12 @@ WRITE_LINE_MEMBER(i82371sb_ide_device::secondary_int)
m_irq_sec_callback(state);
}
-READ16_MEMBER(i82371sb_ide_device::command_r)
+uint16_t i82371sb_ide_device::command_r()
{
return command;
}
-WRITE16_MEMBER(i82371sb_ide_device::command_w)
+void i82371sb_ide_device::command_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
mem_mask &= 5;
COMBINE_DATA(&command);
@@ -989,12 +989,12 @@ WRITE16_MEMBER(i82371sb_ide_device::command_w)
remap_cb();
}
-READ32_MEMBER(i82371sb_ide_device::bmiba_r)
+uint32_t i82371sb_ide_device::bmiba_r()
{
return bmiba;
}
-WRITE32_MEMBER(i82371sb_ide_device::bmiba_w)
+void i82371sb_ide_device::bmiba_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
mem_mask &= 0xfff0;
COMBINE_DATA(&bmiba);
@@ -1002,83 +1002,83 @@ WRITE32_MEMBER(i82371sb_ide_device::bmiba_w)
remap_cb();
}
-READ16_MEMBER(i82371sb_ide_device::idetim_primary_r)
+uint16_t i82371sb_ide_device::idetim_primary_r()
{
return idetim_primary;
}
-WRITE16_MEMBER(i82371sb_ide_device::idetim_primary_w)
+void i82371sb_ide_device::idetim_primary_w(uint16_t data)
{
}
-READ16_MEMBER(i82371sb_ide_device::idetim_secondary_r)
+uint16_t i82371sb_ide_device::idetim_secondary_r()
{
return idetim_secondary;
}
-WRITE16_MEMBER(i82371sb_ide_device::idetim_secondary_w)
+void i82371sb_ide_device::idetim_secondary_w(uint16_t data)
{
}
-READ8_MEMBER(i82371sb_ide_device::sidetim_r)
+uint8_t i82371sb_ide_device::sidetim_r()
{
return sidetim;
}
-WRITE8_MEMBER(i82371sb_ide_device::sidetim_w)
+void i82371sb_ide_device::sidetim_w(uint8_t data)
{
}
-READ32_MEMBER(i82371sb_ide_device::ide1_read32_cs0_r)
+uint32_t i82371sb_ide_device::ide1_read32_cs0_r(offs_t offset, uint32_t mem_mask)
{
if (!(command & 1))
return 0xffffffff;
return m_ide1->read_cs0(offset, mem_mask);
}
-WRITE32_MEMBER(i82371sb_ide_device::ide1_write32_cs0_w)
+void i82371sb_ide_device::ide1_write32_cs0_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (!(command & 1))
return;
m_ide1->write_cs0(offset, data, mem_mask);
}
-READ32_MEMBER(i82371sb_ide_device::ide2_read32_cs0_r)
+uint32_t i82371sb_ide_device::ide2_read32_cs0_r(offs_t offset, uint32_t mem_mask)
{
if (!(command & 1))
return 0xffffffff;
return m_ide2->read_cs0(offset, mem_mask);
}
-WRITE32_MEMBER(i82371sb_ide_device::ide2_write32_cs0_w)
+void i82371sb_ide_device::ide2_write32_cs0_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (!(command & 1))
return;
m_ide2->write_cs0(offset, data, mem_mask);
}
-READ8_MEMBER(i82371sb_ide_device::ide1_read_cs1_r)
+uint8_t i82371sb_ide_device::ide1_read_cs1_r()
{
if (!(command & 1))
return 0xff;
return m_ide1->read_cs1(1, 0xff0000) >> 16;
}
-WRITE8_MEMBER(i82371sb_ide_device::ide1_write_cs1_w)
+void i82371sb_ide_device::ide1_write_cs1_w(uint8_t data)
{
if (!(command & 1))
return;
m_ide1->write_cs1(1, data << 16, 0xff0000);
}
-READ8_MEMBER(i82371sb_ide_device::ide2_read_cs1_r)
+uint8_t i82371sb_ide_device::ide2_read_cs1_r()
{
if (!(command & 1))
return 0xff;
return m_ide2->read_cs1(1, 0xff0000) >> 16;
}
-WRITE8_MEMBER(i82371sb_ide_device::ide2_write_cs1_w)
+void i82371sb_ide_device::ide2_write_cs1_w(uint8_t data)
{
if (!(command & 1))
return;