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/coco/coco_dcmodem.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/bus/coco/coco_dcmodem.cpp')
-rw-r--r-- | src/devices/bus/coco/coco_dcmodem.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/devices/bus/coco/coco_dcmodem.cpp b/src/devices/bus/coco/coco_dcmodem.cpp index cad760775b7..bebd6c275d5 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, - read8_delegate(FUNC(mos6551_device::read), (mos6551_device *)m_uart), - write8_delegate(FUNC(mos6551_device::write), (mos6551_device *)m_uart)); + read8sm_delegate(FUNC(mos6551_device::read), (mos6551_device *)m_uart), + write8sm_delegate(FUNC(mos6551_device::write), (mos6551_device *)m_uart)); } virtual const tiny_rom_entry *device_rom_region() const override; @@ -70,6 +70,11 @@ namespace return memregion("eprom")->base(); } + virtual memory_region* get_cart_memregion() override + { + return memregion("eprom"); + } + private: // internal state required_device<mos6551_device> m_uart; |