summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/ps2sif.h
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-07-22 20:41:57 +1000
committer Vas Crabb <vas@vastheman.com>2018-07-22 20:41:57 +1000
commitc0ab1c5aa4c172aa9e3e0deec5c2cc19d4f278d1 (patch)
tree359e7b0d6560d05a1872c2e18773a6e2e5038b7f /src/devices/machine/ps2sif.h
parent6d39a913e54c73640e4b5e7493b223c87a14c64a (diff)
(nw) srcclean and some cleanup:
* Make more #include guards follow standard format - using MAME_ as the prefix makes it easy to see which ones come from our code in a preprocessor dump, and having both src/devices/machine/foo.h and src/mame/machine/foo.h causes issues anyway * Get #include "emu.h" out of headers - it should only be the first thing in a complilation unit or we get differences in behaviour with PCH on/off * Add out-of-line destructors to some devices - it forces the compiler to instantiate the vtable in a certain location and avoids some non-deterministic compiler behaviours
Diffstat (limited to 'src/devices/machine/ps2sif.h')
-rw-r--r--src/devices/machine/ps2sif.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/devices/machine/ps2sif.h b/src/devices/machine/ps2sif.h
index a98a9c93485..27850ff2bcb 100644
--- a/src/devices/machine/ps2sif.h
+++ b/src/devices/machine/ps2sif.h
@@ -9,8 +9,8 @@
*
*/
-#ifndef DEVICES_MACHINE_PS2SIF_H
-#define DEVICES_MACHINE_PS2SIF_H
+#ifndef MAME_MACHINE_PS2SIF_H
+#define MAME_MACHINE_PS2SIF_H
#pragma once
@@ -20,13 +20,14 @@ class ps2_sif_device : public device_t
{
public:
template <typename T>
- ps2_sif_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&intc_tag)
- : ps2_sif_device(mconfig, tag, owner, (uint32_t)0)
- {
+ ps2_sif_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&intc_tag)
+ : ps2_sif_device(mconfig, tag, owner, (uint32_t)0)
+ {
m_intc.set_tag(std::forward<T>(intc_tag));
}
- ps2_sif_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ ps2_sif_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual ~ps2_sif_device() override;
DECLARE_READ32_MEMBER(ee_r);
DECLARE_WRITE32_MEMBER(ee_w);
@@ -40,8 +41,8 @@ public:
static const size_t MAX_FIFO_DEPTH;
protected:
- virtual void device_start() override;
- virtual void device_reset() override;
+ virtual void device_start() override;
+ virtual void device_reset() override;
required_device<ps2_intc_device> m_intc;
@@ -57,4 +58,4 @@ protected:
DECLARE_DEVICE_TYPE(SONYPS2_SIF, ps2_sif_device)
-#endif // DEVICES_MACHINE_PS2SIF_H
+#endif // MAME_MACHINE_PS2SIF_H