summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/rpunch.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/rpunch.c')
-rw-r--r--src/mame/drivers/rpunch.c52
1 files changed, 17 insertions, 35 deletions
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index bef47681f5b..ecdf113ec68 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -240,35 +240,24 @@ static WRITE8_DEVICE_HANDLER( upd_data_w )
*
*************************************/
-static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
- AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM)
- AM_RANGE(0x040000, 0x04ffff) AM_READ(SMH_RAM)
- AM_RANGE(0x060000, 0x060fff) AM_READ(SMH_RAM)
- AM_RANGE(0x080000, 0x083fff) AM_READ(SMH_RAM)
- AM_RANGE(0x0c0018, 0x0c0019) AM_READ_PORT("P1")
- AM_RANGE(0x0c001a, 0x0c001b) AM_READ_PORT("P2")
- AM_RANGE(0x0c001c, 0x0c001d) AM_READ_PORT("DSW")
- AM_RANGE(0x0c001e, 0x0c001f) AM_READ(sound_busy_r)
- AM_RANGE(0x0a0000, 0x0a07ff) AM_READ(SMH_RAM)
- AM_RANGE(0x0fc000, 0x0fffff) AM_READ(SMH_RAM)
-ADDRESS_MAP_END
-
-
-static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 16 )
- ADDRESS_MAP_GLOBAL_MASK(0xfffff)
- AM_RANGE(0x000000, 0x03ffff) AM_WRITE(SMH_ROM)
- AM_RANGE(0x040000, 0x04ffff) AM_WRITE(SMH_RAM) AM_BASE(&rpunch_bitmapram) AM_SIZE(&rpunch_bitmapram_size)
- AM_RANGE(0x060000, 0x060fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16)
- AM_RANGE(0x080000, 0x083fff) AM_WRITE(rpunch_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size)
- AM_RANGE(0x0a0000, 0x0a07ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)
+ AM_RANGE(0x000000, 0x03ffff) AM_ROM
+ AM_RANGE(0x040000, 0x04ffff) AM_RAM AM_BASE(&rpunch_bitmapram) AM_SIZE(&rpunch_bitmapram_size)
+ AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE(&spriteram16)
+ AM_RANGE(0x080000, 0x083fff) AM_RAM_WRITE(rpunch_videoram_w) AM_BASE(&videoram16) AM_SIZE(&videoram_size)
+ AM_RANGE(0x0a0000, 0x0a07ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)
AM_RANGE(0x0c0000, 0x0c0007) AM_WRITE(rpunch_scrollreg_w)
AM_RANGE(0x0c0008, 0x0c0009) AM_WRITE(rpunch_crtc_data_w)
AM_RANGE(0x0c000c, 0x0c000d) AM_WRITE(rpunch_videoreg_w)
AM_RANGE(0x0c000e, 0x0c000f) AM_WRITE(sound_command_w)
AM_RANGE(0x0c0010, 0x0c0013) AM_WRITE(rpunch_ins_w)
+ AM_RANGE(0x0c0018, 0x0c0019) AM_READ_PORT("P1")
+ AM_RANGE(0x0c001a, 0x0c001b) AM_READ_PORT("P2")
+ AM_RANGE(0x0c001c, 0x0c001d) AM_READ_PORT("DSW")
+ AM_RANGE(0x0c001e, 0x0c001f) AM_READ(sound_busy_r)
AM_RANGE(0x0c0028, 0x0c0029) AM_WRITE(rpunch_crtc_register_w)
- AM_RANGE(0x0fc000, 0x0fffff) AM_WRITE(SMH_RAM)
+ AM_RANGE(0x0fc000, 0x0fffff) AM_RAM
ADDRESS_MAP_END
@@ -279,20 +268,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM)
- AM_RANGE(0xf000, 0xf001) AM_DEVREAD("ym", ym2151_r)
+static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+ AM_RANGE(0x0000, 0xefff) AM_ROM
+ AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w)
AM_RANGE(0xf200, 0xf200) AM_READ(sound_command_r)
- AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM)
-ADDRESS_MAP_END
-
-
-static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
- AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM)
- AM_RANGE(0xf000, 0xf001) AM_DEVWRITE("ym", ym2151_w)
AM_RANGE(0xf400, 0xf400) AM_DEVWRITE("upd", upd_control_w)
AM_RANGE(0xf600, 0xf600) AM_DEVWRITE("upd", upd_data_w)
- AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM)
+ AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -501,10 +483,10 @@ static MACHINE_DRIVER_START( rpunch )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
- MDRV_CPU_PROGRAM_MAP(readmem,writemem)
+ MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_ADD("audiocpu", Z80, MASTER_CLOCK/4)
- MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound)
+ MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_MACHINE_RESET(rpunch)