mac128: remove runtime tag lookups (nw)

This commit is contained in:
arbee 2018-06-02 10:42:47 -04:00
parent b33e3db5c7
commit 3f6a0335ca

View File

@ -147,6 +147,7 @@ public:
m_via(*this, "via6522_0"),
m_ram(*this, RAM_TAG),
m_ncr5380(*this, "ncr5380"),
m_iwm(*this, "fdc"),
m_mackbd(*this, MACKBD_TAG),
m_rtc(*this,"rtc"),
m_mouse0(*this, "MOUSE0"),
@ -163,6 +164,7 @@ public:
required_device<via6522_device> m_via;
required_device<ram_device> m_ram;
optional_device<ncr5380_device> m_ncr5380;
required_device<applefdc_base_device> m_iwm;
optional_device<mackbd_device> m_mackbd;
optional_device<rtc3430042_device> m_rtc;
@ -634,9 +636,8 @@ READ16_MEMBER ( mac128_state::mac_iwm_r )
*/
uint16_t result = 0;
applefdc_base_device *fdc = machine().device<applefdc_base_device>("fdc");
result = fdc->read(offset >> 8);
result = m_iwm->read(offset >> 8);
if (LOG_MAC_IWM)
printf("mac_iwm_r: offset=0x%08x mem_mask %04x = %02x (PC %x)\n", offset, mem_mask, result, m_maincpu->pc());
@ -646,15 +647,13 @@ READ16_MEMBER ( mac128_state::mac_iwm_r )
WRITE16_MEMBER ( mac128_state::mac_iwm_w )
{
applefdc_base_device *fdc = machine().device<applefdc_base_device>("fdc");
if (LOG_MAC_IWM)
printf("mac_iwm_w: offset=0x%08x data=0x%04x mask %04x (PC=%x)\n", offset, data, mem_mask, m_maincpu->pc());
if (ACCESSING_BITS_0_7)
fdc->write((offset >> 8), data & 0xff);
m_iwm->write((offset >> 8), data & 0xff);
else
fdc->write((offset >> 8), data>>8);
m_iwm->write((offset >> 8), data>>8);
}
WRITE_LINE_MEMBER(mac128_state::mac_via_irq)
@ -744,12 +743,11 @@ READ8_MEMBER(mac128_state::mac_via_in_b)
WRITE8_MEMBER(mac128_state::mac_via_out_a)
{
device_t *fdc = machine().device("fdc");
// printf("%s VIA1 OUT A: %02x (PC %x)\n", machine().describe_context().c_str(), data);
//set_scc_waitrequest((data & 0x80) >> 7);
m_screen_buffer = (data & 0x40) >> 6;
sony_set_sel_line(fdc,(data & 0x20) >> 5);
sony_set_sel_line(m_iwm, (data & 0x20) >> 5);
m_main_buffer = ((data & 0x08) == 0x08) ? true : false;
m_snd_vol = data & 0x07;