Use device_post_load instead of callbacks. (nw)

This commit is contained in:
Ted Green 2018-04-15 10:35:13 -06:00
parent 518c69114b
commit 8a31e47d45
6 changed files with 6 additions and 9 deletions

View File

@ -252,10 +252,9 @@ void gt64xxx_device::device_start()
save_pointer(NAME(m_ram[2].data()), m_simm_size[2] / 4); save_pointer(NAME(m_ram[2].data()), m_simm_size[2] / 4);
save_pointer(NAME(m_ram[3].data()), m_simm_size[3] / 4); save_pointer(NAME(m_ram[3].data()), m_simm_size[3] / 4);
save_item(NAME(m_last_dma)); save_item(NAME(m_last_dma));
machine().save().register_postload(save_prepost_delegate(FUNC(gt64xxx_device::map_cpu_space), this));
} }
void gt64xxx_device::postload() void gt64xxx_device::device_post_load()
{ {
map_cpu_space(); map_cpu_space();
remap_cb(); remap_cb();

View File

@ -103,7 +103,7 @@ public:
enum proc_addr_bank {ADDR_RAS1_0, ADDR_RAS3_2, ADDR_CS2_0, ADDR_CS3_BCS, ADDR_PCI_IO, ADDR_PCI_MEM0, ADDR_PCI_MEM1, ADDR_NUM}; enum proc_addr_bank {ADDR_RAS1_0, ADDR_RAS3_2, ADDR_CS2_0, ADDR_CS3_BCS, ADDR_PCI_IO, ADDR_PCI_MEM0, ADDR_PCI_MEM1, ADDR_NUM};
void set_map(int id, const address_map_constructor &map, device_t *device); void set_map(int id, const address_map_constructor &map, device_t *device);
void postload(); virtual void device_post_load(void) override;
protected: protected:
address_space *m_cpu_space; address_space *m_cpu_space;

View File

@ -161,10 +161,9 @@ void vrc4373_device::device_start()
save_item(NAME(m_pci_io_laddr)); save_item(NAME(m_pci_io_laddr));
save_item(NAME(m_target1_laddr)); save_item(NAME(m_target1_laddr));
save_item(NAME(m_target2_laddr)); save_item(NAME(m_target2_laddr));
machine().save().register_postload(save_prepost_delegate(FUNC(vrc4373_device::postload), this));
} }
void vrc4373_device::postload() void vrc4373_device::device_post_load()
{ {
map_cpu_space(); map_cpu_space();
//remap_cb(); //remap_cb();

View File

@ -31,7 +31,7 @@ public:
virtual void reset_all_mappings() 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, 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); virtual void device_post_load(void) override;
template <class Object> devcb_base &set_irq_cb(Object &&cb) { return m_irq_cb.set_callback(std::forward<Object>(cb)); } template <class Object> devcb_base &set_irq_cb(Object &&cb) { return m_irq_cb.set_callback(std::forward<Object>(cb)); }
void set_cpu_tag(const char *tag) { cpu_tag = tag; } void set_cpu_tag(const char *tag) { cpu_tag = tag; }

View File

@ -243,10 +243,9 @@ void vrc5074_device::device_start()
save_item(NAME(m_uart_irq)); save_item(NAME(m_uart_irq));
save_item(NAME(m_irq_pins)); save_item(NAME(m_irq_pins));
save_item(NAME(m_timer_period)); save_item(NAME(m_timer_period));
machine().save().register_postload(save_prepost_delegate(FUNC(vrc5074_device::postload), this));
} }
void vrc5074_device::postload() void vrc5074_device::device_post_load()
{ {
map_cpu_space(); map_cpu_space();
setup_pci_space(); setup_pci_space();

View File

@ -31,7 +31,7 @@ public:
virtual void reset_all_mappings() 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, 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(); virtual void device_post_load(void) override;
void set_cpu_tag(const char *tag); void set_cpu_tag(const char *tag);
void set_sdram_size(const int index, const int size) { m_sdram_size[index] = size; }; void set_sdram_size(const int index, const int size) { m_sdram_size[index] = size; };