diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-01-11 17:15:09 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-01-11 17:15:09 +0100 |
commit | f21c96ce8a75b92f9e26af8c8d5622b1fe74819b (patch) | |
tree | dcd035995a6a41b11a5fe921c5358140d6a3f365 /src/devices/imagedev | |
parent | f0dc809ab860ad1d62c53d5163a6da3f41deb631 (diff) |
modernize rom_load_manager (nw)
Diffstat (limited to 'src/devices/imagedev')
-rw-r--r-- | src/devices/imagedev/chd_cd.cpp | 4 | ||||
-rw-r--r-- | src/devices/imagedev/chd_cd.h | 2 | ||||
-rw-r--r-- | src/devices/imagedev/diablo.cpp | 4 | ||||
-rw-r--r-- | src/devices/imagedev/diablo.h | 2 | ||||
-rw-r--r-- | src/devices/imagedev/harddriv.cpp | 4 | ||||
-rw-r--r-- | src/devices/imagedev/harddriv.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/imagedev/chd_cd.cpp b/src/devices/imagedev/chd_cd.cpp index 83845d026b8..d9ab295dfad 100644 --- a/src/devices/imagedev/chd_cd.cpp +++ b/src/devices/imagedev/chd_cd.cpp @@ -79,7 +79,7 @@ const option_guide *cdrom_image_device::create_option_guide() const void cdrom_image_device::device_start() { // try to locate the CHD from a DISK_REGION - chd_file *chd = get_disk_handle( machine(), owner()->tag() ); + chd_file *chd = machine().rom_load().get_disk_handle(owner()->tag() ); if( chd != nullptr ) { m_cdrom_handle = cdrom_open( chd ); @@ -115,7 +115,7 @@ bool cdrom_image_device::call_load() chd = &m_self_chd; } } else { - chd = get_disk_handle(device().machine(), device().subtag("cdrom").c_str()); + chd = device().machine().rom_load().get_disk_handle(device().subtag("cdrom").c_str()); } /* open the CHD file */ diff --git a/src/devices/imagedev/chd_cd.h b/src/devices/imagedev/chd_cd.h index 5303b474045..5d229a471b4 100644 --- a/src/devices/imagedev/chd_cd.h +++ b/src/devices/imagedev/chd_cd.h @@ -33,7 +33,7 @@ public: // image-level overrides virtual bool call_load() override; virtual void call_unload() override; - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } virtual iodevice_t image_type() const override { return IO_CDROM; } diff --git a/src/devices/imagedev/diablo.cpp b/src/devices/imagedev/diablo.cpp index 9982463fd08..be8b3e500f2 100644 --- a/src/devices/imagedev/diablo.cpp +++ b/src/devices/imagedev/diablo.cpp @@ -76,7 +76,7 @@ void diablo_image_device::device_start() m_chd = nullptr; // try to locate the CHD from a DISK_REGION - chd_file *handle = get_disk_handle(machine(), tag()); + chd_file *handle = machine().rom_load().get_disk_handle(tag()); if (handle != nullptr) { m_hard_disk_handle = hard_disk_open(handle); @@ -217,7 +217,7 @@ int diablo_image_device::internal_load_dsk() /* open the CHD file */ if (software_entry() != nullptr) { - m_chd = get_disk_handle(device().machine(), device().subtag("harddriv").c_str()); + m_chd = device().machine().rom_load().get_disk_handle(device().subtag("harddriv").c_str()); } else { diff --git a/src/devices/imagedev/diablo.h b/src/devices/imagedev/diablo.h index 6cc5530e534..00df1345bbd 100644 --- a/src/devices/imagedev/diablo.h +++ b/src/devices/imagedev/diablo.h @@ -33,7 +33,7 @@ public: virtual bool call_load() override; virtual bool call_create(int create_format, option_resolution *create_args) override; virtual void call_unload() override; - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { device().machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } virtual iodevice_t image_type() const override { return IO_HARDDISK; } diff --git a/src/devices/imagedev/harddriv.cpp b/src/devices/imagedev/harddriv.cpp index 8b0ea459be5..b5fd6ca87dc 100644 --- a/src/devices/imagedev/harddriv.cpp +++ b/src/devices/imagedev/harddriv.cpp @@ -99,7 +99,7 @@ void harddisk_image_device::device_start() m_chd = nullptr; // try to locate the CHD from a DISK_REGION - chd_file *handle = get_disk_handle(machine(), tag()); + chd_file *handle = machine().rom_load().get_disk_handle(tag()); if (handle != nullptr) { m_hard_disk_handle = hard_disk_open(handle); @@ -241,7 +241,7 @@ int harddisk_image_device::internal_load_hd() /* open the CHD file */ if (software_entry() != nullptr) { - m_chd = get_disk_handle(device().machine(), device().subtag("harddriv").c_str()); + m_chd = machine().rom_load().get_disk_handle(device().subtag("harddriv").c_str()); } else { diff --git a/src/devices/imagedev/harddriv.h b/src/devices/imagedev/harddriv.h index 7c3da504a5a..b85418e8c33 100644 --- a/src/devices/imagedev/harddriv.h +++ b/src/devices/imagedev/harddriv.h @@ -35,7 +35,7 @@ public: virtual bool call_load() override; virtual bool call_create(int create_format, option_resolution *create_args) override; virtual void call_unload() override; - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { machine().rom_load().load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } virtual iodevice_t image_type() const override { return IO_HARDDISK; } |