diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/bus/nes/disksys.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/bus/nes/disksys.cpp')
-rw-r--r-- | src/devices/bus/nes/disksys.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/devices/bus/nes/disksys.cpp b/src/devices/bus/nes/disksys.cpp index 0f350fb7922..71101492822 100644 --- a/src/devices/bus/nes/disksys.cpp +++ b/src/devices/bus/nes/disksys.cpp @@ -51,9 +51,10 @@ static const floppy_interface nes_floppy_interface = // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(nes_disksys_device::device_add_mconfig) - MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, nes_floppy_interface) -MACHINE_CONFIG_END +void nes_disksys_device::device_add_mconfig(machine_config &config) +{ + LEGACY_FLOPPY(config, FLOPPY_0, 0, &nes_floppy_interface); +} ROM_START( disksys ) @@ -172,7 +173,7 @@ void nes_disksys_device::pcb_reset() -------------------------------------------------*/ -WRITE8_MEMBER(nes_disksys_device::write_h) +void nes_disksys_device::write_h(offs_t offset, uint8_t data) { LOG_MMC(("Famicom Disk System write_h, offset %04x, data: %02x\n", offset, data)); @@ -180,7 +181,7 @@ WRITE8_MEMBER(nes_disksys_device::write_h) m_prgram[offset + 0x2000] = data; } -READ8_MEMBER(nes_disksys_device::read_h) +uint8_t nes_disksys_device::read_h(offs_t offset) { LOG_MMC(("Famicom Disk System read_h, offset: %04x\n", offset)); @@ -190,13 +191,13 @@ READ8_MEMBER(nes_disksys_device::read_h) return m_2c33_rom[offset & 0x1fff]; } -WRITE8_MEMBER(nes_disksys_device::write_m) +void nes_disksys_device::write_m(offs_t offset, uint8_t data) { LOG_MMC(("Famicom Disk System write_m, offset: %04x, data: %02x\n", offset, data)); m_prgram[offset] = data; } -READ8_MEMBER(nes_disksys_device::read_m) +uint8_t nes_disksys_device::read_m(offs_t offset) { LOG_MMC(("Famicom Disk System read_m, offset: %04x\n", offset)); return m_prgram[offset]; @@ -208,7 +209,7 @@ void nes_disksys_device::hblank_irq(int scanline, int vblank, int blanked) hold_irq_line(); } -WRITE8_MEMBER(nes_disksys_device::write_ex) +void nes_disksys_device::write_ex(offs_t offset, uint8_t data) { LOG_MMC(("Famicom Disk System write_ex, offset: %04x, data: %02x\n", offset, data)); @@ -280,7 +281,7 @@ WRITE8_MEMBER(nes_disksys_device::write_ex) } } -READ8_MEMBER(nes_disksys_device::read_ex) +uint8_t nes_disksys_device::read_ex(offs_t offset) { LOG_MMC(("Famicom Disk System read_ex, offset: %04x\n", offset)); uint8_t ret; |