diff options
Diffstat (limited to 'src/devices/machine/vrc5074.h')
-rw-r--r-- | src/devices/machine/vrc5074.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/machine/vrc5074.h b/src/devices/machine/vrc5074.h index 736f72f60fc..30ab8b2bea0 100644 --- a/src/devices/machine/vrc5074.h +++ b/src/devices/machine/vrc5074.h @@ -20,7 +20,7 @@ downcast<vrc5074_device *>(device)->set_sdram_size(_index, _size); #define MCFG_VRC5074_SET_CS(_cs_num, _map) \ - downcast<vrc5074_device *>(device)->set_map(_cs_num, address_map_delegate(ADDRESS_MAP_NAME(_map), #_map), this); + downcast<vrc5074_device *>(device)->set_map(_cs_num, address_map_constructor(&_map, #_map, this), this); class vrc5074_device : public pci_host_device { public: @@ -30,15 +30,15 @@ public: virtual void device_add_mconfig(machine_config &config) override; virtual void reset_all_mappings() override; virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, - uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override; + uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override; void postload(); void set_cpu_tag(const char *tag); void set_sdram_size(const int index, const int size) { m_sdram_size[index] = size; }; - void set_map(int id, const address_map_delegate &map, device_t *device); + void set_map(int id, const address_map_constructor &map, device_t *device); - virtual DECLARE_ADDRESS_MAP(config_map, 32) override; + virtual void config_map(address_map &map) override; DECLARE_READ32_MEMBER(sdram_addr_r); DECLARE_WRITE32_MEMBER(sdram_addr_w); @@ -63,7 +63,7 @@ public: DECLARE_READ32_MEMBER (pci1_r); DECLARE_WRITE32_MEMBER(pci1_w); - virtual DECLARE_ADDRESS_MAP(target1_map, 32); + virtual void target1_map(address_map &map); DECLARE_READ32_MEMBER (target1_r); DECLARE_WRITE32_MEMBER(target1_w); @@ -92,8 +92,8 @@ private: address_space_config m_mem_config, m_io_config; - DECLARE_ADDRESS_MAP(cpu_map, 32); - DECLARE_ADDRESS_MAP(serial_map, 32); + void cpu_map(address_map &map); + void serial_map(address_map &map); void map_cpu_space(); @@ -109,7 +109,7 @@ private: // Chip Select device_t *m_cs_devices[7]; - address_map_delegate m_cs_maps[7]; + address_map_constructor m_cs_maps[7]; uint32_t m_cpu_regs[0x1ff / 4]; uint16_t m_nile_irq_state; |