summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Andrew Gardner <andrew-gardner@users.noreply.github.com>2008-09-09 04:29:13 +0000
committer Andrew Gardner <andrew-gardner@users.noreply.github.com>2008-09-09 04:29:13 +0000
commitbd8c06c155fe4cc1f9584a6fe86d08b96dc5bd77 (patch)
tree4c29e7c433a5d118aabec14d1bcc6d35d5b1030f
parent0ad067f14d2b2e82206e29beb7a786fd3556b948 (diff)
Part 11 of "The big IO_MAP merge of 2008". (Andrew Gardner)
-rw-r--r--src/mame/drivers/slapfght.c47
-rw-r--r--src/mame/drivers/tsamurai.c34
2 files changed, 40 insertions, 41 deletions
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index b97be9b4c3b..414c4feca54 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -498,9 +498,17 @@ static ADDRESS_MAP_START( slapbtuk_writemem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_WRITE(slapfight_fixcol_w) AM_BASE(&slapfight_colorram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(slapfight_port_00_r) /* status register */
+ AM_RANGE(0x00, 0x00) AM_READWRITE(slapfight_port_00_r, slapfight_port_00_w) /* status register */
+ AM_RANGE(0x01, 0x01) AM_WRITE(slapfight_port_01_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(slapfight_flipscreen_w)
+// AM_RANGE(0x04, 0x04) AM_WRITE(getstar_port_04_w)
+ AM_RANGE(0x06, 0x06) AM_WRITE(slapfight_port_06_w)
+ AM_RANGE(0x07, 0x07) AM_WRITE(slapfight_port_07_w)
+ AM_RANGE(0x08, 0x08) AM_WRITE(slapfight_port_08_w) /* select bank 0 */
+ AM_RANGE(0x09, 0x09) AM_WRITE(slapfight_port_09_w) /* select bank 1 */
+ AM_RANGE(0x0c, 0x0d) AM_WRITE(slapfight_palette_bank_w)
ADDRESS_MAP_END
static READ8_HANDLER(tigerh_status_r)
@@ -508,9 +516,13 @@ static READ8_HANDLER(tigerh_status_r)
return (slapfight_port_00_r(machine,0)&0xf9)| ((tigerh_mcu_status_r(machine,0)));
}
-static ADDRESS_MAP_START( tigerh_readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tigerh_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_READ(tigerh_status_r) /* status register */
+ AM_RANGE(0x00, 0x00) AM_READWRITE(tigerh_status_r, slapfight_port_00_w) /* status register */
+ AM_RANGE(0x01, 0x01) AM_WRITE(slapfight_port_01_w)
+ AM_RANGE(0x02, 0x03) AM_WRITE(slapfight_flipscreen_w)
+ AM_RANGE(0x06, 0x06) AM_WRITE(slapfight_port_06_w)
+ AM_RANGE(0x07, 0x07) AM_WRITE(slapfight_port_07_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -534,29 +546,15 @@ static ADDRESS_MAP_START( m68705_writemem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0080, 0x07ff) AM_WRITE(SMH_ROM)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tigerh_writeport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tigerhb_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE(slapfight_port_00_w)
+ AM_RANGE(0x00, 0x00) AM_READWRITE(slapfight_port_00_r, slapfight_port_00_w) /* status register */
AM_RANGE(0x01, 0x01) AM_WRITE(slapfight_port_01_w)
AM_RANGE(0x02, 0x03) AM_WRITE(slapfight_flipscreen_w)
AM_RANGE(0x06, 0x06) AM_WRITE(slapfight_port_06_w)
AM_RANGE(0x07, 0x07) AM_WRITE(slapfight_port_07_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
- ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE(slapfight_port_00_w)
- AM_RANGE(0x01, 0x01) AM_WRITE(slapfight_port_01_w)
- AM_RANGE(0x02, 0x03) AM_WRITE(slapfight_flipscreen_w)
-// AM_RANGE(0x04, 0x04) AM_WRITE(getstar_port_04_w)
- AM_RANGE(0x06, 0x06) AM_WRITE(slapfight_port_06_w)
- AM_RANGE(0x07, 0x07) AM_WRITE(slapfight_port_07_w)
- AM_RANGE(0x08, 0x08) AM_WRITE(slapfight_port_08_w) /* select bank 0 */
- AM_RANGE(0x09, 0x09) AM_WRITE(slapfight_port_09_w) /* select bank 1 */
- AM_RANGE(0x0c, 0x0d) AM_WRITE(slapfight_palette_bank_w)
-ADDRESS_MAP_END
-
-
static ADDRESS_MAP_START( perfrman_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM)
AM_RANGE(0x8800, 0x880f) AM_READ(slapfight_dpram_r)
@@ -926,7 +924,7 @@ static MACHINE_DRIVER_START( perfrman )
/* basic machine hardware */
MDRV_CPU_ADD("main", Z80,16000000/4) /* 4MHz ???, 16MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(perfrman_readmem,perfrman_writemem)
- MDRV_CPU_IO_MAP(readport,writeport)
+ MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
MDRV_CPU_ADD("audio", Z80,16000000/8) /* 2MHz ???, 16MHz Oscillator */
@@ -973,7 +971,7 @@ static MACHINE_DRIVER_START( tigerhb )
/* basic machine hardware */
MDRV_CPU_ADD("main", Z80, 6000000)
MDRV_CPU_PROGRAM_MAP(tigerh_readmem,writemem)
- MDRV_CPU_IO_MAP(readport,tigerh_writeport)
+ MDRV_CPU_IO_MAP(tigerhb_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
MDRV_CPU_ADD("audio", Z80, 6000000)
@@ -1019,7 +1017,7 @@ static MACHINE_DRIVER_START( tigerh )
/* basic machine hardware */
MDRV_CPU_ADD("main", Z80, XTAL_36MHz/6) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(tigerh_readmem,writemem)
- MDRV_CPU_IO_MAP(tigerh_readport,tigerh_writeport)
+ MDRV_CPU_IO_MAP(tigerh_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
MDRV_CPU_ADD("audio", Z80, XTAL_36MHz/12) /* verified on pcb */
@@ -1069,7 +1067,7 @@ static MACHINE_DRIVER_START( slapfigh )
/* basic machine hardware */
MDRV_CPU_ADD("main",Z80, XTAL_36MHz/6) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
- MDRV_CPU_IO_MAP(readport,writeport)
+ MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
MDRV_CPU_ADD("audio", Z80, XTAL_36MHz/12) /* verified on pcb */
@@ -1926,3 +1924,4 @@ GAME( 1986, getstar, 0, slapfigh, getstar, getstar, ROT0, "Taito Ame
GAME( 1986, getstarj, getstar, slapfigh, getstarj, getstarj, ROT0, "Taito", "Get Star (Japan)", GAME_NO_COCKTAIL )
GAME( 1986, gtstarb1, getstar, slapfigh, getstarj, gtstarb1, ROT0, "bootleg", "Get Star (bootleg set 1)", GAME_NO_COCKTAIL )
GAME( 1986, gtstarb2, getstar, slapfigh, gtstarb2, gtstarb2, ROT0, "bootleg", "Get Star (bootleg set 2)", GAME_NO_COCKTAIL )
+
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index b41f1cb4716..6c014cdb788 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -225,21 +225,23 @@ static ADDRESS_MAP_START( writemem_m660, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc07, 0xfc07) AM_WRITE(tsamurai_textbank2_w)/* Mission 660 uses a bit here */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
+ AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+ AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_writeport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_m660_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
- AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+ AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /* ? */
+ AM_RANGE(0x01, 0x01) AM_WRITE(SMH_NOP) /* Written continuously. Increments with level. */
+ AM_RANGE(0x02, 0x02) AM_WRITE(SMH_NOP) /* Always follows above with 0x01 data */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_writeport_m660, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( vsgongf_audio_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP) /* ? */
- AM_RANGE(0x01, 0x01) AM_WRITE(SMH_NOP) /* Written continuously. Increments with level. */
- AM_RANGE(0x02, 0x02) AM_WRITE(SMH_NOP) /* Always follows above with 0x01 data */
+ AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+ AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
ADDRESS_MAP_END
static READ8_HANDLER( sound_command1_r )
@@ -326,11 +328,7 @@ ADDRESS_MAP_END
/*******************************************************************************/
-static ADDRESS_MAP_START( readport_sound3_m660, ADDRESS_SPACE_IO, 8 )
- ADDRESS_MAP_GLOBAL_MASK(0xff)
-ADDRESS_MAP_END
-
-static ADDRESS_MAP_START( writeport_sound3_m660, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound3_m660_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
@@ -735,7 +733,7 @@ static MACHINE_DRIVER_START( tsamurai )
/* basic machine hardware */
MDRV_CPU_ADD("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
- MDRV_CPU_IO_MAP(z80_readport,z80_writeport)
+ MDRV_CPU_IO_MAP(z80_io_map,0)
MDRV_CPU_VBLANK_INT("main", samurai_interrupt)
MDRV_CPU_ADD("audio", Z80, 2000000)
@@ -778,7 +776,7 @@ static MACHINE_DRIVER_START( m660 )
/* basic machine hardware */
MDRV_CPU_ADD("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(readmem_m660,writemem_m660)
- MDRV_CPU_IO_MAP(z80_readport,z80_writeport_m660)
+ MDRV_CPU_IO_MAP(z80_m660_io_map,0)
MDRV_CPU_VBLANK_INT("main", samurai_interrupt)
MDRV_CPU_ADD("audio", Z80, 2000000)
@@ -789,7 +787,7 @@ static MACHINE_DRIVER_START( m660 )
MDRV_CPU_ADD("audio3", Z80, 2000000)
MDRV_CPU_PROGRAM_MAP(readmem_sound3_m660,writemem_sound3_m660)
- MDRV_CPU_IO_MAP(readport_sound3_m660,writeport_sound3_m660)
+ MDRV_CPU_IO_MAP(sound3_m660_io_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
/* video hardware */
@@ -830,7 +828,7 @@ static MACHINE_DRIVER_START( vsgongf )
MDRV_CPU_ADD("audio", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(readmem_sound_vsgongf,writemem_sound_vsgongf)
- MDRV_CPU_IO_MAP(0,z80_writeport)
+ MDRV_CPU_IO_MAP(vsgongf_audio_io_map,0)
MDRV_CPU_VBLANK_INT_HACK(vsgongf_sound_interrupt,3)
/* video hardware */
@@ -1273,3 +1271,5 @@ GAME( 1986, m660, 0, m660, m660, 0, ROT90, "[Woodplace Inc.]
GAME( 1986, m660j, m660, m660, m660, 0, ROT90, "[Woodplace Inc.] Taito Corporation", "Mission 660 (Japan)", 0 )
GAME( 1986, m660b, m660, m660, m660, 0, ROT90, "bootleg", "Mission 660 (bootleg)", 0 )
GAME( 1986, alphaxz, m660, m660, m660, 0, ROT90, "Ed / Woodplace Inc.", "The Alphax Z (Japan)", 0 )
+
+