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/coco/coco_dcmodem.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/devices/bus/coco/coco_dcmodem.cpp') diff --git a/src/devices/bus/coco/coco_dcmodem.cpp b/src/devices/bus/coco/coco_dcmodem.cpp index bebd6c275d5..cad760775b7 100644 --- a/src/devices/bus/coco/coco_dcmodem.cpp +++ b/src/devices/bus/coco/coco_dcmodem.cpp @@ -58,8 +58,8 @@ namespace virtual void device_start() override { install_readwrite_handler(0xFF6C, 0xFF6F, - read8sm_delegate(FUNC(mos6551_device::read), (mos6551_device *)m_uart), - write8sm_delegate(FUNC(mos6551_device::write), (mos6551_device *)m_uart)); + read8_delegate(FUNC(mos6551_device::read), (mos6551_device *)m_uart), + write8_delegate(FUNC(mos6551_device::write), (mos6551_device *)m_uart)); } virtual const tiny_rom_entry *device_rom_region() const override; @@ -70,11 +70,6 @@ namespace return memregion("eprom")->base(); } - virtual memory_region* get_cart_memregion() override - { - return memregion("eprom"); - } - private: // internal state required_device m_uart; -- cgit v1.2.3-70-g09d2