From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- src/devices/bus/nes/disksys.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/devices/bus/nes/disksys.cpp') diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp index 71101492822..0f350fb7922 100644 --- a/src/devices/bus/nes/disksys.cpp +++ b/src/devices/bus/nes/disksys.cpp @@ -51,10 +51,9 @@ static const floppy_interface nes_floppy_interface = // device_add_mconfig - add device configuration //------------------------------------------------- -void nes_disksys_device::device_add_mconfig(machine_config &config) -{ - LEGACY_FLOPPY(config, FLOPPY_0, 0, &nes_floppy_interface); -} +MACHINE_CONFIG_START(nes_disksys_device::device_add_mconfig) + MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, nes_floppy_interface) +MACHINE_CONFIG_END ROM_START( disksys ) @@ -173,7 +172,7 @@ void nes_disksys_device::pcb_reset() -------------------------------------------------*/ -void nes_disksys_device::write_h(offs_t offset, uint8_t data) +WRITE8_MEMBER(nes_disksys_device::write_h) { LOG_MMC(("Famicom Disk System write_h, offset %04x, data: %02x\n", offset, data)); @@ -181,7 +180,7 @@ void nes_disksys_device::write_h(offs_t offset, uint8_t data) m_prgram[offset + 0x2000] = data; } -uint8_t nes_disksys_device::read_h(offs_t offset) +READ8_MEMBER(nes_disksys_device::read_h) { LOG_MMC(("Famicom Disk System read_h, offset: %04x\n", offset)); @@ -191,13 +190,13 @@ uint8_t nes_disksys_device::read_h(offs_t offset) return m_2c33_rom[offset & 0x1fff]; } -void nes_disksys_device::write_m(offs_t offset, uint8_t data) +WRITE8_MEMBER(nes_disksys_device::write_m) { LOG_MMC(("Famicom Disk System write_m, offset: %04x, data: %02x\n", offset, data)); m_prgram[offset] = data; } -uint8_t nes_disksys_device::read_m(offs_t offset) +READ8_MEMBER(nes_disksys_device::read_m) { LOG_MMC(("Famicom Disk System read_m, offset: %04x\n", offset)); return m_prgram[offset]; @@ -209,7 +208,7 @@ void nes_disksys_device::hblank_irq(int scanline, int vblank, int blanked) hold_irq_line(); } -void nes_disksys_device::write_ex(offs_t offset, uint8_t data) +WRITE8_MEMBER(nes_disksys_device::write_ex) { LOG_MMC(("Famicom Disk System write_ex, offset: %04x, data: %02x\n", offset, data)); @@ -281,7 +280,7 @@ void nes_disksys_device::write_ex(offs_t offset, uint8_t data) } } -uint8_t nes_disksys_device::read_ex(offs_t offset) +READ8_MEMBER(nes_disksys_device::read_ex) { LOG_MMC(("Famicom Disk System read_ex, offset: %04x\n", offset)); uint8_t ret; -- cgit v1.2.3-70-g09d2