diff options
author | 2017-07-10 19:34:33 +1000 | |
---|---|---|
committer | 2017-07-10 19:35:07 +1000 | |
commit | 536b2153d995430def817091867b3cfde71e688a (patch) | |
tree | ebfaa23525e5a041a3160ed284944efc3b209ab4 /src/devices/cpu/pdp1 | |
parent | a857db7582d91ede98433fb63b357b917ef92f73 (diff) |
make device_memory_interface slightly less of a special case, use a typedef to avoid nested templates everywhere (nw)
Diffstat (limited to 'src/devices/cpu/pdp1')
-rw-r--r-- | src/devices/cpu/pdp1/pdp1.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/pdp1/pdp1.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/pdp1/tx0.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/pdp1/tx0.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/cpu/pdp1/pdp1.cpp b/src/devices/cpu/pdp1/pdp1.cpp index 56f6fb25c90..2a5368ae56f 100644 --- a/src/devices/cpu/pdp1/pdp1.cpp +++ b/src/devices/cpu/pdp1/pdp1.cpp @@ -387,9 +387,9 @@ pdp1_device::pdp1_device(const machine_config &mconfig, const char *tag, device_ m_program_config.m_is_octal = true; } -std::vector<std::pair<int, const address_space_config *>> pdp1_device::memory_space_config() const +device_memory_interface::space_config_vector pdp1_device::memory_space_config() const { - return std::vector<std::pair<int, const address_space_config *>> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/pdp1/pdp1.h b/src/devices/cpu/pdp1/pdp1.h index 546735f425b..174317d995e 100644 --- a/src/devices/cpu/pdp1/pdp1.h +++ b/src/devices/cpu/pdp1/pdp1.h @@ -106,7 +106,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_state_interface overrides virtual void state_import(const device_state_entry &entry) override; diff --git a/src/devices/cpu/pdp1/tx0.cpp b/src/devices/cpu/pdp1/tx0.cpp index 3d3be72838e..89355ee2ef8 100644 --- a/src/devices/cpu/pdp1/tx0.cpp +++ b/src/devices/cpu/pdp1/tx0.cpp @@ -75,9 +75,9 @@ tx0_64kw_device::tx0_64kw_device(const machine_config &mconfig, const char *tag, { } -std::vector<std::pair<int, const address_space_config *>> tx0_device::memory_space_config() const +device_memory_interface::space_config_vector tx0_device::memory_space_config() const { - return std::vector<std::pair<int, const address_space_config *>> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/pdp1/tx0.h b/src/devices/cpu/pdp1/tx0.h index 8272fe478b4..52cc7f4091a 100644 --- a/src/devices/cpu/pdp1/tx0.h +++ b/src/devices/cpu/pdp1/tx0.h @@ -65,7 +65,7 @@ protected: virtual uint32_t execute_max_cycles() const override { return 3; } // device_memory_interface overrides - virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_disasm_interface overrides virtual uint32_t disasm_min_opcode_bytes() const override { return 4; } |