diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/coco/coco_fdc.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/coco/coco_fdc.cpp')
-rw-r--r-- | src/devices/bus/coco/coco_fdc.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/devices/bus/coco/coco_fdc.cpp b/src/devices/bus/coco/coco_fdc.cpp index 79658d27d60..db8df415ee3 100644 --- a/src/devices/bus/coco/coco_fdc.cpp +++ b/src/devices/bus/coco/coco_fdc.cpp @@ -180,15 +180,6 @@ uint8_t* coco_family_fdc_device_base::get_cart_base() return memregion("eprom")->base(); } -//------------------------------------------------- -// coco_family_fdc_device_base::get_cart_memregion -//------------------------------------------------- - -memory_region* coco_family_fdc_device_base::get_cart_memregion() -{ - return memregion("eprom"); -} - //*************************************************************************** // COCO FDCs @@ -343,17 +334,17 @@ READ8_MEMBER(coco_fdc_device_base::scs_read) case 0x38: /* FF78 */ if (real_time_clock() == rtc_type::CLOUD9) - m_ds1315->read_0(); + m_ds1315->read_0(space, offset); break; case 0x39: /* FF79 */ if (real_time_clock() == rtc_type::CLOUD9) - m_ds1315->read_1(); + m_ds1315->read_1(space, offset); break; case 0x3C: /* FF7C */ if (real_time_clock() == rtc_type::CLOUD9) - result = m_ds1315->read_data(); + result = m_ds1315->read_data(space, offset); break; } return result; |