summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/namcofl.h2
-rw-r--r--src/mame/includes/namconb1.h2
-rw-r--r--src/mame/includes/namcos2.h15
3 files changed, 13 insertions, 6 deletions
diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h
index e59e77e0728..b59fb6f7620 100644
--- a/src/mame/includes/namcofl.h
+++ b/src/mame/includes/namcofl.h
@@ -24,6 +24,7 @@ class namcofl_state : public namcos2_shared_state
public:
namcofl_state(const machine_config &mconfig, device_type type, const char *tag) :
namcos2_shared_state(mconfig, type, tag),
+ m_mcu(*this, "mcu"),
m_in0(*this, "IN0"),
m_in1(*this, "IN1"),
m_in2(*this, "IN2"),
@@ -39,6 +40,7 @@ public:
void init_finalapr();
private:
+ required_device<cpu_device> m_mcu;
required_ioport m_in0;
required_ioport m_in1;
required_ioport m_in2;
diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h
index 26d527b1cd9..3949c676cbd 100644
--- a/src/mame/includes/namconb1.h
+++ b/src/mame/includes/namconb1.h
@@ -30,6 +30,7 @@ class namconb1_state : public namcos2_shared_state
public:
namconb1_state(const machine_config &mconfig, device_type type, const char *tag) :
namcos2_shared_state(mconfig, type, tag),
+ m_mcu(*this, "mcu"),
m_eeprom(*this, "eeprom"),
m_p1(*this, "P1"),
m_p2(*this, "P2"),
@@ -62,6 +63,7 @@ public:
void init_gslgr94u();
private:
+ required_device<cpu_device> m_mcu;
required_device<eeprom_parallel_28xx_device> m_eeprom;
required_ioport m_p1;
required_ioport m_p2;
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index 15746f731ed..5ffe5e712e9 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -127,9 +127,8 @@ public:
, m_maincpu(*this, "maincpu")
, m_audiocpu(*this, "audiocpu")
, m_slave(*this, "slave")
- , m_mcu(*this, "mcu")
, m_c65(*this, "c65mcu")
- , m_c68new(*this, "c68mcu")
+ , m_c68(*this, "c68mcu")
, m_gfxdecode(*this, "gfxdecode")
, m_screen(*this, "screen")
, m_palette(*this, "palette")
@@ -147,7 +146,7 @@ protected:
optional_device<namco_c148_device> m_slave_intc;
optional_device<namco_c139_device> m_sci;
optional_device<cpu_device> m_gpu; //to be moved to namco21_state after disentangling
-
+
// game type helpers
bool is_system21();
@@ -228,6 +227,7 @@ protected:
optional_shared_ptr<uint16_t> m_c169_roz_videoram;
int m_c169_roz_gfxbank;
uint8_t *m_c169_roz_mask;
+ uint32_t m_c169_roz_rammask;
// C355 Motion Object Emulation
typedef delegate<int (int)> c355_obj_code2tile_delegate;
@@ -270,9 +270,8 @@ protected:
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<namcoc68_device> m_c68;
optional_device<gfxdecode_device> m_gfxdecode;
optional_device<screen_device> m_screen;
@@ -300,12 +299,17 @@ public:
void assaultp(machine_config &config);
void sgunner2(machine_config &config);
void base2(machine_config &config);
+ void finallap_noio(machine_config &config);
void finallap(machine_config &config);
+ void finallap_c68(machine_config &config);
void finalap2(machine_config &config);
+ void finalap3(machine_config &config);
void luckywld(machine_config &config);
void base3(machine_config &config);
void sgunner(machine_config &config);
+ void base_noio(machine_config &config);
void base(machine_config &config);
+ void base_c68(machine_config &config);
void init_cosmogng();
void init_sgunner2();
@@ -336,7 +340,6 @@ public:
void init_sws93();
void init_metlhawk();
void init_sws92g();
- void init_assaultp_hack();
void init_assaultp();
void init_ordyne();
void init_marvland();