summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/nes/legacy.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/nes/legacy.h')
-rw-r--r--src/devices/bus/nes/legacy.h35
1 files changed, 20 insertions, 15 deletions
diff --git a/src/devices/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h
index 396eec92b46..91b44e108c0 100644
--- a/src/devices/bus/nes/legacy.h
+++ b/src/devices/bus/nes/legacy.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Fabio Priuli
-#ifndef __NES_LEGACY_H
-#define __NES_LEGACY_H
+#ifndef MAME_BUS_NES_LEGACY_H
+#define MAME_BUS_NES_LEGACY_H
+
+#pragma once
#include "nxrom.h"
@@ -14,11 +16,13 @@ public:
// construction/destruction
nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
- virtual void device_start() override;
virtual DECLARE_WRITE8_MEMBER(write_h) override;
virtual void pcb_reset() override;
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
};
@@ -28,12 +32,8 @@ class nes_ffe4_device : public nes_nrom_device
{
public:
// construction/destruction
- nes_ffe4_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
- virtual void device_start() override;
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual DECLARE_WRITE8_MEMBER(write_l) override;
virtual DECLARE_WRITE8_MEMBER(write_h) override;
virtual DECLARE_READ8_MEMBER(chr_r) override;
@@ -42,10 +42,17 @@ public:
virtual void pcb_reset() override;
protected:
+ static constexpr device_timer_id TIMER_IRQ = 0;
+
+ nes_ffe4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
uint16_t m_irq_count;
int m_irq_enable;
- static const device_timer_id TIMER_IRQ = 0;
emu_timer *irq_timer;
uint8_t m_latch;
@@ -71,11 +78,9 @@ public:
};
-
// device type definition
-extern const device_type NES_FFE3;
-extern const device_type NES_FFE4;
-extern const device_type NES_FFE8;
-
+DECLARE_DEVICE_TYPE(NES_FFE3, nes_ffe3_device)
+DECLARE_DEVICE_TYPE(NES_FFE4, nes_ffe4_device)
+DECLARE_DEVICE_TYPE(NES_FFE8, nes_ffe8_device)
-#endif
+#endif // MAME_BUS_NES_LEGACY_H