summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes/namcos2.h
diff options
context:
space:
mode:
author David Haywood <hazemamewip@hotmail.com>2018-09-07 20:47:29 +0100
committer R. Belmont <rb6502@users.noreply.github.com>2018-09-07 15:47:29 -0400
commit3120dba77dfe30c9df835689e0ade4335a41387b (patch)
tree50003a0d94188a745bd658848c76574bb8734d46 /src/mame/includes/namcos2.h
parentbb0e5c9b7cead5ed85ae9843897eddfd9f143764 (diff)
stage1 namcoc65 / c68 devicification (#3974)
* stage1 namcoc65 / c68 devicification * progress (c68 button mappings currently incorrect) * silly (nw)
Diffstat (limited to 'src/mame/includes/namcos2.h')
-rw-r--r--src/mame/includes/namcos2.h26
1 files changed, 10 insertions, 16 deletions
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index d52979f9543..15746f731ed 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -18,6 +18,8 @@
#include "sound/c140.h"
#include "video/c45.h"
#include "video/namco_c116.h"
+#include "machine/namco65.h"
+#include "machine/namco68.h"
#include "cpu/m6502/m3745x.h"
#include "emupal.h"
@@ -112,7 +114,6 @@ public:
, m_dspslave(*this, "dspslave")
, m_gametype(0)
, m_c140(*this, "c140")
- , m_c68(*this, "c68")
, m_c116(*this, "c116")
, m_master_intc(*this, "master_intc")
, m_slave_intc(*this, "slave_intc")
@@ -127,6 +128,8 @@ public:
, m_audiocpu(*this, "audiocpu")
, m_slave(*this, "slave")
, m_mcu(*this, "mcu")
+ , m_c65(*this, "c65mcu")
+ , m_c68new(*this, "c68mcu")
, m_gfxdecode(*this, "gfxdecode")
, m_screen(*this, "screen")
, m_palette(*this, "palette")
@@ -139,7 +142,6 @@ public:
protected:
optional_device<c140_device> m_c140;
- optional_device<m37450_device> m_c68;
optional_device<namco_c116_device> m_c116;
optional_device<namco_c148_device> m_master_intc;
optional_device<namco_c148_device> m_slave_intc;
@@ -149,9 +151,6 @@ protected:
// game type helpers
bool is_system21();
- int m_mcu_analog_ctrl;
- int m_mcu_analog_data;
- int m_mcu_analog_complete;
std::unique_ptr<uint8_t[]> m_eeprom;
DECLARE_WRITE8_MEMBER(sound_reset_w);
@@ -266,18 +265,15 @@ protected:
DECLARE_WRITE8_MEMBER( namcos2_68k_eeprom_w );
DECLARE_READ8_MEMBER( namcos2_68k_eeprom_r );
- DECLARE_WRITE8_MEMBER( namcos2_mcu_port_d_w );
- DECLARE_READ8_MEMBER( namcos2_mcu_port_d_r );
- DECLARE_WRITE8_MEMBER( namcos2_mcu_analog_ctrl_w );
- DECLARE_READ8_MEMBER( namcos2_mcu_analog_ctrl_r );
- DECLARE_WRITE8_MEMBER( namcos2_mcu_analog_port_w );
- DECLARE_READ8_MEMBER( namcos2_mcu_analog_port_r );
DECLARE_WRITE8_MEMBER( namcos2_sound_bankselect_w );
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
optional_device<cpu_device> m_slave;
optional_device<cpu_device> m_mcu;
+ optional_device<namcoc65_device> m_c65;
+ optional_device<namcoc68_device> m_c68new;
+
optional_device<gfxdecode_device> m_gfxdecode;
optional_device<screen_device> m_screen;
required_device<palette_device> m_palette;
@@ -297,6 +293,8 @@ public:
void configure_c116_standard(machine_config &config);
void configure_c148_standard(machine_config &config);
+ void configure_c65_standard(machine_config &config);
+ void configure_c68_standard(machine_config &config);
void metlhawk(machine_config &config);
void gollygho(machine_config &config);
void assaultp(machine_config &config);
@@ -345,13 +343,10 @@ public:
void init_rthun2();
private:
- DECLARE_READ8_MEMBER(c68_p5_r);
- DECLARE_WRITE8_MEMBER(c68_p3_w);
DECLARE_READ16_MEMBER(dpram_word_r);
DECLARE_WRITE16_MEMBER(dpram_word_w);
DECLARE_READ8_MEMBER(dpram_byte_r);
DECLARE_WRITE8_MEMBER(dpram_byte_w);
- DECLARE_READ8_MEMBER(ack_mcu_vbl_r);
virtual void video_start() override;
void video_start_finallap();
@@ -407,7 +402,6 @@ private:
void RozCB_luckywld(uint16_t code, int *tile, int *mask, int which);
void RozCB_metlhawk(uint16_t code, int *tile, int *mask, int which);
- void c68_default_am(address_map &map);
void common_default_am(address_map &map);
void common_finallap_am(address_map &map);
void common_luckywld_am(address_map &map);
@@ -418,7 +412,7 @@ private:
void master_luckywld_am(address_map &map);
void master_metlhawk_am(address_map &map);
void master_sgunner_am(address_map &map);
- void mcu_default_am(address_map &map);
+
void namcos2_68k_default_cpu_board_am(address_map &map);
void slave_default_am(address_map &map);
void slave_finallap_am(address_map &map);