diff options
Diffstat (limited to 'src/mame/includes/scramble.h')
-rw-r--r-- | src/mame/includes/scramble.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/mame/includes/scramble.h b/src/mame/includes/scramble.h index 50ebe4a204c..a4b5ae5a369 100644 --- a/src/mame/includes/scramble.h +++ b/src/mame/includes/scramble.h @@ -30,16 +30,6 @@ public: optional_device<digitalker_device> m_digitalker; required_device<generic_latch_8_device> m_soundlatch; - uint8_t m_cavelon_bank; - - // harem - uint8_t m_harem_decrypt_mode; - uint8_t m_harem_decrypt_bit; - uint8_t m_harem_decrypt_clk; - uint8_t m_harem_decrypt_count; - std::unique_ptr<uint8_t[]> m_harem_decrypted_data; - std::unique_ptr<uint8_t[]> m_harem_decrypted_opcodes; - DECLARE_CUSTOM_INPUT_MEMBER(darkplnt_custom_r); DECLARE_CUSTOM_INPUT_MEMBER(ckongs_coinage_r); DECLARE_READ8_MEMBER(hncholms_prot_r); @@ -66,7 +56,6 @@ public: DECLARE_DRIVER_INIT(cavelon); DECLARE_DRIVER_INIT(mariner); - DECLARE_DRIVER_INIT(mrkougb); DECLARE_DRIVER_INIT(scramble_ppi); DECLARE_DRIVER_INIT(mars); DECLARE_DRIVER_INIT(ckongs); @@ -92,8 +81,6 @@ public: DECLARE_MACHINE_RESET(scramble); DECLARE_MACHINE_RESET(explorer); DECLARE_WRITE_LINE_MEMBER(scramble_sh_7474_q_callback); - void cavelon_banksw(); - inline int bit(int i,int n); DECLARE_READ8_MEMBER( mariner_protection_1_r ); DECLARE_READ8_MEMBER( mariner_protection_2_r ); DECLARE_READ8_MEMBER( triplep_pip_r ); @@ -102,12 +89,26 @@ public: DECLARE_WRITE8_MEMBER( cavelon_banksw_w ); DECLARE_READ8_MEMBER( hunchbks_mirror_r ); DECLARE_WRITE8_MEMBER( hunchbks_mirror_w ); - void sh_init(); DECLARE_WRITE8_MEMBER( scramble_sh_irqtrigger_w ); DECLARE_WRITE8_MEMBER( mrkougar_sh_irqtrigger_w ); IRQ_CALLBACK_MEMBER( scramble_sh_irq_callback ); + +private: + void cavelon_banksw(); + inline int bit(int i,int n); + void sh_init(); + + uint8_t m_cavelon_bank; + + // harem + uint8_t m_harem_decrypt_mode; + uint8_t m_harem_decrypt_bit; + uint8_t m_harem_decrypt_clk; + uint8_t m_harem_decrypt_count; + std::unique_ptr<uint8_t[]> m_harem_decrypted_data; + std::unique_ptr<uint8_t[]> m_harem_decrypted_opcodes; }; -/*----------- defined in audio/scramble.c -----------*/ +/*----------- defined in audio/scramble.cpp -----------*/ MACHINE_CONFIG_EXTERN( ad2083_audio ); |