Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 17:30:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2317 from DavidHaywood/pangfix2

Browse Source 
mitchell.cpp : just use the finder method for nvram
This commit is contained in:
R. Belmont 2017-05-17 15:07:50 -04:00 committed by GitHub
commit e73dc77873
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mame/drivers/mitchell.cpp
View File

@ -331,13 +331,13 @@ static ADDRESS_MAP_START( mitchell_map, AS_PROGRAM, 8, mitchell_state )
AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(pang_paletteram_r,pang_paletteram_w) /* Banked palette RAM */
AM_RANGE(0xc800, 0xcfff) AM_READWRITE(pang_colorram_r,pang_colorram_w) AM_SHARE("colorram") /* Attribute RAM */
AM_RANGE(0xd000, 0xdfff) AM_READWRITE(pang_videoram_r,pang_videoram_w) AM_SHARE("videoram")/* Banked char / OBJ RAM */
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("ram") /* Work RAM */
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("nvram") /* Work RAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( decrypted_opcodes_map, AS_DECRYPTED_OPCODES, 8, mitchell_state )
AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("bank0d")
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1d")
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("ram") /* Work RAM */
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("nvram") /* Work RAM */
ADDRESS_MAP_END
static ADDRESS_MAP_START( mitchell_io_map, AS_IO, 8, mitchell_state )
@ -363,7 +363,7 @@ static ADDRESS_MAP_START( spangbl_map, AS_PROGRAM, 8, mitchell_state )
AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(pang_paletteram_r, pang_paletteram_w) /* Banked palette RAM */
AM_RANGE(0xc800, 0xcfff) AM_READWRITE(pang_colorram_r, pang_colorram_w) AM_SHARE("colorram")/* Attribute RAM */
AM_RANGE(0xd000, 0xdfff) AM_READWRITE(pang_videoram_r, pang_videoram_w) AM_SHARE("videoram") /* Banked char / OBJ RAM */
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("ram") /* Work RAM */
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("nvram") /* Work RAM */
ADDRESS_MAP_END
WRITE8_MEMBER(mitchell_state::sound_command_w)
@ -2287,8 +2287,6 @@ DRIVER_INIT_MEMBER(mitchell_state,pangb)
{
m_input_type = 0;
bootleg_decode();
if (m_nvram != nullptr)
m_nvram->set_base(&m_dummy_nvram, sizeof(m_dummy_nvram)); /* for pangba */
}
DRIVER_INIT_MEMBER(mitchell_state,cworld)
{
@ -2303,27 +2301,23 @@ DRIVER_INIT_MEMBER(mitchell_state,hatena)
DRIVER_INIT_MEMBER(mitchell_state,spang)
{
m_input_type = 3;
m_nvram->set_base(m_mainram, m_mainram.bytes());
configure_banks(spang_decode);
}
DRIVER_INIT_MEMBER(mitchell_state,spangbl)
{
m_input_type = 3;
m_nvram->set_base(m_mainram, m_mainram.bytes());
bootleg_decode();
}
DRIVER_INIT_MEMBER(mitchell_state,spangj)
{
m_input_type = 3;
m_nvram->set_base(m_mainram, m_mainram.bytes());
configure_banks(spangj_decode);
}
DRIVER_INIT_MEMBER(mitchell_state,sbbros)
{
m_input_type = 3;
m_nvram->set_base(m_mainram, m_mainram.bytes());
configure_banks(sbbros_decode);
}
DRIVER_INIT_MEMBER(mitchell_state,qtono1)
@ -2367,13 +2361,11 @@ DRIVER_INIT_MEMBER(mitchell_state,marukin)
DRIVER_INIT_MEMBER(mitchell_state,block)
{
m_input_type = 2;
m_nvram->set_base(m_mainram, m_mainram.bytes());
configure_banks(block_decode);
}
DRIVER_INIT_MEMBER(mitchell_state,blockbl)
{
m_input_type = 2;
m_nvram->set_base(m_mainram, m_mainram.bytes());
bootleg_decode();
}

3
src/mame/includes/mitchell.h
View File

@ -30,7 +30,6 @@ public:
m_soundlatch(*this, "soundlatch"),
m_colorram(*this, "colorram"),
m_videoram(*this, "videoram"),
m_mainram(*this, "ram"),
m_bank1(*this, "bank1"),
m_bank0d(*this, "bank0d"),
m_bank1d(*this, "bank1d"),
@ -51,7 +50,6 @@ public:
/* memory pointers */
required_shared_ptr<uint8_t> m_colorram;
required_shared_ptr<uint8_t> m_videoram;
optional_shared_ptr<uint8_t> m_mainram;
required_memory_bank m_bank1;
optional_memory_bank m_bank0d;
optional_memory_bank m_bank1d;
@ -74,7 +72,6 @@ public:
int m_dial_selected;
int m_dir[2];
int m_keymatrix;
uint8_t m_dummy_nvram;
uint8_t m_irq_source;
DECLARE_READ8_MEMBER(pang_port5_r);