diff options
Diffstat (limited to 'src/mame/includes/snes.h')
-rw-r--r-- | src/mame/includes/snes.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h index 82227a3fd1e..e13ed483b38 100644 --- a/src/mame/includes/snes.h +++ b/src/mame/includes/snes.h @@ -299,6 +299,22 @@ struct snes_cart_info class snes_state : public driver_device { public: + snes_state(const machine_config &mconfig, device_type type, const char *tag) + : driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), + m_soundcpu(*this, "soundcpu"), + m_spc700(*this, "spc700"), + m_ppu(*this, "ppu"), + m_screen(*this, "screen") { } + + void init_snes(); + void init_snes_hirom(); + void init_snes_mess(); + void init_snesst(); + + uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + +protected: enum { TIMER_NMI_TICK, @@ -311,14 +327,6 @@ public: TIMER_SNES_LAST }; - snes_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_soundcpu(*this, "soundcpu"), - m_spc700(*this, "spc700"), - m_ppu(*this, "ppu"), - m_screen(*this, "screen") { } - /* misc */ uint16_t m_hblank_offset; uint32_t m_wram_address; @@ -374,8 +382,6 @@ public: snes_cart_info m_cart; // used by NSS/SFCBox only! to be moved in a derived class! void rom_map_setup(uint32_t size); - uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - /* devices */ required_device<_5a22_device> m_maincpu; required_device<spc700_device> m_soundcpu; @@ -383,12 +389,6 @@ public: required_device<snes_ppu_device> m_ppu; required_device<screen_device> m_screen; - - void init_snes(); - void init_snes_hirom(); - void init_snes_mess(); - void init_snesst(); - inline int dma_abus_valid(uint32_t address); inline uint8_t abus_read(address_space &space, uint32_t abus); inline void dma_transfer(address_space &space, uint8_t dma, uint32_t abus, uint16_t bbus); @@ -435,7 +435,6 @@ public: virtual void machine_start() override; virtual void machine_reset() override; -protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; |