From 4ea3dde4f3e4ccfd95ca2f8e02199294f78f513a Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Mon, 3 Jul 2017 15:17:36 +0200 Subject: [PATCH] Misc fixes (nw) --- src/mame/video/ygv608.cpp | 6 ++++-- src/mame/video/ygv608.h | 2 +- src/osd/modules/debugger/osx/deviceinfoviewer.mm | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mame/video/ygv608.cpp b/src/mame/video/ygv608.cpp index 35d5922c9ed..8886531f1ea 100644 --- a/src/mame/video/ygv608.cpp +++ b/src/mame/video/ygv608.cpp @@ -497,9 +497,11 @@ void ygv608_device::device_start() // any address spaces owned by this device //------------------------------------------------- -const address_space_config *ygv608_device::memory_space_config(address_spacenum spacenum) const +std::vector> ygv608_device::memory_space_config() const { - return (spacenum == AS_IO) ? &m_io_space_config : nullptr; + return std::vector> { + std::make_pair(AS_IO, &m_io_space_config) + }; } inline void ygv608_device::vblank_irq_check() diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h index c7d343e4dab..3850896f216 100644 --- a/src/mame/video/ygv608.h +++ b/src/mame/video/ygv608.h @@ -89,7 +89,7 @@ protected: // device-level overrides virtual void device_start() override; - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_IO) const override; + virtual std::vector> memory_space_config() const override; void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; address_space *m_iospace; diff --git a/src/osd/modules/debugger/osx/deviceinfoviewer.mm b/src/osd/modules/debugger/osx/deviceinfoviewer.mm index 1cddc35e76d..18b5835944b 100644 --- a/src/osd/modules/debugger/osx/deviceinfoviewer.mm +++ b/src/osd/modules/debugger/osx/deviceinfoviewer.mm @@ -185,7 +185,7 @@ if (device->interface(memory)) { NSBox *memoryBox = nil; - for (int i = 0; i < ADDRESS_SPACES; i++) + for (int i = 0; i < memory->max_space_count(); i++) { if (memory->has_space(i)) {