summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/namcos21.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/namcos21.cpp')
-rw-r--r--src/mame/drivers/namcos21.cpp90
1 files changed, 41 insertions, 49 deletions
diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp
index 4918e168877..5b716da7488 100644
--- a/src/mame/drivers/namcos21.cpp
+++ b/src/mame/drivers/namcos21.cpp
@@ -316,7 +316,7 @@ public:
m_palette(*this, "palette"),
m_screen(*this, "screen"),
m_audiobank(*this, "audiobank"),
- m_mpDualPortRAM(*this,"mpdualportram"),
+ m_dpram(*this, "dpram"),
m_gpu_intc(*this, "gpu_intc"),
m_namcos21_3d(*this, "namcos21_3d"),
m_namcos21_dsp(*this, "namcos21dsp")
@@ -339,7 +339,7 @@ private:
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
required_memory_bank m_audiobank;
- required_shared_ptr<uint8_t> m_mpDualPortRAM;
+ required_shared_ptr<uint8_t> m_dpram;
required_device<namco_c148_device> m_gpu_intc;
required_device<namcos21_3d_device> m_namcos21_3d;
required_device<namcos21_dsp_device> m_namcos21_dsp;
@@ -351,13 +351,13 @@ private:
uint16_t m_winrun_color;
uint16_t m_winrun_gpu_register[0x10/2];
- DECLARE_READ16_MEMBER(namcos21_video_enable_r);
- DECLARE_WRITE16_MEMBER(namcos21_video_enable_w);
+ DECLARE_READ16_MEMBER(video_enable_r);
+ DECLARE_WRITE16_MEMBER(video_enable_w);
- DECLARE_READ16_MEMBER(namcos2_68k_dualportram_word_r);
- DECLARE_WRITE16_MEMBER(namcos2_68k_dualportram_word_w);
- DECLARE_READ8_MEMBER(namcos2_dualportram_byte_r);
- DECLARE_WRITE8_MEMBER(namcos2_dualportram_byte_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_READ16_MEMBER(winrun_gpu_color_r);
DECLARE_WRITE16_MEMBER(winrun_gpu_color_w);
@@ -366,10 +366,10 @@ private:
DECLARE_WRITE16_MEMBER(winrun_gpu_videoram_w);
DECLARE_READ16_MEMBER(winrun_gpu_videoram_r);
- DECLARE_WRITE8_MEMBER( namcos2_68k_eeprom_w );
- DECLARE_READ8_MEMBER( namcos2_68k_eeprom_r );
+ DECLARE_WRITE8_MEMBER(eeprom_w);
+ DECLARE_READ8_MEMBER(eeprom_r);
- DECLARE_WRITE8_MEMBER( namcos2_sound_bankselect_w );
+ DECLARE_WRITE8_MEMBER(sound_bankselect_w);
DECLARE_WRITE8_MEMBER(sound_reset_w);
DECLARE_WRITE8_MEMBER(system_reset_w);
@@ -379,17 +379,14 @@ private:
TIMER_DEVICE_CALLBACK_MEMBER(screen_scanline);
- DECLARE_MACHINE_START(namcos21);
- DECLARE_MACHINE_RESET(namcos21);
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
- uint32_t screen_update_namcos21(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_winrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_driveyes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void winrun_bitmap_draw(bitmap_ind16 &bitmap, const rectangle &cliprect);
void configure_c65_namcos21(machine_config &config);
- void configure_c68_namcos21(machine_config &config);
void winrun_master_map(address_map &map);
void winrun_slave_map(address_map &map);
@@ -475,7 +472,7 @@ void namcos21_state::winrun_bitmap_draw(bitmap_ind16 &bitmap, const rectangle &c
}
-uint32_t namcos21_state::screen_update_winrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t namcos21_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0xff, cliprect );
@@ -490,17 +487,17 @@ uint32_t namcos21_state::screen_update_winrun(screen_device &screen, bitmap_ind1
-READ16_MEMBER(namcos21_state::namcos21_video_enable_r)
+READ16_MEMBER(namcos21_state::video_enable_r)
{
return m_video_enable;
}
-WRITE16_MEMBER(namcos21_state::namcos21_video_enable_w)
+WRITE16_MEMBER(namcos21_state::video_enable_w)
{
COMBINE_DATA( &m_video_enable ); /* 0x40 = enable */
if( m_video_enable!=0 && m_video_enable!=0x40 )
{
- logerror( "unexpected namcos21_video_enable_w=0x%x\n", m_video_enable );
+ logerror( "unexpected video_enable_w=0x%x\n", m_video_enable );
}
}
@@ -508,27 +505,27 @@ WRITE16_MEMBER(namcos21_state::namcos21_video_enable_w)
/* dual port ram memory handlers */
-READ16_MEMBER(namcos21_state::namcos2_68k_dualportram_word_r)
+READ16_MEMBER(namcos21_state::dpram_word_r)
{
- return m_mpDualPortRAM[offset];
+ return m_dpram[offset];
}
-WRITE16_MEMBER(namcos21_state::namcos2_68k_dualportram_word_w)
+WRITE16_MEMBER(namcos21_state::dpram_word_w)
{
if( ACCESSING_BITS_0_7 )
{
- m_mpDualPortRAM[offset] = data&0xff;
+ m_dpram[offset] = data&0xff;
}
}
-READ8_MEMBER(namcos21_state::namcos2_dualportram_byte_r)
+READ8_MEMBER(namcos21_state::dpram_byte_r)
{
- return m_mpDualPortRAM[offset];
+ return m_dpram[offset];
}
-WRITE8_MEMBER(namcos21_state::namcos2_dualportram_byte_w)
+WRITE8_MEMBER(namcos21_state::dpram_byte_w)
{
- m_mpDualPortRAM[offset] = data;
+ m_dpram[offset] = data;
}
/******************************************************************************/
@@ -537,7 +534,7 @@ void namcos21_state::winrun_master_map(address_map &map)
{
map(0x000000, 0x03ffff).rom();
map(0x100000, 0x10ffff).ram(); /* work RAM */
- map(0x180000, 0x183fff).rw(FUNC(namcos21_state::namcos2_68k_eeprom_r), FUNC(namcos21_state::namcos2_68k_eeprom_w)).umask16(0x00ff);
+ map(0x180000, 0x183fff).rw(FUNC(namcos21_state::eeprom_r), FUNC(namcos21_state::eeprom_w)).umask16(0x00ff);
map(0x1c0000, 0x1fffff).m(m_master_intc, FUNC(namco_c148_device::map));
// DSP Related
@@ -552,7 +549,7 @@ void namcos21_state::winrun_master_map(address_map &map)
map(0x600000, 0x60ffff).ram().share("gpu_comram");
map(0x800000, 0x87ffff).rom().region("data", 0);
map(0x900000, 0x90ffff).ram().share("sharedram");
- map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w));
+ map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::dpram_word_r), FUNC(namcos21_state::dpram_word_w));
map(0xb00000, 0xb03fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w));
map(0xb80000, 0xb8000f).m(m_sci, FUNC(namco_c139_device::regs_map));
}
@@ -565,7 +562,7 @@ void namcos21_state::winrun_slave_map(address_map &map)
map(0x600000, 0x60ffff).ram().share("gpu_comram");
map(0x800000, 0x87ffff).rom().region("data", 0);
map(0x900000, 0x90ffff).ram().share("sharedram");
- map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::namcos2_68k_dualportram_word_r), FUNC(namcos21_state::namcos2_68k_dualportram_word_w));
+ map(0xa00000, 0xa00fff).rw(FUNC(namcos21_state::dpram_word_r), FUNC(namcos21_state::dpram_word_w));
map(0xb00000, 0xb03fff).rw(m_sci, FUNC(namco_c139_device::ram_r), FUNC(namco_c139_device::ram_w));
map(0xb80000, 0xb8000f).m(m_sci, FUNC(namco_c139_device::regs_map));
}
@@ -597,12 +594,12 @@ void namcos21_state::sound_map(address_map &map)
map(0x3000, 0x3003).nopw(); /* ? */
map(0x4000, 0x4001).rw("ymsnd", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
map(0x5000, 0x6fff).rw(m_c140, FUNC(c140_device::c140_r), FUNC(c140_device::c140_w));
- map(0x7000, 0x77ff).rw(FUNC(namcos21_state::namcos2_dualportram_byte_r), FUNC(namcos21_state::namcos2_dualportram_byte_w)).share("mpdualportram");
- map(0x7800, 0x7fff).rw(FUNC(namcos21_state::namcos2_dualportram_byte_r), FUNC(namcos21_state::namcos2_dualportram_byte_w)); /* mirror */
+ map(0x7000, 0x77ff).rw(FUNC(namcos21_state::dpram_byte_r), FUNC(namcos21_state::dpram_byte_w)).share("dpram");
+ map(0x7800, 0x7fff).rw(FUNC(namcos21_state::dpram_byte_r), FUNC(namcos21_state::dpram_byte_w)); /* mirror */
map(0x8000, 0x9fff).ram();
map(0xa000, 0xbfff).nopw(); /* amplifier enable on 1st write */
map(0xc000, 0xffff).nopw(); /* avoid debug log noise; games write frequently to 0xe000 */
- map(0xc000, 0xc001).w(FUNC(namcos21_state::namcos2_sound_bankselect_w));
+ map(0xc000, 0xc001).w(FUNC(namcos21_state::sound_bankselect_w));
map(0xd001, 0xd001).nopw(); /* watchdog */
map(0xd000, 0xffff).rom().region("audiocpu", 0x01000);
}
@@ -631,8 +628,8 @@ void namcos21_state::configure_c65_namcos21(machine_config &config)
m_c65->an5_in_cb().set_ioport("AN5");
m_c65->an6_in_cb().set_ioport("AN6");
m_c65->an7_in_cb().set_ioport("AN7");
- m_c65->dp_in_callback().set(FUNC(namcos21_state::namcos2_dualportram_byte_r));
- m_c65->dp_out_callback().set(FUNC(namcos21_state::namcos2_dualportram_byte_w));
+ m_c65->dp_in_callback().set(FUNC(namcos21_state::dpram_byte_r));
+ m_c65->dp_out_callback().set(FUNC(namcos21_state::dpram_byte_w));
}
/*************************************************************/
@@ -765,7 +762,7 @@ static INPUT_PORTS_START( winrungp )
PORT_DIPSETTING( 0x00, "4M" )
INPUT_PORTS_END
-WRITE8_MEMBER( namcos21_state::namcos2_sound_bankselect_w )
+WRITE8_MEMBER( namcos21_state::sound_bankselect_w )
{
m_audiobank->set_entry(data>>4);
}
@@ -799,22 +796,20 @@ void namcos21_state::reset_all_subcpus(int state)
m_c65->ext_reset(state);
}
-WRITE8_MEMBER(namcos21_state::namcos2_68k_eeprom_w)
+WRITE8_MEMBER(namcos21_state::eeprom_w)
{
m_eeprom[offset] = data;
}
-READ8_MEMBER(namcos21_state::namcos2_68k_eeprom_r)
+READ8_MEMBER(namcos21_state::eeprom_r)
{
return m_eeprom[offset];
}
-MACHINE_RESET_MEMBER(namcos21_state, namcos21)
+void namcos21_state::machine_reset()
{
- address_space &audio_space = m_audiocpu->space(AS_PROGRAM);
-
/* Initialise the bank select in the sound CPU */
- namcos2_sound_bankselect_w(audio_space, 0, 0); /* Page in bank 0 */
+ m_audiobank->set_entry(0); /* Page in bank 0 */
m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE );
@@ -824,7 +819,7 @@ MACHINE_RESET_MEMBER(namcos21_state, namcos21)
-MACHINE_START_MEMBER(namcos21_state,namcos21)
+void namcos21_state::machine_start()
{
m_eeprom = std::make_unique<uint8_t[]>(0x2000);
subdevice<nvram_device>("nvram")->set_base(m_eeprom.get(), 0x2000);
@@ -833,7 +828,6 @@ MACHINE_START_MEMBER(namcos21_state,namcos21)
for (int i = 0; i < 0x10; i++)
m_audiobank->configure_entry(i, memregion("audiocpu")->base() + (i % max) * 0x4000);
- m_audiobank->set_entry(0);
}
TIMER_DEVICE_CALLBACK_MEMBER(namcos21_state::screen_scanline)
@@ -892,13 +886,11 @@ MACHINE_CONFIG_START(namcos21_state::winrun)
MCFG_QUANTUM_TIME(attotime::from_hz(6000)) /* 100 CPU slices per frame */
- MCFG_MACHINE_START_OVERRIDE(namcos21_state,namcos21)
- MCFG_MACHINE_RESET_OVERRIDE(namcos21_state,namcos21)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS_NAMCO480I
- MCFG_SCREEN_UPDATE_DRIVER(namcos21_state, screen_update_winrun)
+ MCFG_SCREEN_UPDATE_DRIVER(namcos21_state, screen_update)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", NAMCOS21_NUM_COLORS)