diff options
Diffstat (limited to 'src/devices/bus/nes/cony.h')
-rw-r--r-- | src/devices/bus/nes/cony.h | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/devices/bus/nes/cony.h b/src/devices/bus/nes/cony.h index 406952b69cb..b7b759a7fe1 100644 --- a/src/devices/bus/nes/cony.h +++ b/src/devices/bus/nes/cony.h @@ -1,7 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Fabio Priuli -#ifndef __NES_CONY_H -#define __NES_CONY_H +#ifndef MAME_BUS_NES_CONY_H +#define MAME_BUS_NES_CONY_H + +#pragma once #include "nxrom.h" @@ -12,12 +14,8 @@ class nes_cony_device : public nes_nrom_device { public: // construction/destruction - nes_cony_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_cony_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_READ8_MEMBER(read_l) override; virtual DECLARE_WRITE8_MEMBER(write_l) override; virtual DECLARE_WRITE8_MEMBER(write_h) override; @@ -25,13 +23,20 @@ public: virtual void pcb_reset() override; protected: + static constexpr device_timer_id TIMER_IRQ = 0; + + nes_cony_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; + virtual void set_prg(); virtual void set_chr(); uint16_t m_irq_count; int m_irq_enable; - static const device_timer_id TIMER_IRQ = 0; emu_timer *irq_timer; uint8_t m_latch1, m_latch2; @@ -49,14 +54,16 @@ public: // construction/destruction nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // device-level overrides - virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l) override; virtual DECLARE_WRITE8_MEMBER(write_l) override; virtual DECLARE_WRITE8_MEMBER(write_h) override; virtual void pcb_reset() override; +protected: + // device-level overrides + virtual void device_start() override; + private: virtual void set_prg() override; virtual void set_chr() override; @@ -65,11 +72,8 @@ private: }; - - - // device type definition -extern const device_type NES_CONY; -extern const device_type NES_YOKO; +DECLARE_DEVICE_TYPE(NES_CONY, nes_cony_device) +DECLARE_DEVICE_TYPE(NES_YOKO, nes_yoko_device) -#endif +#endif // MAME_BUS_NES_CONY_H |