summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/ql/rom.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/ql/rom.cpp')
-rw-r--r--src/devices/bus/ql/rom.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/devices/bus/ql/rom.cpp b/src/devices/bus/ql/rom.cpp
index f6b54fdc907..ab0e3c1e765 100644
--- a/src/devices/bus/ql/rom.cpp
+++ b/src/devices/bus/ql/rom.cpp
@@ -9,6 +9,8 @@
#include "emu.h"
#include "rom.h"
+#include <tuple>
+
//**************************************************************************
@@ -62,7 +64,8 @@ void device_ql_rom_cartridge_card_interface::interface_post_start()
ql_rom_cartridge_slot_device::ql_rom_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, QL_ROM_CARTRIDGE_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_ql_rom_cartridge_card_interface>(mconfig, *this),
- device_image_interface(mconfig, *this), m_card(nullptr)
+ device_cartrom_image_interface(mconfig, *this),
+ m_card(nullptr)
{
}
@@ -84,13 +87,19 @@ void ql_rom_cartridge_slot_device::device_start()
// call_load -
//-------------------------------------------------
-image_init_result ql_rom_cartridge_slot_device::call_load()
+std::pair<std::error_condition, std::string> ql_rom_cartridge_slot_device::call_load()
{
+ std::error_condition err;
+
if (m_card)
{
if (!loaded_through_softlist())
{
- fread(m_card->m_rom, length());
+ size_t const size = length();
+ size_t actual;
+ std::tie(err, m_card->m_rom, actual) = util::read(image_core_file(), size);
+ if (!err && (actual != size))
+ err = std::errc::io_error;
}
else
{
@@ -98,7 +107,7 @@ image_init_result ql_rom_cartridge_slot_device::call_load()
}
}
- return image_init_result::PASS;
+ return std::make_pair(err, std::string());
}