Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small cleanup (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2013-02-12 14:08:45 +00:00
parent 050cd56d29
commit bcc6ad7e52
3 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mame/drivers/scramble.c
View File

@ -262,11 +262,11 @@ static ADDRESS_MAP_START( hunchbks_map, AS_PROGRAM, 8, scramble_state )
AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(galaxold_videoram_w) AM_SHARE("videoram")
AM_RANGE(0x1c00, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x3fff) AM_READWRITE_LEGACY(hunchbks_mirror_r, hunchbks_mirror_w)
AM_RANGE(0x3000, 0x3fff) AM_READWRITE(hunchbks_mirror_r, hunchbks_mirror_w)
AM_RANGE(0x4000, 0x4fff) AM_ROM
AM_RANGE(0x5000, 0x5fff) AM_READWRITE_LEGACY(hunchbks_mirror_r, hunchbks_mirror_w)
AM_RANGE(0x5000, 0x5fff) AM_READWRITE(hunchbks_mirror_r, hunchbks_mirror_w)
AM_RANGE(0x6000, 0x6fff) AM_ROM
AM_RANGE(0x7000, 0x7fff) AM_READWRITE_LEGACY(hunchbks_mirror_r, hunchbks_mirror_w)
AM_RANGE(0x7000, 0x7fff) AM_READWRITE(hunchbks_mirror_r, hunchbks_mirror_w)
ADDRESS_MAP_END
@ -342,8 +342,8 @@ static ADDRESS_MAP_START( triplep_io_map, AS_IO, 8, scramble_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE_LEGACY("8910.1", ay8910_data_address_w)
AM_RANGE(0x01, 0x01) AM_DEVREAD_LEGACY("8910.1", ay8910_r)
AM_RANGE(0x02, 0x02) AM_READ_LEGACY(triplep_pip_r)
AM_RANGE(0x03, 0x03) AM_READ_LEGACY(triplep_pap_r)
AM_RANGE(0x02, 0x02) AM_READ(triplep_pip_r)
AM_RANGE(0x03, 0x03) AM_READ(triplep_pap_r)
ADDRESS_MAP_END
static ADDRESS_MAP_START( hotshock_sound_io_map, AS_IO, 8, scramble_state )

16
src/mame/includes/scramble.h
View File

@ -75,6 +75,14 @@ public:
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 );
DECLARE_READ8_MEMBER( triplep_pap_r );
DECLARE_READ8_MEMBER( cavelon_banksw_r );
DECLARE_WRITE8_MEMBER( cavelon_banksw_w );
DECLARE_READ8_MEMBER( hunchbks_mirror_r );
DECLARE_WRITE8_MEMBER( hunchbks_mirror_w );
};
@ -84,14 +92,6 @@ extern const i8255_interface(scramble_ppi_0_intf);
extern const i8255_interface(scramble_ppi_1_intf);
extern const i8255_interface(stratgyx_ppi_1_intf);
DECLARE_READ8_HANDLER( triplep_pip_r );
DECLARE_READ8_HANDLER( triplep_pap_r );
DECLARE_READ8_HANDLER( hunchbks_mirror_r );
DECLARE_WRITE8_HANDLER( hunchbks_mirror_w );
/*----------- defined in audio/scramble.c -----------*/
void scramble_sh_init(running_machine &machine);

38
src/mame/machine/scramble.c
View File

