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/mcs96 | |
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/mcs96')
-rw-r--r-- | src/devices/cpu/mcs96/i8x9x.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/mcs96/i8x9x.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/mcs96/mcs96.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/mcs96/mcs96.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/cpu/mcs96/i8x9x.cpp b/src/devices/cpu/mcs96/i8x9x.cpp index 4266aaf2a1f..c3a6c7876af 100644 --- a/src/devices/cpu/mcs96/i8x9x.cpp +++ b/src/devices/cpu/mcs96/i8x9x.cpp @@ -23,9 +23,9 @@ offs_t i8x9x_device::disasm_disassemble(std::ostream &stream, offs_t pc, const u return disasm_generic(stream, pc, oprom, opram, options, disasm_entries); } -std::vector<std::pair<int, const address_space_config *>> i8x9x_device::memory_space_config() const +device_memory_interface::space_config_vector i8x9x_device::memory_space_config() const { - return std::vector<std::pair<int, const address_space_config *>> { + return space_config_vector { std::make_pair(AS_PROGRAM, &program_config), std::make_pair(AS_IO, &io_config) }; diff --git a/src/devices/cpu/mcs96/i8x9x.h b/src/devices/cpu/mcs96/i8x9x.h index ef9c8b0ab74..8fda92de323 100644 --- a/src/devices/cpu/mcs96/i8x9x.h +++ b/src/devices/cpu/mcs96/i8x9x.h @@ -28,7 +28,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; static const disasm_entry disasm_entries[0x100]; diff --git a/src/devices/cpu/mcs96/mcs96.cpp b/src/devices/cpu/mcs96/mcs96.cpp index ff229b231ce..92a8ed23a37 100644 --- a/src/devices/cpu/mcs96/mcs96.cpp +++ b/src/devices/cpu/mcs96/mcs96.cpp @@ -116,9 +116,9 @@ void mcs96_device::execute_set_input(int inputnum, int state) } } -std::vector<std::pair<int, const address_space_config *>> mcs96_device::memory_space_config() const +device_memory_interface::space_config_vector mcs96_device::memory_space_config() const { - return std::vector<std::pair<int, const address_space_config *>> { + return space_config_vector { std::make_pair(AS_PROGRAM, &program_config) }; } diff --git a/src/devices/cpu/mcs96/mcs96.h b/src/devices/cpu/mcs96/mcs96.h index 1023b794e27..159d04bbdc3 100644 --- a/src/devices/cpu/mcs96/mcs96.h +++ b/src/devices/cpu/mcs96/mcs96.h @@ -88,7 +88,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; |