diff options
Diffstat (limited to 'src/mame/includes/nes.h')
-rw-r--r-- | src/mame/includes/nes.h | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/src/mame/includes/nes.h b/src/mame/includes/nes.h index c9d5ec6470f..1ba3f013236 100644 --- a/src/mame/includes/nes.h +++ b/src/mame/includes/nes.h @@ -8,11 +8,14 @@ ****************************************************************************/ -#ifndef NES_H_ -#define NES_H_ +#ifndef MAME_INCLUDES_NES_H +#define MAME_INCLUDES_NES_H + +#pragma once #include "video/ppu2c0x.h" +#include "bus/nes/disksys.h" #include "bus/nes/nes_slot.h" #include "bus/nes/nes_carts.h" #include "bus/nes_ctrl/ctrl.h" @@ -49,32 +52,16 @@ class nes_state : public driver_device { public: nes_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_ppu(*this, "ppu"), - m_ctrl1(*this, "ctrl1"), - m_ctrl2(*this, "ctrl2"), - m_exp(*this, "exp"), - m_cartslot(*this, "nes_slot"), - m_disk(*this, "disk") - { } - - /* video-related */ - int m_last_frame_flip; - - /* misc */ - ioport_port *m_io_disksel; - - uint8_t *m_vram; - std::unique_ptr<uint8_t[]> m_ciram; //PPU nametable RAM - external to PPU! - - required_device<cpu_device> m_maincpu; - required_device<ppu2c0x_device> m_ppu; - required_device<nes_control_port_device> m_ctrl1; - required_device<nes_control_port_device> m_ctrl2; - optional_device<nes_control_port_device> m_exp; - optional_device<nes_cart_slot_device> m_cartslot; - optional_device<nes_disksys_device> m_disk; + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_ppu(*this, "ppu") + , m_ctrl1(*this, "ctrl1") + , m_ctrl2(*this, "ctrl2") + , m_exp(*this, "exp") + , m_cartslot(*this, "nes_slot") + , m_disk(*this, "disk") + { + } int nes_ppu_vidaccess(int address, int data); void ppu_nmi(int *ppu_regs); @@ -104,7 +91,24 @@ public: void setup_disk(nes_disksys_device *slot); private: + /* video-related */ + int m_last_frame_flip; + + /* misc */ + ioport_port *m_io_disksel; + + uint8_t *m_vram; + std::unique_ptr<uint8_t[]> m_ciram; //PPU nametable RAM - external to PPU! + + required_device<cpu_device> m_maincpu; + required_device<ppu2c0x_device> m_ppu; + required_device<nes_control_port_device> m_ctrl1; + required_device<nes_control_port_device> m_ctrl2; + optional_device<nes_control_port_device> m_exp; + optional_device<nes_cart_slot_device> m_cartslot; + optional_device<nes_disksys_device> m_disk; + memory_bank *m_prg_bank_mem[5]; }; -#endif /* NES_H_ */ +#endif // MAME_INCLUDES_NES_H |