diff options
author | 2012-12-24 21:11:07 +0000 | |
---|---|---|
committer | 2012-12-24 21:11:07 +0000 | |
commit | e9352ef19a3aa960220312b9629f1a7d89760fa5 (patch) | |
tree | 5db6df6e8178e52db5258b125109ec2807b7fc8d /src/mess/machine/mac.c | |
parent | 4e3e4bec1004001b1df50fcec26bfe3c4975975d (diff) |
Better devicification of the Apple II FDC/IWM/SWIM
Diffstat (limited to 'src/mess/machine/mac.c')
-rw-r--r-- | src/mess/machine/mac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mess/machine/mac.c b/src/mess/machine/mac.c index 529d93c8532..d3150daf7ba 100644 --- a/src/mess/machine/mac.c +++ b/src/mess/machine/mac.c @@ -1140,9 +1140,9 @@ READ16_MEMBER ( mac_state::mac_iwm_r ) */ UINT16 result = 0; - device_t *fdc = space.machine().device("fdc"); + applefdc_base_device *fdc = space.machine().device<applefdc_base_device>("fdc"); - result = applefdc_r(fdc, space, (offset >> 8)); + result = fdc->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()); @@ -1152,15 +1152,15 @@ READ16_MEMBER ( mac_state::mac_iwm_r ) WRITE16_MEMBER ( mac_state::mac_iwm_w ) { - device_t *fdc = space.machine().device("fdc"); + applefdc_base_device *fdc = space.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) - applefdc_w(fdc, space, (offset >> 8), data & 0xff); + fdc->write((offset >> 8), data & 0xff); else - applefdc_w(fdc, space, (offset >> 8), data>>8); + fdc->write((offset >> 8), data>>8); } READ8_MEMBER(mac_state::mac_adb_via_in_cb2) |