@ -73,18 +73,18 @@ READ8_MEMBER(scramble_state::scramble_protection_r)
}
static READ8_HANDLER( mariner_protection_1_r )
READ8_MEMBER(scramble_state::mariner_protection_1_r )
{
return 7;
}
static READ8_HANDLER( mariner_protection_2_r )
READ8_MEMBER(scramble_state::mariner_protection_2_r )
{
return 3;
}
READ8_HANDLER( triplep_pip_r )
READ8_MEMBER(scramble_state::triplep_pip_r )
{
logerror("PC %04x: triplep read port 2\n",space.device().safe_pc());
if (space.device().safe_pc() == 0x015a) return 0xff;
@ -92,7 +92,7 @@ READ8_HANDLER( triplep_pip_r )
else return 0;
}
READ8_HANDLER( triplep_pap_r )
READ8_MEMBER(scramble_state::triplep_pap_r )
{
logerror("PC %04x: triplep read port 3\n",space.device().safe_pc());
if (space.device().safe_pc() == 0x015d) return 0x04;
@ -111,37 +111,35 @@ void scramble_state::cavelon_banksw()
membank("bank1")->set_entry(m_cavelon_bank);
}
static READ8_HANDLER( cavelon_banksw_r )
READ8_MEMBER(scramble_state::cavelon_banksw_r )
{
scramble_state *state = space.machine().driver_data<scramble_state>();
state->cavelon_banksw();
cavelon_banksw();
if ((offset >= 0x0100) && (offset <= 0x0103))
return state->m_ppi8255_0->read(space, offset - 0x0100);
return m_ppi8255_0->read(space, offset - 0x0100);
else if ((offset >= 0x0200) && (offset <= 0x0203))
return state->m_ppi8255_1->read(space, offset - 0x0200);
return m_ppi8255_1->read(space, offset - 0x0200);
return 0xff;
}
static WRITE8_HANDLER( cavelon_banksw_w )
WRITE8_MEMBER(scramble_state::cavelon_banksw_w )
{
scramble_state *state = space.machine().driver_data<scramble_state>();
state->cavelon_banksw();
cavelon_banksw();
if ((offset >= 0x0100) && (offset <= 0x0103))
state->m_ppi8255_0->write(space, offset - 0x0100, data);
m_ppi8255_0->write(space, offset - 0x0100, data);
else if ((offset >= 0x0200) && (offset <= 0x0203))
state->m_ppi8255_1->write(space, offset - 0x0200, data);
m_ppi8255_1->write(space, offset - 0x0200, data);
}
READ8_HANDLER( hunchbks_mirror_r )
READ8_MEMBER(scramble_state::hunchbks_mirror_r )
{
return space.read_byte(0x1000+offset);
}
WRITE8_HANDLER( hunchbks_mirror_w )
WRITE8_MEMBER(scramble_state::hunchbks_mirror_w )
{
space.write_byte(0x1000+offset,data);
}
@ -160,7 +158,7 @@ DRIVER_INIT_MEMBER(scramble_state,scobra)
#ifdef UNUSED_FUNCTION
DRIVER_INIT_MEMBER(scramble_state,atlantis)
{
machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x6803, 0x6803, FUNC(scrambold_background_enable_w));
machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x6803, 0x6803, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
}
DRIVER_INIT_MEMBER(scramble_state,scramble)
@ -192,8 +190,8 @@ DRIVER_INIT_MEMBER(scramble_state,mariner)
machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x5800, 0x67ff);
machine().root_device().membank("bank1")->set_base(machine().root_device().memregion("maincpu")->base() + 0x5800);
machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x9008, 0x9008, FUNC(mariner_protection_2_r));
machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xb401, 0xb401, FUNC(mariner_protection_1_r));
machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x9008, 0x9008, read8_delegate(FUNC(scramble_state::mariner_protection_2_r),this));
machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xb401, 0xb401, read8_delegate(FUNC(scramble_state::mariner_protection_1_r),this));
/* ??? (it's NOT a background enable) */
/*machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x6803, 0x6803);*/
@ -279,7 +277,7 @@ DRIVER_INIT_MEMBER(scramble_state,cavelon)
cavelon_banksw();
/* A15 switches memory banks */
machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x8000, 0xffff, FUNC(cavelon_banksw_r), FUNC(cavelon_banksw_w));
machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x8000, 0xffff, read8_delegate(FUNC(scramble_state::cavelon_banksw_r),this), write8_delegate(FUNC(scramble_state::cavelon_banksw_w),this));
machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x2000, 0x2000); /* ??? */
machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x3800, 0x3801); /* looks suspicously like