diff options
Diffstat (limited to 'src/devices/bus/a2bus/a2cffa.cpp')
-rw-r--r-- | src/devices/bus/a2bus/a2cffa.cpp | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp index 8942e05558d..6aa0a2c904a 100644 --- a/src/devices/bus/a2bus/a2cffa.cpp +++ b/src/devices/bus/a2bus/a2cffa.cpp @@ -17,7 +17,7 @@ #include "imagedev/harddriv.h" #include "bus/ata/ataintf.h" -#include "softlist.h" +#include "softlist_dev.h" namespace { @@ -78,8 +78,8 @@ public: protected: // device_config_nvram_interface overrides virtual void nvram_default() override; - virtual void nvram_read(emu_file &file) override; - virtual void nvram_write(emu_file &file) override; + virtual bool nvram_read(util::read_stream &file) override; + virtual bool nvram_write(util::write_stream &file) override; }; class a2bus_cffa2_6502_device : public a2bus_cffa2000_device, public device_nvram_interface @@ -91,8 +91,8 @@ public: protected: // device_config_nvram_interface overrides virtual void nvram_default() override; - virtual void nvram_read(emu_file &file) override; - virtual void nvram_write(emu_file &file) override; + virtual bool nvram_read(util::read_stream &file) override; + virtual bool nvram_write(util::write_stream &file) override; }; /*************************************************************************** @@ -295,14 +295,16 @@ void a2bus_cffa2_device::nvram_default() memcpy(m_eeprom, m_rom, 0x1000); } -void a2bus_cffa2_device::nvram_read(emu_file &file) +bool a2bus_cffa2_device::nvram_read(util::read_stream &file) { - file.read(m_eeprom, 0x1000); + auto const [err, actual] = read(file, m_eeprom, 0x1000); + return !err && (actual == 0x1000); } -void a2bus_cffa2_device::nvram_write(emu_file &file) +bool a2bus_cffa2_device::nvram_write(util::write_stream &file) { - file.write(m_eeprom, 0x1000); + auto const [err, actual] = write(file, m_eeprom, 0x1000); + return !err; } void a2bus_cffa2_6502_device::nvram_default() @@ -310,14 +312,16 @@ void a2bus_cffa2_6502_device::nvram_default() memcpy(m_eeprom, m_rom, 0x1000); } -void a2bus_cffa2_6502_device::nvram_read(emu_file &file) +bool a2bus_cffa2_6502_device::nvram_read(util::read_stream &file) { - file.read(m_eeprom, 0x1000); + auto const [err, actual] = read(file, m_eeprom, 0x1000); + return !err && (actual == 0x1000); } -void a2bus_cffa2_6502_device::nvram_write(emu_file &file) +bool a2bus_cffa2_6502_device::nvram_write(util::write_stream &file) { - file.write(m_eeprom, 0x1000); + auto const [err, actual] = write(file, m_eeprom, 0x1000); + return !err; } } // anonymous namespace |