summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Peter Ferrie <peter.ferrie@gmail.com>2019-02-04 10:05:46 -0800
committer R. Belmont <rb6502@users.noreply.github.com>2019-02-04 13:05:46 -0500
commite769e76ce4fb38d535cf32d27cf35c278ff207e0 (patch)
tree8568a04c0196c576ff8d8a2a3f2bbb8d9b1bc225 /src
parente22ffab3fa855e8624d090996b53376d4c6756e0 (diff)
enable sub-second snapshot timers (nw) (#4493)
* enable sub-second snapshot timers (nw) * switch to attotime, accept doubles * support LLVM extension in MSVC make vsllvm using extension from here: https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.llvm-toolchain
Diffstat (limited to 'src')
-rw-r--r--src/devices/bus/amiga/zorro/buddha.cpp8
-rw-r--r--src/devices/imagedev/snapquik.cpp4
-rw-r--r--src/devices/imagedev/snapquik.h6
-rw-r--r--src/emu/inpttype.h4
4 files changed, 10 insertions, 12 deletions
diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp
index b82f2d8818b..27d4f981ad0 100644
--- a/src/devices/bus/amiga/zorro/buddha.cpp
+++ b/src/devices/bus/amiga/zorro/buddha.cpp
@@ -231,8 +231,8 @@ READ16_MEMBER( buddha_device::ide_0_interrupt_r )
data = m_ide_0_interrupt << 15;
- if (VERBOSE && 0)
- logerror("ide_0_interrupt_r %04x [mask = %04x]\n", data, mem_mask);
+// if (VERBOSE)
+// logerror("ide_0_interrupt_r %04x [mask = %04x]\n", data, mem_mask);
return data;
}
@@ -243,8 +243,8 @@ READ16_MEMBER( buddha_device::ide_1_interrupt_r )
data = m_ide_1_interrupt << 15;
- if (VERBOSE && 0)
- logerror("ide_1_interrupt_r %04x [mask = %04x]\n", data, mem_mask);
+// if (VERBOSE)
+// logerror("ide_1_interrupt_r %04x [mask = %04x]\n", data, mem_mask);
return data;
}
diff --git a/src/devices/imagedev/snapquik.cpp b/src/devices/imagedev/snapquik.cpp
index 0e24b9f81ba..4126077513c 100644
--- a/src/devices/imagedev/snapquik.cpp
+++ b/src/devices/imagedev/snapquik.cpp
@@ -28,8 +28,6 @@ snapshot_image_device::snapshot_image_device(const machine_config &mconfig, devi
device_image_interface(mconfig, *this),
m_file_extensions(nullptr),
m_interface(nullptr),
- m_delay_seconds(0),
- m_delay_attoseconds(0),
m_timer(nullptr)
{
}
@@ -67,7 +65,7 @@ void snapshot_image_device::device_start()
image_init_result snapshot_image_device::call_load()
{
/* adjust the timer */
- m_timer->adjust(attotime(m_delay_seconds, m_delay_attoseconds),0);
+ m_timer->adjust(m_delay,0);
return image_init_result::PASS;
}
diff --git a/src/devices/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h
index 55eb7b703d6..d091e9e3118 100644
--- a/src/devices/imagedev/snapquik.h
+++ b/src/devices/imagedev/snapquik.h
@@ -40,7 +40,8 @@ public:
virtual const char *file_extensions() const override { return m_file_extensions; }
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; };
+ void set_handler(snapquick_load_delegate load, const char *ext, s32 delay) { m_load = load; m_file_extensions = ext; m_delay = attotime::from_seconds(delay); };
+ void set_handler(snapquick_load_delegate load, const char *ext, double delay) { m_load = load; m_file_extensions = ext; m_delay = attotime::from_double(delay); };
protected:
snapshot_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -51,8 +52,7 @@ protected:
snapquick_load_delegate m_load; /* loading function */
const char * m_file_extensions; /* file extensions */
const char * m_interface;
- seconds_t m_delay_seconds; /* loading delay (seconds) */
- attoseconds_t m_delay_attoseconds; /* loading delay (attoseconds) */
+ attotime m_delay; /* loading delay */
emu_timer *m_timer;
};
diff --git a/src/emu/inpttype.h b/src/emu/inpttype.h
index 6cc9440c669..c77df5f39f6 100644
--- a/src/emu/inpttype.h
+++ b/src/emu/inpttype.h
@@ -25,7 +25,7 @@
#pragma GCC push_options
#pragma GCC optimize ("O1")
#endif
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && !defined(__clang__)
#pragma optimize("", off)
#endif
@@ -954,6 +954,6 @@ inline void construct_core_types(simple_list<input_type_entry> &typelist)
#if not(defined(__arm__) || defined(__ARMEL__))
#pragma GCC pop_options
#endif
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && !defined(__clang__)
#pragma optimize("", on)
#endif