summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/imagedev/snapquik.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/imagedev/snapquik.h')
-rw-r--r--src/devices/imagedev/snapquik.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/devices/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h
index 35873ad93e9..55eb7b703d6 100644
--- a/src/devices/imagedev/snapquik.h
+++ b/src/devices/imagedev/snapquik.h
@@ -11,8 +11,6 @@
#ifndef MAME_DEVICES_IMAGEDEV_SNAPQUIK_H
#define MAME_DEVICES_IMAGEDEV_SNAPQUIK_H
-#pragma once
-
#include "softlist_dev.h"
typedef delegate<image_init_result (device_image_interface &,const char *, int)> snapquick_load_delegate;
@@ -23,7 +21,7 @@ class snapshot_image_device : public device_t,
{
public:
// construction/destruction
- snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U);
+ snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~snapshot_image_device();
void set_interface(const char *interface) { m_interface = interface; }
@@ -41,7 +39,8 @@ public:
virtual const char *image_interface() const override { return m_interface; }
virtual const char *file_extensions() const override { return m_file_extensions; }
- void set_handler(snapquick_load_delegate load, const char *ext, attotime delay = attotime::from_seconds(0)) { m_load = load; m_file_extensions = ext; m_delay = delay; };
+ TIMER_CALLBACK_MEMBER(process_snapshot_or_quickload);
+ void set_handler(snapquick_load_delegate load, const char *ext, seconds_t sec) { m_load = load; m_file_extensions = ext; m_delay_seconds = sec; };
protected:
snapshot_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -49,12 +48,11 @@ protected:
// device-level overrides
virtual void device_start() override;
- TIMER_CALLBACK_MEMBER(process_snapshot_or_quickload);
-
snapquick_load_delegate m_load; /* loading function */
const char * m_file_extensions; /* file extensions */
const char * m_interface;
- attotime m_delay; /* loading delay */
+ seconds_t m_delay_seconds; /* loading delay (seconds) */
+ attoseconds_t m_delay_attoseconds; /* loading delay (attoseconds) */
emu_timer *m_timer;
};
@@ -67,7 +65,7 @@ class quickload_image_device : public snapshot_image_device
{
public:
// construction/destruction
- quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U);
+ quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual iodevice_t image_type() const override { return IO_QUICKLOAD; }
};
@@ -90,16 +88,16 @@ DECLARE_DEVICE_TYPE(QUICKLOAD, quickload_image_device)
#define QUICKLOAD_LOAD_MEMBER(_class,_name) image_init_result QUICKLOAD_LOAD_NAME(_class,_name)(device_image_interface &image, const char *file_type, int quickload_size)
#define QUICKLOAD_LOAD_DELEGATE(_class,_name) snapquick_load_delegate(&QUICKLOAD_LOAD_NAME(_class,_name), downcast<_class *>(device->owner()))
-#define MCFG_SNAPSHOT_ADD(_tag, _class, _load, ...) \
+#define MCFG_SNAPSHOT_ADD(_tag, _class, _load, _file_extensions, _delay) \
MCFG_DEVICE_ADD(_tag, SNAPSHOT, 0) \
- static_cast<snapshot_image_device *>(device)->set_handler(SNAPSHOT_LOAD_DELEGATE(_class,_load), __VA_ARGS__);
+ static_cast<snapshot_image_device *>(device)->set_handler(SNAPSHOT_LOAD_DELEGATE(_class,_load), _file_extensions, _delay);
#define MCFG_SNAPSHOT_INTERFACE(_interface) \
downcast<snapshot_image_device &>(*device).set_interface(_interface);
-#define MCFG_QUICKLOAD_ADD(_tag, _class, _load, ...) \
+#define MCFG_QUICKLOAD_ADD(_tag, _class, _load, _file_extensions, _delay) \
MCFG_DEVICE_ADD(_tag, QUICKLOAD, 0) \
- static_cast<quickload_image_device *>(device)->set_handler(QUICKLOAD_LOAD_DELEGATE(_class,_load), __VA_ARGS__);
+ static_cast<quickload_image_device *>(device)->set_handler(QUICKLOAD_LOAD_DELEGATE(_class,_load), _file_extensions, _delay);
#define MCFG_QUICKLOAD_INTERFACE(_interface) \
downcast<quickload_image_device &>(*device).set_interface(_interface);