summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/s3520cf.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/s3520cf.cpp')
-rw-r--r--src/devices/machine/s3520cf.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/devices/machine/s3520cf.cpp b/src/devices/machine/s3520cf.cpp
index 8f256f24dfc..567e9792b66 100644
--- a/src/devices/machine/s3520cf.cpp
+++ b/src/devices/machine/s3520cf.cpp
@@ -15,8 +15,7 @@ TODO:
***************************************************************************/
#include "emu.h"
-#include "machine/s3520cf.h"
-
+#include "s3520cf.h"
//**************************************************************************
@@ -164,8 +163,8 @@ void s3520cf_device::nvram_default()
bool s3520cf_device::nvram_read(util::read_stream &file)
{
- size_t actual;
- return !file.read(m_nvdata, 15, actual) && actual == 15;
+ auto const [err, actual] = read(file, m_nvdata, 15);
+ return !err && (actual == 15);
}
//-------------------------------------------------
@@ -175,8 +174,8 @@ bool s3520cf_device::nvram_read(util::read_stream &file)
bool s3520cf_device::nvram_write(util::write_stream &file)
{
- size_t actual;
- return !file.write(m_nvdata, 15, actual) && actual == 15;
+ auto const [err, actual] = write(file, m_nvdata, 15);
+ return !err;
}
void s3520cf_device::rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second)