Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-29 00:53:09 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Converted niyanpai.c and nbmj9195.c to use AM_IMPORT_FROM

Browse Source
This commit is contained in:
Angelo Salese 2009-05-10 17:16:20 +00:00
parent a0aa7c791c
commit 5c95aa672d
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/mame/drivers/nbmj9195.c
View File

@ -530,19 +530,19 @@ static DRIVER_INIT( nbmj9195 )
nbmj9195_soundbank_w(space, 0, 0);
}
#define TMPZ84C011_REGS \
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("main_ctc", z80ctc_r,z80ctc_w) \
AM_RANGE(0x50, 0x50) AM_READWRITE(tmpz84c011_0_pa_r,tmpz84c011_0_pa_w) \
AM_RANGE(0x51, 0x51) AM_READWRITE(tmpz84c011_0_pb_r,tmpz84c011_0_pb_w) \
AM_RANGE(0x52, 0x52) AM_READWRITE(tmpz84c011_0_pc_r,tmpz84c011_0_pc_w) \
AM_RANGE(0x30, 0x30) AM_READWRITE(tmpz84c011_0_pd_r,tmpz84c011_0_pd_w) \
AM_RANGE(0x40, 0x40) AM_READWRITE(tmpz84c011_0_pe_r,tmpz84c011_0_pe_w) \
AM_RANGE(0x54, 0x54) AM_READWRITE(tmpz84c011_0_dir_pa_r,tmpz84c011_0_dir_pa_w) \
AM_RANGE(0x55, 0x55) AM_READWRITE(tmpz84c011_0_dir_pb_r,tmpz84c011_0_dir_pb_w) \
AM_RANGE(0x56, 0x56) AM_READWRITE(tmpz84c011_0_dir_pc_r,tmpz84c011_0_dir_pc_w) \
AM_RANGE(0x34, 0x34) AM_READWRITE(tmpz84c011_0_dir_pd_r,tmpz84c011_0_dir_pd_w) \
AM_RANGE(0x44, 0x44) AM_READWRITE(tmpz84c011_0_dir_pe_r,tmpz84c011_0_dir_pe_w) \
static ADDRESS_MAP_START( tmpz84c011_regs, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("main_ctc", z80ctc_r,z80ctc_w)
AM_RANGE(0x50, 0x50) AM_READWRITE(tmpz84c011_0_pa_r,tmpz84c011_0_pa_w)
AM_RANGE(0x51, 0x51) AM_READWRITE(tmpz84c011_0_pb_r,tmpz84c011_0_pb_w)
AM_RANGE(0x52, 0x52) AM_READWRITE(tmpz84c011_0_pc_r,tmpz84c011_0_pc_w)
AM_RANGE(0x30, 0x30) AM_READWRITE(tmpz84c011_0_pd_r,tmpz84c011_0_pd_w)
AM_RANGE(0x40, 0x40) AM_READWRITE(tmpz84c011_0_pe_r,tmpz84c011_0_pe_w)
AM_RANGE(0x54, 0x54) AM_READWRITE(tmpz84c011_0_dir_pa_r,tmpz84c011_0_dir_pa_w)
AM_RANGE(0x55, 0x55) AM_READWRITE(tmpz84c011_0_dir_pb_r,tmpz84c011_0_dir_pb_w)
AM_RANGE(0x56, 0x56) AM_READWRITE(tmpz84c011_0_dir_pc_r,tmpz84c011_0_dir_pc_w)
AM_RANGE(0x34, 0x34) AM_READWRITE(tmpz84c011_0_dir_pd_r,tmpz84c011_0_dir_pd_w)
AM_RANGE(0x44, 0x44) AM_READWRITE(tmpz84c011_0_dir_pe_r,tmpz84c011_0_dir_pe_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( sailorws_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
@ -586,7 +586,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mjuraden_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
@ -601,7 +601,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( koinomp_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
@ -621,7 +621,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( patimono_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_1_r)
AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_1_w)
@ -639,7 +639,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mmehyou_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
@ -653,7 +653,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( gal10ren_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
@ -671,7 +671,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( renaiclb_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x20, 0x20) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0x24, 0x24) AM_WRITENOP
@ -689,7 +689,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mjlaman_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x20, 0x20) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0x22, 0x22) AM_WRITENOP
@ -708,7 +708,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mkeibaou_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
@ -727,7 +727,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( pachiten_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
@ -745,7 +745,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sailorws_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
@ -763,7 +763,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sailorwr_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
@ -782,7 +782,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( psailor1_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
@ -800,7 +800,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( psailor2_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
@ -818,7 +818,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( otatidai_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
@ -836,7 +836,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( yosimoto_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
@ -854,7 +854,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( jituroku_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x60, 0x61) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x60, 0x6f) AM_WRITE(nbmj9195_blitter_0_w)
@ -872,7 +872,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( ngpgal_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xa4, 0xa4) AM_WRITENOP
@ -886,7 +886,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mjgottsu_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
@ -900,7 +900,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( cmehyou_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xa8, 0xa8) AM_WRITENOP
@ -914,7 +914,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mjkoiura_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x80, 0x81) AM_READ(nbmj9195_blitter_0_r)
AM_RANGE(0x80, 0x8f) AM_WRITE(nbmj9195_blitter_0_w)
@ -928,7 +928,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mkoiuraa_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0xa0, 0xa0) AM_WRITE(nbmj9195_sound_w)
AM_RANGE(0xa4, 0xa4) AM_WRITENOP
@ -942,7 +942,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mscoutm_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x80, 0x80) AM_READ(mscoutm_dipsw_1_r)
AM_RANGE(0x82, 0x82) AM_READ(mscoutm_dipsw_0_r)
@ -962,7 +962,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( imekura_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x80, 0x80) AM_READ(mscoutm_dipsw_1_r)
AM_RANGE(0x82, 0x82) AM_READ(mscoutm_dipsw_0_r)
@ -982,7 +982,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( mjegolf_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
TMPZ84C011_REGS
AM_IMPORT_FROM( tmpz84c011_regs )
AM_RANGE(0x80, 0x86) AM_WRITENOP // nb22090 param ?

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

@ -268,13 +268,13 @@ static WRITE16_HANDLER ( musobana_inputport_w )
musobana_inputport = data;
}
#define TMP68301_REGS \
static ADDRESS_MAP_START( tmp68301_regs, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfffc00, 0xfffc0f) AM_READWRITE(tmp68301_address_decoder_r,tmp68301_address_decoder_w) \
AM_RANGE(0xfffc80, 0xfffc9f) AM_READWRITE(tmp68301_interrupt_controller_r,tmp68301_interrupt_controller_w) \
AM_RANGE(0xfffd00, 0xfffd0f) AM_READWRITE(tmp68301_parallel_interface_r,tmp68301_parallel_interface_w) \
AM_RANGE(0xfffd80, 0xfffdaf) AM_READWRITE(tmp68301_serial_interface_r,tmp68301_serial_interface_w) \
AM_RANGE(0xfffe00, 0xfffe4f) AM_READWRITE(tmp68301_timer_r,tmp68301_timer_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( niyanpai_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
@ -308,7 +308,7 @@ static ADDRESS_MAP_START( niyanpai_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x240c00, 0x240c01) AM_WRITE(niyanpai_clutsel_1_w)
AM_RANGE(0x240e00, 0x240e01) AM_WRITE(niyanpai_clutsel_2_w)
TMP68301_REGS
AM_IMPORT_FROM( tmp68301_regs )
ADDRESS_MAP_END
static ADDRESS_MAP_START( musobana_map, ADDRESS_SPACE_PROGRAM, 16 )
@ -346,7 +346,7 @@ static ADDRESS_MAP_START( musobana_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x280200, 0x280201) AM_READ(musobana_inputport_0_r)
AM_RANGE(0x280400, 0x280401) AM_READ_PORT("SYSTEM")
TMP68301_REGS
AM_IMPORT_FROM( tmp68301_regs )
ADDRESS_MAP_END
static ADDRESS_MAP_START( mhhonban_map, ADDRESS_SPACE_PROGRAM, 16 )
@ -386,7 +386,7 @@ static ADDRESS_MAP_START( mhhonban_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x280200, 0x280201) AM_READ(musobana_inputport_0_r)
AM_RANGE(0x280400, 0x280401) AM_READ_PORT("SYSTEM")
TMP68301_REGS
AM_IMPORT_FROM( tmp68301_regs )
ADDRESS_MAP_END