summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/vsnes.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/vsnes.c')
-rw-r--r--src/mame/machine/vsnes.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index 787bca931ca..d426e2d3a3c 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -202,8 +202,8 @@ MACHINE_START( vsnes )
ppu1_space->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(vsnes_state::vsnes_nt0_r),state), write8_delegate(FUNC(vsnes_state::vsnes_nt0_w),state));
- state->m_vrom[0] = machine.region("gfx1")->base();
- state->m_vrom_size[0] = machine.region("gfx1")->bytes();
+ state->m_vrom[0] = machine.root_device().memregion("gfx1")->base();
+ state->m_vrom_size[0] = state->memregion("gfx1")->bytes();
state->m_vrom_banks = state->m_vrom_size[0] / 0x400;
/* establish chr banks */
@@ -227,10 +227,10 @@ MACHINE_START( vsnes )
MACHINE_START( vsdual )
{
vsnes_state *state = machine.driver_data<vsnes_state>();
- state->m_vrom[0] = machine.region("gfx1")->base();
- state->m_vrom[1] = machine.region("gfx2")->base();
- state->m_vrom_size[0] = machine.region("gfx1")->bytes();
- state->m_vrom_size[1] = machine.region("gfx2")->bytes();
+ state->m_vrom[0] = machine.root_device().memregion("gfx1")->base();
+ state->m_vrom[1] = machine.root_device().memregion("gfx2")->base();
+ state->m_vrom_size[0] = machine.root_device().memregion("gfx1")->bytes();
+ state->m_vrom_size[1] = state->memregion("gfx2")->bytes();
/* establish nametable ram */
state->m_nt_ram[0] = auto_alloc_array(machine, UINT8, 0x1000);
@@ -419,7 +419,7 @@ WRITE8_MEMBER(vsnes_state::vskonami_rom_banking)
case 2: /* code bank 1 */
case 4: /* code bank 2 */
{
- UINT8 *prg = machine().region("maincpu")->base();
+ UINT8 *prg = memregion("maincpu")->base();
memcpy(&prg[0x08000 + reg * 0x1000], &prg[bankoffset], 0x2000);
}
break;
@@ -438,7 +438,7 @@ DRIVER_INIT( vskonami )
{
/* We do manual banking, in case the code falls through */
/* Copy the initial banks */
- UINT8 *prg = machine.region("maincpu")->base();
+ UINT8 *prg = machine.root_device().memregion("maincpu")->base();
memcpy(&prg[0x08000], &prg[0x18000], 0x8000);
/* banking is done with writes to the $8000-$ffff area */
@@ -454,7 +454,7 @@ WRITE8_MEMBER(vsnes_state::vsgshoe_gun_in0_w)
int addr;
if((data & 0x04) != m_old_bank)
{
- UINT8 *prg = machine().region("maincpu")->base();
+ UINT8 *prg = memregion("maincpu")->base();
m_old_bank = data & 0x04;
addr = m_old_bank ? 0x12000: 0x10000;
memcpy(&prg[0x08000], &prg[addr], 0x2000);
@@ -467,7 +467,7 @@ DRIVER_INIT( vsgshoe )
{
vsnes_state *state = machine.driver_data<vsnes_state>();
/* set up the default bank */
- UINT8 *prg = machine.region("maincpu")->base();
+ UINT8 *prg = state->memregion("maincpu")->base();
memcpy (&prg[0x08000], &prg[0x12000], 0x2000);
/* vrom switching is enabled with bit 2 of $4016 */
@@ -562,7 +562,7 @@ WRITE8_MEMBER(vsnes_state::drmario_rom_banking)
case 3: /* program banking */
{
int bank = (m_drmario_shiftreg & 0x03) * 0x4000;
- UINT8 *prg = machine().region("maincpu")->base();
+ UINT8 *prg = memregion("maincpu")->base();
if (!m_size16k)
{
@@ -596,7 +596,7 @@ DRIVER_INIT( drmario )
vsnes_state *state = machine.driver_data<vsnes_state>();
/* We do manual banking, in case the code falls through */
/* Copy the initial banks */
- UINT8 *prg = machine.region("maincpu")->base();
+ UINT8 *prg = state->memregion("maincpu")->base();
memcpy(&prg[0x08000], &prg[0x10000], 0x4000);
memcpy(&prg[0x0c000], &prg[0x1c000], 0x4000);
@@ -613,7 +613,7 @@ DRIVER_INIT( drmario )
WRITE8_MEMBER(vsnes_state::vsvram_rom_banking)
{
int rombank = 0x10000 + (data & 7) * 0x4000;
- UINT8 *prg = machine().region("maincpu")->base();
+ UINT8 *prg = memregion("maincpu")->base();
memcpy(&prg[0x08000], &prg[rombank], 0x4000);
}
@@ -622,7 +622,7 @@ DRIVER_INIT( vsvram )
{
vsnes_state *state = machine.driver_data<vsnes_state>();
/* when starting the game, the 1st 16k and the last 16k are loaded into the 2 banks */
- UINT8 *prg = machine.region("maincpu")->base();
+ UINT8 *prg = state->memregion("maincpu")->base();
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* banking is done with writes to the $8000-$ffff area */
@@ -638,7 +638,7 @@ DRIVER_INIT( vsvram )
static void mapper4_set_prg( running_machine &machine )
{
vsnes_state *state = machine.driver_data<vsnes_state>();
- UINT8 *prg = machine.region("maincpu")->base();
+ UINT8 *prg = state->memregion("maincpu")->base();
UINT8 prg_flip = (state->m_MMC3_cmd & 0x40) ? 2 : 0;
memcpy(&prg[0x8000], &prg[0x2000 * (state->m_MMC3_prg_bank[0 ^ prg_flip] & state->m_MMC3_prg_mask) + 0x10000], 0x2000);
@@ -773,9 +773,9 @@ WRITE8_MEMBER(vsnes_state::mapper4_w)
DRIVER_INIT( MMC3 )
{
vsnes_state *state = machine.driver_data<vsnes_state>();
- UINT8 *prg = machine.region("maincpu")->base();
+ UINT8 *prg = machine.root_device().memregion("maincpu")->base();
state->m_IRQ_enable = state->m_IRQ_count = state->m_IRQ_count_latch = 0;
- int MMC3_prg_chunks = (machine.region("maincpu")->bytes() - 0x10000) / 0x4000;
+ int MMC3_prg_chunks = (state->memregion("maincpu")->bytes() - 0x10000) / 0x4000;
state->m_MMC3_prg_bank[0] = state->m_MMC3_prg_bank[2] = 0xfe;
state->m_MMC3_prg_bank[1] = state->m_MMC3_prg_bank[3] = 0xff;
@@ -952,7 +952,7 @@ WRITE8_MEMBER(vsnes_state::mapper68_rom_banking)
case 0x7000:
{
- UINT8 *prg = machine().region("maincpu")->base();
+ UINT8 *prg = memregion("maincpu")->base();
memcpy(&prg[0x08000], &prg[0x10000 + data * 0x4000], 0x4000);
}
break;
@@ -967,7 +967,7 @@ DRIVER_INIT( platoon )
/* when starting a mapper 68 game the first 16K ROM bank in the cart is loaded into $8000
the LAST 16K ROM bank is loaded into $C000. The last 16K of ROM cannot be swapped. */
- UINT8 *prg = machine.region("maincpu")->base();
+ UINT8 *prg = machine.root_device().memregion("maincpu")->base();
memcpy(&prg[0x08000], &prg[0x10000], 0x4000);
memcpy(&prg[0x0c000], &prg[0x2c000], 0x4000);
@@ -1026,7 +1026,7 @@ WRITE8_MEMBER(vsnes_state::vsdual_vrom_banking)
DRIVER_INIT( vsdual )
{
- UINT8 *prg = machine.region("maincpu")->base();
+ UINT8 *prg = machine.root_device().memregion("maincpu")->base();
vsnes_state *state = machine.driver_data<vsnes_state>();
/* vrom switching is enabled with bit 2 of $4016 */