diff options
author | 2017-02-27 00:38:50 -0500 | |
---|---|---|
committer | 2017-02-27 00:38:50 -0500 | |
commit | 2a89da877b3f50a40336cace86285a9971b6da25 (patch) | |
tree | ebbb5ae20ebbfb8e00329d3e14ad1cbcfaf25bcd /src/devices/bus/scv/slot.cpp | |
parent | 73d399e9e5b22121c9f51eaf6b10b36aeb44491b (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/bus/scv/slot.cpp')
-rw-r--r-- | src/devices/bus/scv/slot.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp index 799f4adc78a..a0b4c3a5900 100644 --- a/src/devices/bus/scv/slot.cpp +++ b/src/devices/bus/scv/slot.cpp @@ -165,8 +165,8 @@ image_init_result scv_cart_slot_device::call_load() if (m_cart) { uint8_t *ROM; - uint32_t len = (software_entry() == nullptr) ? length() : get_software_region_length("rom"); - bool has_ram = (software_entry() != nullptr) && get_software_region("ram"); + uint32_t len = !loaded_through_softlist() ? length() : get_software_region_length("rom"); + bool has_ram = loaded_through_softlist() && get_software_region("ram"); if (len > 0x20000) { @@ -180,12 +180,12 @@ image_init_result scv_cart_slot_device::call_load() ROM = m_cart->get_rom_base(); - if (software_entry() == nullptr) + if (!loaded_through_softlist()) fread(ROM, len); else memcpy(ROM, get_software_region("rom"), len); - if (software_entry() == nullptr) + if (!loaded_through_softlist()) m_type = get_cart_type(ROM, len); else { |