diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 22:44:58 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 22:44:58 +0100 |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/bus/coleco | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/bus/coleco')
-rw-r--r-- | src/devices/bus/coleco/cartridge/exp.cpp (renamed from src/devices/bus/coleco/exp.cpp) | 4 | ||||
-rw-r--r-- | src/devices/bus/coleco/cartridge/exp.h (renamed from src/devices/bus/coleco/exp.h) | 4 | ||||
-rw-r--r-- | src/devices/bus/coleco/cartridge/std.cpp (renamed from src/devices/bus/coleco/std.cpp) | 2 | ||||
-rw-r--r-- | src/devices/bus/coleco/cartridge/std.h (renamed from src/devices/bus/coleco/std.h) | 2 | ||||
-rw-r--r-- | src/devices/bus/coleco/cartridge/xin1.cpp (renamed from src/devices/bus/coleco/xin1.cpp) | 2 | ||||
-rw-r--r-- | src/devices/bus/coleco/cartridge/xin1.h (renamed from src/devices/bus/coleco/xin1.h) | 2 | ||||
-rw-r--r-- | src/devices/bus/coleco/controller/ctrl.cpp (renamed from src/devices/bus/coleco/ctrl.cpp) | 0 | ||||
-rw-r--r-- | src/devices/bus/coleco/controller/ctrl.h (renamed from src/devices/bus/coleco/ctrl.h) | 0 | ||||
-rw-r--r-- | src/devices/bus/coleco/controller/hand.cpp (renamed from src/devices/bus/coleco/hand.cpp) | 0 | ||||
-rw-r--r-- | src/devices/bus/coleco/controller/hand.h (renamed from src/devices/bus/coleco/hand.h) | 0 | ||||
-rw-r--r-- | src/devices/bus/coleco/controller/sac.cpp (renamed from src/devices/bus/coleco/sac.cpp) | 0 | ||||
-rw-r--r-- | src/devices/bus/coleco/controller/sac.h (renamed from src/devices/bus/coleco/sac.h) | 0 |
12 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/cartridge/exp.cpp index c2878c4523a..eaf3f144322 100644 --- a/src/devices/bus/coleco/exp.cpp +++ b/src/devices/bus/coleco/cartridge/exp.cpp @@ -118,11 +118,11 @@ std::string colecovision_cartridge_slot_device::get_default_card_software(get_de // bd_r - cartridge data read //------------------------------------------------- -uint8_t colecovision_cartridge_slot_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) +uint8_t colecovision_cartridge_slot_device::bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { if (m_card != nullptr) { - data = m_card->bd_r(space, offset, data, _8000, _a000, _c000, _e000); + data = m_card->bd_r(offset, data, _8000, _a000, _c000, _e000); } return data; diff --git a/src/devices/bus/coleco/exp.h b/src/devices/bus/coleco/cartridge/exp.h index a4bf724c6e7..4da9d2d1d00 100644 --- a/src/devices/bus/coleco/exp.h +++ b/src/devices/bus/coleco/cartridge/exp.h @@ -65,7 +65,7 @@ public: colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // computer interface - uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000); + uint8_t bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000); protected: // device-level overrides @@ -99,7 +99,7 @@ class device_colecovision_cartridge_interface : public device_slot_card_interfac friend class colecovision_cartridge_slot_device; public: - virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { return 0xff; } + virtual uint8_t bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { return 0xff; } void rom_alloc(size_t size); diff --git a/src/devices/bus/coleco/std.cpp b/src/devices/bus/coleco/cartridge/std.cpp index ae490dea2e9..24bb815834e 100644 --- a/src/devices/bus/coleco/std.cpp +++ b/src/devices/bus/coleco/cartridge/std.cpp @@ -47,7 +47,7 @@ void colecovision_standard_cartridge_device::device_start() // read - cartridge data read //------------------------------------------------- -uint8_t colecovision_standard_cartridge_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) +uint8_t colecovision_standard_cartridge_device::bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { if (!_8000 || !_a000 || !_c000 || !_e000) { diff --git a/src/devices/bus/coleco/std.h b/src/devices/bus/coleco/cartridge/std.h index 7ee221502a7..6e0c5206ada 100644 --- a/src/devices/bus/coleco/std.h +++ b/src/devices/bus/coleco/cartridge/std.h @@ -33,7 +33,7 @@ protected: virtual void device_start() override; // device_colecovision_expansion_card_interface overrides - virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override; + virtual uint8_t bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override; }; diff --git a/src/devices/bus/coleco/xin1.cpp b/src/devices/bus/coleco/cartridge/xin1.cpp index 3538f93bb90..140d2132ee4 100644 --- a/src/devices/bus/coleco/xin1.cpp +++ b/src/devices/bus/coleco/cartridge/xin1.cpp @@ -58,7 +58,7 @@ void colecovision_xin1_cartridge_device::device_reset() // read - cartridge data read //------------------------------------------------- -uint8_t colecovision_xin1_cartridge_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) +uint8_t colecovision_xin1_cartridge_device::bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { if (!_8000 || !_a000 || !_c000 || !_e000) { diff --git a/src/devices/bus/coleco/xin1.h b/src/devices/bus/coleco/cartridge/xin1.h index c5b0ae49b76..0e8a7813c9f 100644 --- a/src/devices/bus/coleco/xin1.h +++ b/src/devices/bus/coleco/cartridge/xin1.h @@ -34,7 +34,7 @@ protected: virtual void device_reset() override; // device_colecovision_expansion_card_interface overrides - virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override; + virtual uint8_t bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override; private: uint32_t m_current_offset; diff --git a/src/devices/bus/coleco/ctrl.cpp b/src/devices/bus/coleco/controller/ctrl.cpp index 330c7c71551..330c7c71551 100644 --- a/src/devices/bus/coleco/ctrl.cpp +++ b/src/devices/bus/coleco/controller/ctrl.cpp diff --git a/src/devices/bus/coleco/ctrl.h b/src/devices/bus/coleco/controller/ctrl.h index 3460dec0b7d..3460dec0b7d 100644 --- a/src/devices/bus/coleco/ctrl.h +++ b/src/devices/bus/coleco/controller/ctrl.h diff --git a/src/devices/bus/coleco/hand.cpp b/src/devices/bus/coleco/controller/hand.cpp index b8410183b68..b8410183b68 100644 --- a/src/devices/bus/coleco/hand.cpp +++ b/src/devices/bus/coleco/controller/hand.cpp diff --git a/src/devices/bus/coleco/hand.h b/src/devices/bus/coleco/controller/hand.h index f65ad709106..f65ad709106 100644 --- a/src/devices/bus/coleco/hand.h +++ b/src/devices/bus/coleco/controller/hand.h diff --git a/src/devices/bus/coleco/sac.cpp b/src/devices/bus/coleco/controller/sac.cpp index 7b3cef9b114..7b3cef9b114 100644 --- a/src/devices/bus/coleco/sac.cpp +++ b/src/devices/bus/coleco/controller/sac.cpp diff --git a/src/devices/bus/coleco/sac.h b/src/devices/bus/coleco/controller/sac.h index 20078e33ef7..20078e33ef7 100644 --- a/src/devices/bus/coleco/sac.h +++ b/src/devices/bus/coleco/controller/sac.h |