diff options
author | Angelo Salese <angelosa@users.noreply.github.com> | 2009-04-12 20:46:32 +0000 |
---|---|---|
committer | Angelo Salese <angelosa@users.noreply.github.com> | 2009-04-12 20:46:32 +0000 |
commit | 293df059047f972ad5bf51bd013ff75527119169 (patch) | |
tree | e0ac9a480b0347a721d3c14533e380030d0fedaf | |
parent | 2e48320854ae20215da4d48f349cca7f2d5d964c (diff) |
memory map merging for naughtyb.c
-rw-r--r-- | src/mame/drivers/naughtyb.c | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c index 3ffabc0b95c..70502882abf 100644 --- a/src/mame/drivers/naughtyb.c +++ b/src/mame/drivers/naughtyb.c @@ -176,33 +176,30 @@ static READ8_HANDLER( popflame_protection_r ) /* Not used by bootleg/hack */ -static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM) - AM_RANGE(0x4000, 0x8fff) AM_READ(SMH_RAM) - AM_RANGE(0xb000, 0xb7ff) AM_READ(in0_port_r) // IN0 - AM_RANGE(0xb800, 0xbfff) AM_READ(dsw0_port_r) // DSW0 -ADDRESS_MAP_END - -static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x8800, 0x8fff) AM_WRITE(SMH_RAM) AM_BASE(&naughtyb_videoram2) - AM_RANGE(0x9000, 0x97ff) AM_WRITE(naughtyb_videoreg_w) - AM_RANGE(0x9800, 0x9fff) AM_WRITE(SMH_RAM) AM_BASE(&naughtyb_scrollreg) +static ADDRESS_MAP_START( naughtyb_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0x3fff) AM_ROM + AM_RANGE(0x4000, 0x7fff) AM_RAM + AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x8800, 0x8fff) AM_RAM AM_BASE(&naughtyb_videoram2) + AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(naughtyb_videoreg_w) + AM_RANGE(0x9800, 0x9fff) AM_RAM AM_BASE(&naughtyb_scrollreg) AM_RANGE(0xa000, 0xa7ff) AM_WRITE(pleiads_sound_control_a_w) AM_RANGE(0xa800, 0xafff) AM_WRITE(pleiads_sound_control_b_w) + AM_RANGE(0xb000, 0xb7ff) AM_READ(in0_port_r) // IN0 + AM_RANGE(0xb800, 0xbfff) AM_READ(dsw0_port_r) // DSW0 ADDRESS_MAP_END -static ADDRESS_MAP_START( popflame_writemem, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM) - AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_RAM) - AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size) - AM_RANGE(0x8800, 0x8fff) AM_WRITE(SMH_RAM) AM_BASE(&naughtyb_videoram2) - AM_RANGE(0x9000, 0x97ff) AM_WRITE(popflame_videoreg_w) - AM_RANGE(0x9800, 0x9fff) AM_WRITE(SMH_RAM) AM_BASE(&naughtyb_scrollreg) +static ADDRESS_MAP_START( popflame_map, ADDRESS_SPACE_PROGRAM, 8 ) + AM_RANGE(0x0000, 0x3fff) AM_ROM + AM_RANGE(0x4000, 0x7fff) AM_RAM + AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&videoram) AM_SIZE(&videoram_size) + AM_RANGE(0x8800, 0x8fff) AM_RAM AM_BASE(&naughtyb_videoram2) + AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(popflame_videoreg_w) + AM_RANGE(0x9800, 0x9fff) AM_RAM AM_BASE(&naughtyb_scrollreg) AM_RANGE(0xa000, 0xa7ff) AM_WRITE(pleiads_sound_control_a_w) AM_RANGE(0xa800, 0xafff) AM_WRITE(pleiads_sound_control_b_w) + AM_RANGE(0xb000, 0xb7ff) AM_READ(in0_port_r) // IN0 + AM_RANGE(0xb800, 0xbfff) AM_READ(dsw0_port_r) // DSW0 ADDRESS_MAP_END @@ -370,7 +367,7 @@ static MACHINE_DRIVER_START( naughtyb ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */ - MDRV_CPU_PROGRAM_MAP(readmem,writemem) + MDRV_CPU_PROGRAM_MAP(naughtyb_map,0) MDRV_CPU_VBLANK_INT("screen", naughtyb_interrupt) /* video hardware */ @@ -406,7 +403,7 @@ static MACHINE_DRIVER_START( popflame ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */ - MDRV_CPU_PROGRAM_MAP(readmem,popflame_writemem) + MDRV_CPU_PROGRAM_MAP(popflame_map,0) MDRV_CPU_VBLANK_INT("screen", naughtyb_interrupt) /* video hardware */ |