summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/imagedev
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2017-02-27 00:38:50 -0500
committer AJR <ajrhacker@users.noreply.github.com>2017-02-27 00:38:50 -0500
commit2a89da877b3f50a40336cace86285a9971b6da25 (patch)
treeebbb5ae20ebbfb8e00329d3e14ad1cbcfaf25bcd /src/devices/imagedev
parent73d399e9e5b22121c9f51eaf6b10b36aeb44491b (diff)
device_image_interface cleanups (nw)
- Replace comparisons of software_entry() or part_entry() with nullptr with loaded_through_softlist() predicate. - Eliminate the superfluous m_software_info_ptr member. The software_entry() accessor is still provided, but now rarely used. - Eliminate two of the three arguments to load_software_part. - Remove some unnecessary auto-typing in ui/inifile.cpp.
Diffstat (limited to 'src/devices/imagedev')
-rw-r--r--src/devices/imagedev/chd_cd.cpp2
-rw-r--r--src/devices/imagedev/diablo.cpp2
-rw-r--r--src/devices/imagedev/harddriv.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/imagedev/chd_cd.cpp b/src/devices/imagedev/chd_cd.cpp
index 103806c1e62..166fdf7945c 100644
--- a/src/devices/imagedev/chd_cd.cpp
+++ b/src/devices/imagedev/chd_cd.cpp
@@ -94,7 +94,7 @@ image_init_result cdrom_image_device::call_load()
if (m_cdrom_handle)
cdrom_close(m_cdrom_handle);
- if (software_entry() == nullptr)
+ if (!loaded_through_softlist())
{
if (is_filetype("chd") && is_loaded()) {
err = m_self_chd.open( image_core_file() ); /* CDs are never writeable */
diff --git a/src/devices/imagedev/diablo.cpp b/src/devices/imagedev/diablo.cpp
index 58f17793b2a..5852da4a58e 100644
--- a/src/devices/imagedev/diablo.cpp
+++ b/src/devices/imagedev/diablo.cpp
@@ -214,7 +214,7 @@ image_init_result diablo_image_device::internal_load_dsk()
hard_disk_close(m_hard_disk_handle);
/* open the CHD file */
- if (software_entry() != nullptr)
+ if (loaded_through_softlist())
{
m_chd = device().machine().rom_load().get_disk_handle(device().subtag("harddriv").c_str());
}
diff --git a/src/devices/imagedev/harddriv.cpp b/src/devices/imagedev/harddriv.cpp
index a6e0276b8ff..355b43bcb65 100644
--- a/src/devices/imagedev/harddriv.cpp
+++ b/src/devices/imagedev/harddriv.cpp
@@ -244,7 +244,7 @@ image_init_result harddisk_image_device::internal_load_hd()
}
/* open the CHD file */
- if (software_entry() != nullptr)
+ if (loaded_through_softlist())
{
m_chd = machine().rom_load().get_disk_handle(device().subtag("harddriv").c_str());
}