diff --git a/src/emu/memory.h b/src/emu/memory.h index f633b0d33b0..cccd001347e 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -776,6 +776,7 @@ union _addrmap64_token #define AM_RAM AM_READWRITE(SMH_RAM, SMH_RAM) #define AM_RAMBANK(_bank) AM_READWRITE(SMH_BANK(_bank), SMH_BANK(_bank)) #define AM_RAM_WRITE(_write) AM_READWRITE(SMH_RAM, _write) +#define AM_READONLY AM_READ(SMH_RAM) #define AM_WRITEONLY AM_WRITE(SMH_RAM) #define AM_UNMAP AM_READWRITE(SMH_UNMAP, SMH_UNMAP) diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index 8fc3e479cde..1924d8f6d70 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -202,9 +202,9 @@ static ADDRESS_MAP_START( 20pacgal_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x45040, 0x4505f) AM_DEVWRITE("namco", pacman_sound_w) AM_BASE(&namco_soundregs) AM_RANGE(0x44800, 0x45eff) AM_RAM AM_RANGE(0x45f00, 0x45fff) AM_DEVWRITE("namco", _20pacgal_wavedata_w) AM_BASE(&namco_wavedata) - AM_RANGE(0x46000, 0x46fff) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(_20pacgal_state, char_gfx_ram) + AM_RANGE(0x46000, 0x46fff) AM_WRITEONLY AM_BASE_MEMBER(_20pacgal_state, char_gfx_ram) AM_RANGE(0x47100, 0x47100) AM_RAM /* leftover from original Galaga code */ - AM_RANGE(0x48000, 0x49fff) AM_READWRITE(SMH_ROM, rom_48000_w) /* this should be a mirror of 08000-09ffff */ + AM_RANGE(0x48000, 0x49fff) AM_ROM AM_WRITE(rom_48000_w) /* this should be a mirror of 08000-09ffff */ AM_RANGE(0x4c000, 0x4dfff) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(_20pacgal_state, sprite_gfx_ram) AM_RANGE(0x4e000, 0x4e17f) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(_20pacgal_state, sprite_ram) AM_RANGE(0x4ff00, 0x4ffff) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(_20pacgal_state, sprite_color_lookup) diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index fa5300b4fa2..abe72eeb114 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -99,7 +99,7 @@ static ADDRESS_MAP_START( triothep_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x046400, 0x0467ff) AM_WRITENOP /* Pf2 rowscroll - is it used? */ AM_RANGE(0x060000, 0x06001f) AM_WRITE(actfancr_pf1_control_w) AM_RANGE(0x064000, 0x0647ff) AM_READWRITE(actfancr_pf1_data_r, actfancr_pf1_data_w) AM_BASE(&actfancr_pf1_data) - AM_RANGE(0x066400, 0x0667ff) AM_WRITE(SMH_RAM) AM_BASE(&actfancr_pf1_rowscroll_data) + AM_RANGE(0x066400, 0x0667ff) AM_WRITEONLY AM_BASE(&actfancr_pf1_rowscroll_data) AM_RANGE(0x100000, 0x100001) AM_WRITE(actfancr_sound_w) AM_RANGE(0x110000, 0x110001) AM_WRITE(buffer_spriteram_w) AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c index 792aaa3ecfd..de98beffeb9 100644 --- a/src/mame/drivers/aeroboto.c +++ b/src/mame/drivers/aeroboto.c @@ -78,7 +78,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x01a2, 0x01a2) AM_WRITE(aeroboto_1a2_w) // affects IRQ line (more protection?) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&aeroboto_mainram) // main RAM AM_RANGE(0x0800, 0x08ff) AM_RAM // tile color buffer; copied to 0x2000 - AM_RANGE(0x0900, 0x09ff) AM_WRITE(SMH_RAM) // a backup of default tile colors + AM_RANGE(0x0900, 0x09ff) AM_WRITEONLY // a backup of default tile colors AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(aeroboto_videoram_w) AM_BASE(&aeroboto_videoram) // tile RAM AM_RANGE(0x1800, 0x183f) AM_RAM AM_BASE(&aeroboto_hscroll) // horizontal scroll regs AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(aeroboto_tilecolor_w) AM_BASE(&aeroboto_tilecolor) // tile color RAM @@ -90,7 +90,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3001, 0x3001) AM_READ_PORT("DSW1") AM_WRITE(soundlatch_w) AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW2") AM_WRITE(soundlatch2_w) AM_RANGE(0x3003, 0x3003) AM_WRITEONLY AM_BASE(&aeroboto_vscroll) - AM_RANGE(0x3004, 0x3004) AM_READWRITE(aeroboto_201_r, SMH_RAM) AM_BASE(&aeroboto_starx) + AM_RANGE(0x3004, 0x3004) AM_READ(aeroboto_201_r) AM_WRITEONLY AM_BASE(&aeroboto_starx) AM_RANGE(0x3005, 0x3005) AM_WRITEONLY AM_BASE(&aeroboto_stary) // usable but probably wrong AM_RANGE(0x3006, 0x3006) AM_WRITEONLY AM_BASE(&aeroboto_bgcolor) AM_RANGE(0x3800, 0x3800) AM_READNOP // watchdog or IRQ ack diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index be62566620e..024962af165 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -311,7 +311,7 @@ static ADDRESS_MAP_START( aerofgt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xffffa4, 0xffffa5) AM_READ_PORT("SYSTEM") AM_RANGE(0xffffa6, 0xffffa7) AM_READ_PORT("DSW1") AM_RANGE(0xffffa8, 0xffffa9) AM_READ_PORT("DSW2") - AM_RANGE(0xffffac, 0xffffad) AM_READWRITE(pending_command_r, SMH_NOP) /* ??? */ + AM_RANGE(0xffffac, 0xffffad) AM_READ(pending_command_r) AM_WRITENOP /* ??? */ AM_RANGE(0xffffae, 0xffffaf) AM_READ_PORT("DSW3") AM_RANGE(0xffffc0, 0xffffc1) AM_WRITE(sound_command_w) ADDRESS_MAP_END @@ -385,7 +385,7 @@ static ADDRESS_MAP_START( wbbc97_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xfff000, 0xfff001) AM_READ_PORT("IN0") AM_WRITE(pspikes_palette_bank_w) AM_RANGE(0xfff002, 0xfff003) AM_READ_PORT("IN1") AM_WRITE(pspikes_gfxbank_w) AM_RANGE(0xfff004, 0xfff005) AM_READ_PORT("DSW") AM_WRITE(aerofgt_bg1scrolly_w) - AM_RANGE(0xfff006, 0xfff007) AM_READWRITE(SMH_NOP, sound_command_w) + AM_RANGE(0xfff006, 0xfff007) AM_READNOP AM_WRITE(sound_command_w) AM_RANGE(0xfff00e, 0xfff00f) AM_WRITE(wbbc97_bitmap_enable_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index 8ff794f884a..bd445995f12 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -224,7 +224,7 @@ static const ay8910_interface ay8910_config = static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0x9fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK(1) AM_RANGE(0xa7fc, 0xa7fc) AM_WRITE(prot_lock_w) AM_RANGE(0xa7ff, 0xa7ff) AM_WRITE(eeprom_w) AM_RANGE(0xaf80, 0xafff) AM_READWRITE(custom_ram_r, custom_ram_w) AM_BASE(&cus_ram) diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c index 4baf5eb800d..55e1ffb5d6b 100644 --- a/src/mame/drivers/aleck64.c +++ b/src/mame/drivers/aleck64.c @@ -202,7 +202,7 @@ static ADDRESS_MAP_START( n64_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x1fc00000, 0x1fc007bf) AM_ROM AM_REGION("user1", 0) // PIF ROM AM_RANGE(0x1fc007c0, 0x1fc007ff) AM_READWRITE(n64_pif_ram_r, n64_pif_ram_w) - AM_RANGE(0xc0800000, 0xc08fffff) AM_READWRITE(aleck_dips_r, SMH_NOP) + AM_RANGE(0xc0800000, 0xc08fffff) AM_READ(aleck_dips_r) AM_WRITENOP AM_RANGE(0xd0000000, 0xd0000fff) AM_RAM AM_RANGE(0xd0010000, 0xd00109ff) AM_RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c index 7f8fa839e07..5fd10caee7f 100644 --- a/src/mame/drivers/ambush.c +++ b/src/mame/drivers/ambush.c @@ -69,7 +69,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc800, 0xc800) AM_READ_PORT("DSW1") AM_RANGE(0xcc00, 0xcc03) AM_WRITENOP AM_RANGE(0xcc04, 0xcc04) AM_WRITE(flip_screen_w) - AM_RANGE(0xcc05, 0xcc05) AM_WRITE(SMH_RAM) AM_BASE(&ambush_colorbank) + AM_RANGE(0xcc05, 0xcc05) AM_WRITEONLY AM_BASE(&ambush_colorbank) AM_RANGE(0xcc07, 0xcc07) AM_WRITE(ambush_coin_counter_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index 2254ca71efa..e5ec3f91eaa 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -146,7 +146,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc02000, 0xc03fff) AM_RAM_WRITE(aquarium_txt_videoram_w) AM_BASE(&aquarium_txt_videoram) AM_RANGE(0xc80000, 0xc81fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0xd00000, 0xd00fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16) - AM_RANGE(0xd80014, 0xd8001f) AM_WRITE(SMH_RAM) AM_BASE(&aquarium_scroll) + AM_RANGE(0xd80014, 0xd8001f) AM_WRITEONLY AM_BASE(&aquarium_scroll) AM_RANGE(0xd80068, 0xd80069) AM_WRITENOP /* probably not used */ AM_RANGE(0xd80080, 0xd80081) AM_READ_PORT("DSW") AM_RANGE(0xd80082, 0xd80083) AM_READNOP /* stored but not read back ? check code at 0x01f440 */ diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c index 95dfd46ac19..ca4d10881b6 100644 --- a/src/mame/drivers/arabian.c +++ b/src/mame/drivers/arabian.c @@ -217,7 +217,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x01ff) AM_READ_PORT("IN0") AM_RANGE(0xc200, 0xc200) AM_MIRROR(0x01ff) AM_READ_PORT("DSW1") AM_RANGE(0xd000, 0xd7ef) AM_RAM AM_BASE(&custom_cpu_ram) - AM_RANGE(0xd7f0, 0xd7ff) AM_READWRITE(custom_cpu_r, SMH_RAM) + AM_RANGE(0xd7f0, 0xd7ff) AM_READ(custom_cpu_r) AM_WRITENOP AM_RANGE(0xe000, 0xe007) AM_MIRROR(0x0ff8) AM_WRITE(arabian_blitter_w) AM_BASE(&arabian_blitter) ADDRESS_MAP_END diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index e1e901d89ea..bde1a5a6b5a 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -129,7 +129,7 @@ static ADDRESS_MAP_START( ashnojoe_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x04a000, 0x04a001) AM_READ_PORT("P1") AM_RANGE(0x04a002, 0x04a003) AM_READ_PORT("P2") AM_RANGE(0x04a004, 0x04a005) AM_READ_PORT("DSW") - AM_RANGE(0x04a006, 0x04a007) AM_WRITE(SMH_RAM) AM_BASE(&ashnojoe_tilemap_reg) + AM_RANGE(0x04a006, 0x04a007) AM_WRITEONLY AM_BASE(&ashnojoe_tilemap_reg) AM_RANGE(0x04a008, 0x04a009) AM_WRITE(ashnojoe_soundlatch_w) AM_RANGE(0x04a00a, 0x04a00b) AM_READ(fake_4a00a_r) // ?? AM_RANGE(0x04a010, 0x04a019) AM_WRITE(joe_tilemaps_xscroll_w) diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c index c088cbe0bb1..f4dc0759ecf 100644 --- a/src/mame/drivers/astrocorp.c +++ b/src/mame/drivers/astrocorp.c @@ -170,7 +170,7 @@ static WRITE16_HANDLER( astrocorp_palette_w ) static ADDRESS_MAP_START( showhand_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x000000, 0x01ffff ) AM_ROM AM_RANGE( 0x050000, 0x050fff ) AM_RAM AM_BASE( &spriteram16 ) AM_SIZE( &spriteram_size ) - AM_RANGE( 0x052000, 0x052001 ) AM_WRITE( SMH_NOP ) + AM_RANGE( 0x052000, 0x052001 ) AM_WRITENOP AM_RANGE( 0x054000, 0x054001 ) AM_READ_PORT( "INPUTS" ) AM_RANGE( 0x058000, 0x058001 ) AM_WRITE( astrocorp_eeprom_w ) AM_RANGE( 0x05a000, 0x05a001 ) AM_WRITE( astrocorp_outputs_w ) @@ -187,7 +187,7 @@ static ADDRESS_MAP_START( showhanc_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x060000, 0x0601ff ) AM_RAM_WRITE( astrocorp_palette_w ) AM_BASE( &paletteram16 ) AM_RANGE( 0x070000, 0x070001 ) AM_DEVWRITE( "oki", astrocorp_sound_bank_w ) AM_RANGE( 0x080000, 0x080fff ) AM_RAM AM_BASE( &spriteram16 ) AM_SIZE( &spriteram_size ) - AM_RANGE( 0x082000, 0x082001 ) AM_WRITE( SMH_NOP ) + AM_RANGE( 0x082000, 0x082001 ) AM_WRITENOP AM_RANGE( 0x084000, 0x084001 ) AM_READ_PORT( "INPUTS" ) AM_RANGE( 0x088000, 0x088001 ) AM_WRITE( astrocorp_eeprom_w ) AM_RANGE( 0x08a000, 0x08a001 ) AM_WRITE( astrocorp_outputs_w ) diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index ba0be28cbe9..d78d0937ac1 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -498,14 +498,14 @@ static ADDRESS_MAP_START( astrof_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x5fff) AM_RAM_WRITE(astrof_videoram_w) AM_BASE(&astrof_videoram) AM_SIZE(&astrof_videoram_size) AM_RANGE(0x6000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x8002) AM_MIRROR(0x1ff8) AM_NOP - AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&astrof_color) - AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, video_control_1_w) - AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, astrof_video_control_2_w) - AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, astrof_audio_1_w) - AM_RANGE(0x8007, 0x8007) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, astrof_audio_2_w) + AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITEONLY AM_BASE(&astrof_color) + AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITE(video_control_1_w) + AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITE(astrof_video_control_2_w) + AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITE(astrof_audio_1_w) + AM_RANGE(0x8007, 0x8007) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITE(astrof_audio_2_w) AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ff8) AM_READ_PORT("IN") AM_WRITENOP AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ff8) AM_READ_PORT("DSW") AM_WRITENOP - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READWRITE(irq_clear_r, SMH_NOP) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READ(irq_clear_r) AM_WRITENOP AM_RANGE(0xa003, 0xa007) AM_MIRROR(0x1ff8) AM_NOP AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -517,14 +517,14 @@ static ADDRESS_MAP_START( spfghmk2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x5fff) AM_RAM_WRITE(astrof_videoram_w) AM_BASE(&astrof_videoram) AM_SIZE(&astrof_videoram_size) AM_RANGE(0x6000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x8002) AM_MIRROR(0x1ff8) AM_NOP - AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&astrof_color) - AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, video_control_1_w) - AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, spfghmk2_video_control_2_w) - AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, spfghmk2_audio_w) + AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITEONLY AM_BASE(&astrof_color) + AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITE(video_control_1_w) + AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITE(spfghmk2_video_control_2_w) + AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITE(spfghmk2_audio_w) AM_RANGE(0x8007, 0x8007) AM_MIRROR(0x1ff8) AM_NOP AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ff8) AM_READ_PORT("IN") AM_WRITENOP AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ff8) AM_READ_PORT("DSW") AM_WRITENOP - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READWRITE(irq_clear_r, SMH_NOP) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READ(irq_clear_r) AM_WRITENOP AM_RANGE(0xa003, 0xa007) AM_MIRROR(0x1ff8) AM_NOP AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -536,15 +536,15 @@ static ADDRESS_MAP_START( tomahawk_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x5fff) AM_RAM_WRITE(tomahawk_videoram_w) AM_BASE(&astrof_videoram) AM_SIZE(&astrof_videoram_size) AM_RANGE(0x6000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x8002) AM_MIRROR(0x1ff8) AM_NOP - AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&astrof_color) - AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, video_control_1_w) - AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, tomahawk_video_control_2_w) - AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, tomahawk_audio_w) - AM_RANGE(0x8007, 0x8007) AM_MIRROR(0x1ff8) AM_READWRITE(SMH_NOP, SMH_RAM) AM_BASE(&tomahawk_protection) + AM_RANGE(0x8003, 0x8003) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITEONLY AM_BASE(&astrof_color) + AM_RANGE(0x8004, 0x8004) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITE(video_control_1_w) + AM_RANGE(0x8005, 0x8005) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITE(tomahawk_video_control_2_w) + AM_RANGE(0x8006, 0x8006) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITE(tomahawk_audio_w) + AM_RANGE(0x8007, 0x8007) AM_MIRROR(0x1ff8) AM_READNOP AM_WRITEONLY AM_BASE(&tomahawk_protection) AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ff8) AM_READ_PORT("IN") AM_WRITENOP AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ff8) AM_READ_PORT("DSW") AM_WRITENOP - AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READWRITE(irq_clear_r, SMH_NOP) - AM_RANGE(0xa003, 0xa003) AM_MIRROR(0x1ff8) AM_READWRITE(tomahawk_protection_r, SMH_NOP) + AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ff8) AM_READ(irq_clear_r) AM_WRITENOP + AM_RANGE(0xa003, 0xa003) AM_MIRROR(0x1ff8) AM_READ(tomahawk_protection_r) AM_WRITENOP AM_RANGE(0xa004, 0xa007) AM_MIRROR(0x1ff8) AM_NOP AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index bbe73cdf902..33a900891ff 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -408,7 +408,7 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym", ym2151_r, ym2151_w) -// AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM) +// AM_RANGE(0x9002, 0x9100) AM_READNOP AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(asuka_msm5205_address_w) diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c index d716af3663e..b2fb485effd 100644 --- a/src/mame/drivers/atarifb.c +++ b/src/mame/drivers/atarifb.c @@ -157,12 +157,11 @@ static ADDRESS_MAP_START( atarifb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE(atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE(atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x2000, 0x2000) AM_WRITE(SMH_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ + AM_RANGE(0x2000, 0x2000) AM_WRITEONLY AM_BASE(&atarifb_scroll_register) /* OUT 0 */ AM_RANGE(0x2001, 0x2001) AM_WRITE(atarifb_out1_w) /* OUT 1 */ AM_RANGE(0x2002, 0x2002) AM_WRITE(atarifb_out2_w) /* OUT 2 */ AM_RANGE(0x2003, 0x2003) AM_WRITE(atarifb_out3_w) /* OUT 3 */ - AM_RANGE(0x3000, 0x3000) AM_READ(SMH_RAM) - AM_RANGE(0x3000, 0x3000) AM_WRITENOP /* Interrupt Acknowledge */ + AM_RANGE(0x3000, 0x3000) AM_NOP /* Interrupt Acknowledge */ AM_RANGE(0x4000, 0x4000) AM_READ(atarifb_in0_r) AM_RANGE(0x4002, 0x4002) AM_READ(atarifb_in2_r) AM_RANGE(0x5000, 0x5000) AM_WRITE(watchdog_reset_w) @@ -178,12 +177,11 @@ static ADDRESS_MAP_START( atarifb4_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE(atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE(atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x2000, 0x2000) AM_WRITE(SMH_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ + AM_RANGE(0x2000, 0x2000) AM_WRITEONLY AM_BASE(&atarifb_scroll_register) /* OUT 0 */ AM_RANGE(0x2001, 0x2001) AM_WRITE(atarifb4_out1_w) /* OUT 1 */ AM_RANGE(0x2002, 0x2002) AM_WRITE(atarifb_out2_w) /* OUT 2 */ AM_RANGE(0x2003, 0x2003) AM_WRITE(atarifb_out3_w) /* OUT 3 */ - AM_RANGE(0x3000, 0x3000) AM_READ(SMH_RAM) - AM_RANGE(0x3000, 0x3000) AM_WRITENOP /* Interrupt Acknowledge */ + AM_RANGE(0x3000, 0x3000) AM_NOP /* Interrupt Acknowledge */ AM_RANGE(0x4000, 0x4000) AM_READ(atarifb4_in0_r) AM_RANGE(0x4001, 0x4001) AM_READ_PORT("EXTRA") AM_RANGE(0x4002, 0x4002) AM_READ(atarifb4_in2_r) @@ -200,12 +198,11 @@ static ADDRESS_MAP_START( abaseb_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE(atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) AM_RANGE(0x1000, 0x13bf) AM_RAM_WRITE(atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) AM_RANGE(0x13c0, 0x13ff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x2000, 0x2000) AM_WRITE(SMH_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ + AM_RANGE(0x2000, 0x2000) AM_WRITEONLY AM_BASE(&atarifb_scroll_register) /* OUT 0 */ AM_RANGE(0x2001, 0x2001) AM_WRITE(abaseb_out1_w) /* OUT 1 */ AM_RANGE(0x2002, 0x2002) AM_WRITE(atarifb_out2_w) /* OUT 2 */ AM_RANGE(0x2003, 0x2003) AM_WRITE(atarifb_out3_w) /* OUT 3 */ - AM_RANGE(0x3000, 0x3000) AM_READ(SMH_RAM) - AM_RANGE(0x3000, 0x3000) AM_WRITENOP /* Interrupt Acknowledge */ + AM_RANGE(0x3000, 0x3000) AM_NOP /* Interrupt Acknowledge */ AM_RANGE(0x4000, 0x4000) AM_READ(atarifb_in0_r) AM_RANGE(0x4002, 0x4002) AM_READ(atarifb_in2_r) AM_RANGE(0x5000, 0x5000) AM_WRITE(watchdog_reset_w) @@ -221,7 +218,7 @@ static ADDRESS_MAP_START( soccer_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x03a0, 0x03ff) AM_RAM_WRITE(atarifb_alpha2_videoram_w) AM_BASE(&atarifb_alphap2_videoram) AM_RANGE(0x0800, 0x0bbf) AM_RAM_WRITE(atarifb_field_videoram_w) AM_BASE(&atarifb_field_videoram) AM_RANGE(0x0bc0, 0x0bff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size) - AM_RANGE(0x1000, 0x1000) AM_WRITE(SMH_RAM) AM_BASE(&atarifb_scroll_register) /* OUT 0 */ + AM_RANGE(0x1000, 0x1000) AM_WRITEONLY AM_BASE(&atarifb_scroll_register) /* OUT 0 */ AM_RANGE(0x1001, 0x1001) AM_WRITE(soccer_out1_w) /* OUT 1 */ AM_RANGE(0x1002, 0x1002) AM_WRITE(soccer_out2_w) /* OUT 2 */ AM_RANGE(0x1004, 0x1004) AM_WRITENOP /* Interrupt Acknowledge */ diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c index 053cf05107b..90776ca84fc 100644 --- a/src/mame/drivers/aztarac.c +++ b/src/mame/drivers/aztarac.c @@ -76,7 +76,7 @@ static READ16_HANDLER( joystick_r ) static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x00bfff) AM_ROM - AM_RANGE(0x022000, 0x0220ff) AM_READWRITE(nvram_r, SMH_RAM) AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) + AM_RANGE(0x022000, 0x0220ff) AM_READ(nvram_r) AM_WRITEONLY AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x027000, 0x027001) AM_READ(joystick_r) AM_RANGE(0x027004, 0x027005) AM_READ_PORT("INPUTS") AM_RANGE(0x027008, 0x027009) AM_READWRITE(aztarac_sound_r, aztarac_sound_w) diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c index 28176f75313..6ed04d49c6a 100644 --- a/src/mame/drivers/bagman.c +++ b/src/mame/drivers/bagman.c @@ -180,9 +180,9 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) //AM_RANGE(0xa800, 0xa805) AM_READ(bagman_ls259_r) /*just for debugging purposes*/ AM_RANGE(0xa000, 0xa000) AM_WRITE(interrupt_enable_w) AM_RANGE(0xa001, 0xa002) AM_WRITE(bagman_flipscreen_w) - AM_RANGE(0xa003, 0xa003) AM_WRITE(SMH_RAM) AM_BASE(&bagman_video_enable) - AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM) /* Super Bagman only */ - AM_RANGE(0x9800, 0x981f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* hidden portion of color RAM */ + AM_RANGE(0xa003, 0xa003) AM_WRITEONLY AM_BASE(&bagman_video_enable) + AM_RANGE(0xc000, 0xffff) AM_ROM /* Super Bagman only */ + AM_RANGE(0x9800, 0x981f) AM_WRITEONLY AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* hidden portion of color RAM */ /* here only to initialize the pointer, */ /* writes are handled by bagman_colorram_w */ AM_RANGE(0xa800, 0xa805) AM_WRITE(bagman_ls259_w) /* TMS5110 driving state machine */ @@ -205,13 +205,13 @@ static ADDRESS_MAP_START( pickin_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7000, 0x77ff) AM_RAM AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(bagman_videoram_w) AM_BASE(&videoram) AM_RANGE(0x9800, 0x9bff) AM_RAM_WRITE(bagman_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x9800, 0x981f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* hidden portion of color RAM */ + AM_RANGE(0x9800, 0x981f) AM_WRITEONLY AM_BASE(&spriteram) AM_SIZE(&spriteram_size) /* hidden portion of color RAM */ /* here only to initialize the pointer, */ /* writes are handled by bagman_colorram_w */ AM_RANGE(0x9c00, 0x9fff) AM_WRITENOP /* written to, but unused */ AM_RANGE(0xa000, 0xa000) AM_WRITE(interrupt_enable_w) AM_RANGE(0xa001, 0xa002) AM_WRITE(bagman_flipscreen_w) - AM_RANGE(0xa003, 0xa003) AM_WRITE(SMH_RAM) AM_BASE(&bagman_video_enable) + AM_RANGE(0xa003, 0xa003) AM_WRITEONLY AM_BASE(&bagman_video_enable) AM_RANGE(0xa004, 0xa004) AM_WRITE(bagman_coin_counter_w) AM_RANGE(0xa800, 0xa800) AM_READ_PORT("DSW") diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c index 94a362af081..ff9723c2c32 100644 --- a/src/mame/drivers/baraduke.c +++ b/src/mame/drivers/baraduke.c @@ -184,7 +184,7 @@ static ADDRESS_MAP_START( baraduke_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8800, 0x8800) AM_WRITE(baraduke_irq_ack_w) /* irq acknowledge */ AM_RANGE(0xb000, 0xb002) AM_WRITE(baraduke_scroll0_w) /* scroll (layer 0) */ AM_RANGE(0xb004, 0xb006) AM_WRITE(baraduke_scroll1_w) /* scroll (layer 1) */ - AM_RANGE(0x6000, 0xffff) AM_READ(SMH_ROM) /* ROM */ + AM_RANGE(0x6000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END static READ8_HANDLER( soundkludge_r ) @@ -199,11 +199,11 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0080, 0x00ff) AM_RAM /* built in RAM */ AM_RANGE(0x1105, 0x1105) AM_READ(soundkludge_r) /* cures speech */ AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", namcos1_cus30_r,namcos1_cus30_w) AM_BASE(&namco_wavedata)/* PSG device, shared RAM */ - AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_ROM) /* MCU external ROM */ - AM_RANGE(0x8000, 0x8000) AM_WRITENOP /* watchdog reset? */ - AM_RANGE(0x8800, 0x8800) AM_WRITENOP /* irq acknoledge? */ + AM_RANGE(0x8000, 0xbfff) AM_ROM /* MCU external ROM */ + AM_RANGE(0x8000, 0x8000) AM_WRITENOP /* watchdog reset? */ + AM_RANGE(0x8800, 0x8800) AM_WRITENOP /* irq acknoledge? */ AM_RANGE(0xc000, 0xc7ff) AM_RAM /* RAM */ - AM_RANGE(0xf000, 0xffff) AM_READ(SMH_ROM) /* MCU internal ROM */ + AM_RANGE(0xf000, 0xffff) AM_ROM /* MCU internal ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index a6715d03976..7e94ebda625 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -209,12 +209,12 @@ VIDEO_START( mechatt ); VIDEO_UPDATE( bbuster ); VIDEO_UPDATE( mechatt ); -static UINT16 *bbuster_ram, *eprom_data; -extern UINT16 *bbuster_pf1_data,*bbuster_pf2_data,*bbuster_pf1_scroll_data,*bbuster_pf2_scroll_data; +static UINT16 *bbusters_ram, *eprom_data; +extern UINT16 *bbusters_pf1_data,*bbusters_pf2_data,*bbusters_pf1_scroll_data,*bbusters_pf2_scroll_data; -WRITE16_HANDLER( bbuster_pf1_w ); -WRITE16_HANDLER( bbuster_pf2_w ); -WRITE16_HANDLER( bbuster_video_w ); +WRITE16_HANDLER( bbusters_pf1_w ); +WRITE16_HANDLER( bbusters_pf2_w ); +WRITE16_HANDLER( bbusters_video_w ); /******************************************************************************/ @@ -321,19 +321,19 @@ static READ16_HANDLER( mechatt_gun_r ) /*******************************************************************************/ -static ADDRESS_MAP_START( bbuster_map, ADDRESS_SPACE_PROGRAM, 16 ) +static ADDRESS_MAP_START( bbusters_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM - AM_RANGE(0x080000, 0x08ffff) AM_RAM AM_BASE(&bbuster_ram) - AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(bbuster_video_w) AM_BASE(&videoram16) + AM_RANGE(0x080000, 0x08ffff) AM_RAM AM_BASE(&bbusters_ram) + AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(bbusters_video_w) AM_BASE(&videoram16) AM_RANGE(0x0a0000, 0x0a0fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x0a1000, 0x0a7fff) AM_RAM /* service mode */ AM_RANGE(0x0a8000, 0x0a8fff) AM_RAM AM_BASE(&spriteram16_2) AM_SIZE(&spriteram_2_size) AM_RANGE(0x0a9000, 0x0affff) AM_RAM /* service mode */ - AM_RANGE(0x0b0000, 0x0b1fff) AM_RAM_WRITE(bbuster_pf1_w) AM_BASE(&bbuster_pf1_data) - AM_RANGE(0x0b2000, 0x0b3fff) AM_RAM_WRITE(bbuster_pf2_w) AM_BASE(&bbuster_pf2_data) + AM_RANGE(0x0b0000, 0x0b1fff) AM_RAM_WRITE(bbusters_pf1_w) AM_BASE(&bbusters_pf1_data) + AM_RANGE(0x0b2000, 0x0b3fff) AM_RAM_WRITE(bbusters_pf2_w) AM_BASE(&bbusters_pf2_data) AM_RANGE(0x0b4000, 0x0b5fff) AM_RAM /* service mode */ - AM_RANGE(0x0b8000, 0x0b8003) AM_WRITE(SMH_RAM) AM_BASE(&bbuster_pf1_scroll_data) - AM_RANGE(0x0b8008, 0x0b800b) AM_WRITE(SMH_RAM) AM_BASE(&bbuster_pf2_scroll_data) + AM_RANGE(0x0b8000, 0x0b8003) AM_WRITEONLY AM_BASE(&bbusters_pf1_scroll_data) + AM_RANGE(0x0b8008, 0x0b800b) AM_WRITEONLY AM_BASE(&bbusters_pf2_scroll_data) AM_RANGE(0x0d0000, 0x0d0fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("COINS") /* Coins */ AM_RANGE(0x0e0002, 0x0e0003) AM_READ_PORT("IN0") /* Player 1 & 2 */ @@ -345,21 +345,21 @@ static ADDRESS_MAP_START( bbuster_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x0e8002, 0x0e8003) AM_READ(control_3_r) AM_RANGE(0x0f0008, 0x0f0009) AM_WRITENOP AM_RANGE(0x0f0018, 0x0f0019) AM_WRITE(sound_cpu_w) - AM_RANGE(0x0f8000, 0x0f80ff) AM_READWRITE(eprom_r, SMH_RAM) AM_BASE(&eprom_data) /* Eeprom */ + AM_RANGE(0x0f8000, 0x0f80ff) AM_READ(eprom_r) AM_WRITEONLY AM_BASE(&eprom_data) /* Eeprom */ ADDRESS_MAP_END /*******************************************************************************/ static ADDRESS_MAP_START( mechatt_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x06ffff) AM_ROM - AM_RANGE(0x070000, 0x07ffff) AM_RAM AM_BASE(&bbuster_ram) - AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(bbuster_video_w) AM_BASE(&videoram16) + AM_RANGE(0x070000, 0x07ffff) AM_RAM AM_BASE(&bbusters_ram) + AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(bbusters_video_w) AM_BASE(&videoram16) AM_RANGE(0x0a0000, 0x0a0fff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x0a1000, 0x0a7fff) AM_WRITENOP - AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE(bbuster_pf1_w) AM_BASE(&bbuster_pf1_data) - AM_RANGE(0x0b8000, 0x0b8003) AM_WRITEONLY AM_BASE(&bbuster_pf1_scroll_data) - AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM_WRITE(bbuster_pf2_w) AM_BASE(&bbuster_pf2_data) - AM_RANGE(0x0c8000, 0x0c8003) AM_WRITEONLY AM_BASE(&bbuster_pf2_scroll_data) + AM_RANGE(0x0b0000, 0x0b3fff) AM_RAM_WRITE(bbusters_pf1_w) AM_BASE(&bbusters_pf1_data) + AM_RANGE(0x0b8000, 0x0b8003) AM_WRITEONLY AM_BASE(&bbusters_pf1_scroll_data) + AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM_WRITE(bbusters_pf2_w) AM_BASE(&bbusters_pf2_data) + AM_RANGE(0x0c8000, 0x0c8003) AM_WRITEONLY AM_BASE(&bbusters_pf2_scroll_data) AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE(&paletteram16) AM_RANGE(0x0e0000, 0x0e0001) AM_READ_PORT("IN0") AM_RANGE(0x0e0002, 0x0e0003) AM_READ_PORT("DSW1") @@ -708,7 +708,7 @@ static MACHINE_DRIVER_START( bbusters ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000, 12000000) - MDRV_CPU_PROGRAM_MAP(bbuster_map) + MDRV_CPU_PROGRAM_MAP(bbusters_map) MDRV_CPU_VBLANK_INT("screen", irq6_line_hold) MDRV_CPU_ADD("audiocpu", Z80,4000000) /* Accurate */ diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c index 01c358d2e32..2d1691d4df1 100644 --- a/src/mame/drivers/beathead.c +++ b/src/mame/drivers/beathead.c @@ -336,7 +336,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x41000220, 0x41000227) AM_WRITE(coin_count_w) AM_RANGE(0x41000300, 0x41000303) AM_READ(input_2_r) AM_RANGE(0x41000304, 0x41000307) AM_READ_PORT("IN3") - AM_RANGE(0x41000400, 0x41000403) AM_WRITE(SMH_RAM) AM_BASE(&beathead_palette_select) + AM_RANGE(0x41000400, 0x41000403) AM_WRITEONLY AM_BASE(&beathead_palette_select) AM_RANGE(0x41000500, 0x41000503) AM_WRITE(eeprom_enable_w) AM_RANGE(0x41000600, 0x41000603) AM_WRITE(beathead_finescroll_w) AM_RANGE(0x41000700, 0x41000703) AM_WRITE(watchdog_reset32_w) @@ -347,7 +347,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x8f900000, 0x8f97ffff) AM_WRITE(beathead_vram_transparent_w) AM_RANGE(0x8f980000, 0x8f9fffff) AM_RAM AM_BASE(&videoram32) AM_RANGE(0x8fb80000, 0x8fbfffff) AM_WRITE(beathead_vram_bulk_w) - AM_RANGE(0x8fff8000, 0x8fff8003) AM_WRITE(SMH_RAM) AM_BASE(&beathead_vram_bulk_latch) + AM_RANGE(0x8fff8000, 0x8fff8003) AM_WRITEONLY AM_BASE(&beathead_vram_bulk_latch) AM_RANGE(0x9e280000, 0x9e2fffff) AM_WRITE(beathead_vram_copy_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c index 5a1dde4fa81..11aa94edc11 100644 --- a/src/mame/drivers/berzerk.c +++ b/src/mame/drivers/berzerk.c @@ -581,11 +581,11 @@ static ADDRESS_MAP_START( berzerk_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x48, 0x48) AM_READ_PORT("P1") AM_WRITENOP AM_RANGE(0x49, 0x49) AM_READ_PORT("SYSTEM") AM_WRITENOP AM_RANGE(0x4a, 0x4a) AM_READ_PORT("P2") AM_WRITENOP - AM_RANGE(0x4b, 0x4b) AM_READWRITE(SMH_NOP, magicram_control_w) + AM_RANGE(0x4b, 0x4b) AM_READNOP AM_WRITE(magicram_control_w) AM_RANGE(0x4c, 0x4c) AM_READWRITE(nmi_enable_r, nmi_enable_w) AM_RANGE(0x4d, 0x4d) AM_READWRITE(nmi_disable_r, nmi_disable_w) - AM_RANGE(0x4e, 0x4e) AM_READWRITE(intercept_v256_r, SMH_NOP) - AM_RANGE(0x4f, 0x4f) AM_READWRITE(SMH_NOP, irq_enable_w) + AM_RANGE(0x4e, 0x4e) AM_READ(intercept_v256_r) AM_WRITENOP + AM_RANGE(0x4f, 0x4f) AM_READNOP AM_WRITE(irq_enable_w) AM_RANGE(0x50, 0x57) AM_NOP /* second sound board, but not used */ AM_RANGE(0x58, 0x5f) AM_NOP AM_RANGE(0x60, 0x60) AM_MIRROR(0x18) AM_READ_PORT("F3") AM_WRITENOP diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index 1643579a010..6e5d41cb4a5 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -1306,10 +1306,10 @@ static MACHINE_RESET( bfcobra ) ***************************************************************************/ static ADDRESS_MAP_START( z80_prog_map, ADDRESS_SPACE_PROGRAM, 8 ) - AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_BANK(4)) - AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_BANK(1)) - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK(2), SMH_BANK(2)) - AM_RANGE(0xc000, 0xffff) AM_READWRITE(SMH_BANK(3), SMH_BANK(3)) + AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(4) + AM_RANGE(0x4000, 0x7fff) AM_RAMBANK(1) + AM_RANGE(0x8000, 0xbfff) AM_RAMBANK(2) + AM_RANGE(0xc000, 0xffff) AM_RAMBANK(3) ADDRESS_MAP_END static ADDRESS_MAP_START( z80_io_map, ADDRESS_SPACE_IO, 8 ) @@ -1454,7 +1454,7 @@ static ADDRESS_MAP_START( m6809_prog_map, ADDRESS_SPACE_PROGRAM, 8 ) // AM_RANGE(0x340A, 0x340A) AM_NOP // AM_RANGE(0x3600, 0x3600) AM_NOP AM_RANGE(0x3801, 0x3801) AM_DEVREADWRITE("upd", upd_r, upd_w) - AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM) + AM_RANGE(0x8000, 0xffff) AM_ROM AM_RANGE(0xf000, 0xf000) AM_WRITENOP /* Watchdog */ ADDRESS_MAP_END diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c index da03d924c8c..8cba32b8b9f 100644 --- a/src/mame/drivers/bfm_sc1.c +++ b/src/mame/drivers/bfm_sc1.c @@ -766,18 +766,18 @@ static MACHINE_RESET( bfm_sc1 ) static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1FFF) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) //8k RAM - AM_RANGE(0x2000, 0x21FF) AM_WRITE(reel34_w) // reel 2+3 latch - AM_RANGE(0x2200, 0x23FF) AM_WRITE(reel12_w) // reel 1+2 latch - AM_RANGE(0x2400, 0x25FF) AM_WRITE(vfd_w) // vfd latch + AM_RANGE(0x2000, 0x21FF) AM_WRITE(reel34_w) // reel 2+3 latch + AM_RANGE(0x2200, 0x23FF) AM_WRITE(reel12_w) // reel 1+2 latch + AM_RANGE(0x2400, 0x25FF) AM_WRITE(vfd_w) // vfd latch - AM_RANGE(0x2600, 0x27FF) AM_READWRITE(mmtr_r,mmtr_w) // mechanical meters - AM_RANGE(0x2800, 0x2800) AM_READWRITE(triac_r,triac_w) // payslide triacs + AM_RANGE(0x2600, 0x27FF) AM_READWRITE(mmtr_r,mmtr_w) // mechanical meters + AM_RANGE(0x2800, 0x2800) AM_READWRITE(triac_r,triac_w) // payslide triacs AM_RANGE(0x2A00, 0x2A00) AM_READWRITE(mux1latch_r,mux1latch_w) // mux1 AM_RANGE(0x2A01, 0x2A01) AM_READWRITE(mux1datlo_r,mux1datlo_w) AM_RANGE(0x2A02, 0x2A02) AM_READWRITE(mux1dathi_r,mux1dathi_w) - AM_RANGE(0x2E00, 0x2E00) AM_READ(irqlatch_r) // irq latch + AM_RANGE(0x2E00, 0x2E00) AM_READ(irqlatch_r) // irq latch AM_RANGE(0x3001, 0x3001) AM_READ(soundlatch_r) AM_RANGE(0x3001, 0x3001) AM_DEVWRITE("ay", ay8910_data_w) @@ -790,15 +790,15 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3409, 0x3409) AM_READWRITE(mux2datlo_r,mux2datlo_w) AM_RANGE(0x340A, 0x340A) AM_READWRITE(mux2dathi_r,mux2dathi_w) - AM_RANGE(0x3404, 0x3404) AM_READ(dipcoin_r ) // coin input on gamecard - AM_RANGE(0x3801, 0x3801) AM_READNOP // uPD5579 status on soundcard (not installed) + AM_RANGE(0x3404, 0x3404) AM_READ(dipcoin_r ) // coin input on gamecard + AM_RANGE(0x3801, 0x3801) AM_READNOP // uPD5579 status on soundcard (not installed) - AM_RANGE(0x3600, 0x3600) AM_WRITE(bankswitch_w) // write bank - AM_RANGE(0x3800, 0x39FF) AM_WRITE(reel56_w) // reel 5+6 latch + AM_RANGE(0x3600, 0x3600) AM_WRITE(bankswitch_w) // write bank + AM_RANGE(0x3800, 0x39FF) AM_WRITE(reel56_w) // reel 5+6 latch - AM_RANGE(0x4000, 0x5FFF) AM_ROM // 8k ROM - AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK(1)) // 8k paged ROM (4 pages) - AM_RANGE(0x8000, 0xFFFF) AM_READWRITE(SMH_ROM,watchdog_w) // 32k ROM + AM_RANGE(0x4000, 0x5FFF) AM_ROM // 8k ROM + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) // 8k paged ROM (4 pages) + AM_RANGE(0x8000, 0xFFFF) AM_RAM AM_WRITE(watchdog_w) // 32k ROM ADDRESS_MAP_END @@ -844,9 +844,9 @@ static ADDRESS_MAP_START( memmap_adder2, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3E00, 0x3E00) AM_READWRITE(vid_uart_ctrl_r,vid_uart_ctrl_w) // video uart control reg read AM_RANGE(0x3E01, 0x3E01) AM_READWRITE(vid_uart_rx_r,vid_uart_tx_w) // video uart receive reg - AM_RANGE(0x4000, 0x5FFF) AM_ROM // 8k ROM - AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK(1)) // 8k paged ROM (4 pages) - AM_RANGE(0x8000, 0xFFFF) AM_READWRITE(SMH_ROM,watchdog_w) // 32k ROM + AM_RANGE(0x4000, 0x5FFF) AM_ROM // 8k ROM + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) // 8k paged ROM (4 pages) + AM_RANGE(0x8000, 0xFFFF) AM_ROM AM_WRITE(watchdog_w) // 32k ROM ADDRESS_MAP_END @@ -890,8 +890,8 @@ static ADDRESS_MAP_START( sc1_nec_uk, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3800, 0x39FF) AM_DEVWRITE("upd", nec_latch_w) AM_RANGE(0x4000, 0x5FFF) AM_ROM // 8k ROM - AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK(1)) // 8k paged ROM (4 pages) - AM_RANGE(0x8000, 0xFFFF) AM_READWRITE(SMH_ROM,watchdog_w) // 32k ROM + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) // 8k paged ROM (4 pages) + AM_RANGE(0x8000, 0xFFFF) AM_ROM AM_WRITE(watchdog_w) // 32k ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 015ae7bd8cd..5b28e7e8423 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -1556,7 +1556,7 @@ static ADDRESS_MAP_START( memmap_vid, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3FFF, 0x3FFF) AM_READ(coin_input_r) AM_RANGE(0x4000, 0x5fff) AM_ROM // 8k fixed ROM AM_RANGE(0x4000, 0xFFFF) AM_WRITE(unknown_w) // contains unknown I/O registers - AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK(1)) // 8k paged ROM (4 pages) + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) // 8k paged ROM (4 pages) AM_RANGE(0x8000, 0xFFFF) AM_ROM // 32k ROM ADDRESS_MAP_END @@ -2790,7 +2790,7 @@ static ADDRESS_MAP_START( sc2_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3FFF, 0x3FFF) AM_READ( coin_input_r) AM_RANGE(0x4000, 0x5FFF) AM_ROM /* 8k fixed ROM */ - AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK(1)) /* 8k paged ROM (4 pages) */ + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) /* 8k paged ROM (4 pages) */ AM_RANGE(0x8000, 0xFFFF) AM_ROM /* 32k ROM */ ADDRESS_MAP_END @@ -2839,7 +2839,7 @@ static ADDRESS_MAP_START( sc3_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3FFF, 0x3FFF) AM_READ( coin_input_r) AM_RANGE(0x4000, 0x5FFF) AM_ROM // AM_RANGE(0x4000, 0xFFFF) AM_WRITE(unknown_w) - AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK(1)) + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) AM_RANGE(0x8000, 0xFFFF) AM_ROM ADDRESS_MAP_END @@ -2889,7 +2889,7 @@ static ADDRESS_MAP_START( memmap_sc2_dm01, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3FFF, 0x3FFF) AM_READ( coin_input_r) AM_RANGE(0x4000, 0x5FFF) AM_ROM // AM_RANGE(0x4000, 0xFFFF) AM_WRITE(unknown_w) - AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK(1)) + AM_RANGE(0x6000, 0x7FFF) AM_ROMBANK(1) AM_RANGE(0x8000, 0xFFFF) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c index 569e17323b6..0d4764482f2 100644 --- a/src/mame/drivers/bfmsys85.c +++ b/src/mame/drivers/bfmsys85.c @@ -426,7 +426,7 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3600, 0x3600) AM_WRITE(mux_enable_w) // mux enable - AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM) // 48K ROM + AM_RANGE(0x4000, 0xffff) AM_ROM // 48K ROM AM_RANGE(0x8000, 0xFFFF) AM_WRITE(watchdog_w) // kick watchdog ADDRESS_MAP_END diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index 17622f59461..6f845fedd2f 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -332,10 +332,10 @@ static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x080000, 0x0805ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) AM_RANGE(0x080600, 0x080fff) AM_READ(sharedram_r) AM_WRITE(sharedram_w) AM_BASE(&sharedram16) AM_RANGE(0x081000, 0x085fff) AM_RAM //?? - AM_RANGE(0x086000, 0x086fff) AM_READ(SMH_RAM) AM_WRITE(bg_videoram_w) AM_BASE(&bg_videoram) - AM_RANGE(0x087000, 0x087fff) AM_READ(SMH_RAM) AM_WRITE(fg_videoram_w) AM_BASE(&fg_videoram) - AM_RANGE(0x088000, 0x089fff) AM_READ(SMH_RAM) AM_WRITE(text_videoram_w) AM_BASE(&text_videoram) - AM_RANGE(0x08a000, 0x08afff) AM_READ(SMH_RAM) AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) + AM_RANGE(0x086000, 0x086fff) AM_READONLY AM_WRITE(bg_videoram_w) AM_BASE(&bg_videoram) + AM_RANGE(0x087000, 0x087fff) AM_READONLY AM_WRITE(fg_videoram_w) AM_BASE(&fg_videoram) + AM_RANGE(0x088000, 0x089fff) AM_READONLY AM_WRITE(text_videoram_w) AM_BASE(&text_videoram) + AM_RANGE(0x08a000, 0x08afff) AM_READONLY AM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16) AM_RANGE(0x08b000, 0x08bfff) AM_RAM //?? AM_RANGE(0x08c000, 0x08c001) AM_READ_PORT("P1") AM_RANGE(0x08c002, 0x08c003) AM_READ_PORT("P2") diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index 5b54ba846e8..f31cb60624e 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -394,7 +394,7 @@ static ADDRESS_MAP_START( bishjan_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE( 0x437000, 0x4371ff ) AM_WRITE( bishjan_scrollram_1_hi_lo_word_w ) - AM_RANGE( 0x600000, 0x600001 ) AM_READWRITE( SMH_NOP, bishjan_sel_w ) + AM_RANGE( 0x600000, 0x600001 ) AM_READNOP AM_WRITE( bishjan_sel_w ) AM_RANGE( 0x600060, 0x600063 ) AM_WRITE( colordac_word_w ) AM_RANGE( 0x6000a0, 0x6000a1 ) AM_WRITE( bishjan_byte_lo_msb_w ) diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index 449ff09f1b8..5720228d1e7 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -113,31 +113,31 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_READWRITE(K007342_r, K007342_w) /* Color RAM + Video RAM */ AM_RANGE(0x2000, 0x21ff) AM_READWRITE(K007420_r, K007420_w) /* Sprite RAM */ AM_RANGE(0x2200, 0x23ff) AM_READWRITE(K007342_scroll_r, K007342_scroll_w) /* Scroll RAM */ - AM_RANGE(0x2400, 0x245f) AM_RAM AM_BASE(&paletteram) /* palette */ - AM_RANGE(0x2600, 0x2607) AM_WRITE(K007342_vreg_w) /* Video Registers */ - AM_RANGE(0x2e00, 0x2e00) AM_READ_PORT("COINSW") /* DIPSW #3, coinsw, startsw */ - AM_RANGE(0x2e01, 0x2e01) AM_READ_PORT("P1") /* 1P controls */ - AM_RANGE(0x2e02, 0x2e02) AM_READ_PORT("P2") /* 2P controls */ - AM_RANGE(0x2e03, 0x2e03) AM_READ_PORT("DSW2") /* DISPW #2 */ - AM_RANGE(0x2e40, 0x2e40) AM_READ_PORT("DSW1") /* DIPSW #1 */ + AM_RANGE(0x2400, 0x245f) AM_RAM AM_BASE(&paletteram) /* palette */ + AM_RANGE(0x2600, 0x2607) AM_WRITE(K007342_vreg_w) /* Video Registers */ + AM_RANGE(0x2e00, 0x2e00) AM_READ_PORT("COINSW") /* DIPSW #3, coinsw, startsw */ + AM_RANGE(0x2e01, 0x2e01) AM_READ_PORT("P1") /* 1P controls */ + AM_RANGE(0x2e02, 0x2e02) AM_READ_PORT("P2") /* 2P controls */ + AM_RANGE(0x2e03, 0x2e03) AM_READ_PORT("DSW2") /* DISPW #2 */ + AM_RANGE(0x2e40, 0x2e40) AM_READ_PORT("DSW1") /* DIPSW #1 */ AM_RANGE(0x2e80, 0x2e80) AM_WRITE(bladestl_sh_irqtrigger_w) /* cause interrupt on audio CPU */ - AM_RANGE(0x2ec0, 0x2ec0) AM_WRITE(watchdog_reset_w) /* watchdog reset */ - AM_RANGE(0x2f00, 0x2f03) AM_READ(trackball_r) /* Trackballs */ + AM_RANGE(0x2ec0, 0x2ec0) AM_WRITE(watchdog_reset_w) /* watchdog reset */ + AM_RANGE(0x2f00, 0x2f03) AM_READ(trackball_r) /* Trackballs */ AM_RANGE(0x2f40, 0x2f40) AM_WRITE(bladestl_bankswitch_w) /* bankswitch control */ AM_RANGE(0x2f80, 0x2f9f) AM_READWRITE(K051733_r, K051733_w) /* Protection: 051733 */ - AM_RANGE(0x2fc0, 0x2fc0) AM_WRITENOP /* ??? */ - AM_RANGE(0x4000, 0x5fff) AM_RAM /* Work RAM */ - AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_RAM) /* banked ROM */ + AM_RANGE(0x2fc0, 0x2fc0) AM_WRITENOP /* ??? */ + AM_RANGE(0x4000, 0x5fff) AM_RAM /* Work RAM */ + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) /* banked ROM */ AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM - AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) /* YM2203 */ + AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) /* YM2203 */ AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("upd", bladestl_speech_ctrl_w) /* UPD7759 */ - AM_RANGE(0x4000, 0x4000) AM_DEVREAD("upd", bladestl_speech_busy_r) /* UPD7759 */ - AM_RANGE(0x5000, 0x5000) AM_WRITENOP /* ??? */ - AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) /* soundlatch_r */ + AM_RANGE(0x4000, 0x4000) AM_DEVREAD("upd", bladestl_speech_busy_r) /* UPD7759 */ + AM_RANGE(0x5000, 0x5000) AM_WRITENOP /* ??? */ + AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r) /* soundlatch_r */ AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c index 963814e84c9..8b4249a99e3 100644 --- a/src/mame/drivers/blktiger.c +++ b/src/mame/drivers/blktiger.c @@ -88,7 +88,7 @@ static WRITE8_HANDLER( blktiger_coinlockout_w ) static ADDRESS_MAP_START( blktiger_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM - AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) AM_RANGE(0xc000, 0xcfff) AM_READWRITE(blktiger_bgvideoram_r, blktiger_bgvideoram_w) AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(blktiger_txvideoram_w) AM_BASE(&blktiger_txvideoram) AM_RANGE(0xd800, 0xdbff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE(&paletteram) diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index ae843c0d516..d9700dcbdce 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -117,28 +117,28 @@ static READ16_HANDLER( blmbycar_opt_wheel_r ) static ADDRESS_MAP_START( blmbycar_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0xfec000, 0xfeffff) AM_RAM - AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM ) // - AM_RANGE(0x104000, 0x105fff) AM_RAM_WRITE(blmbycar_vram_1_w) AM_BASE(&blmbycar_vram_1 ) // Layer 1 - AM_RANGE(0x106000, 0x107fff) AM_RAM_WRITE(blmbycar_vram_0_w) AM_BASE(&blmbycar_vram_0 ) // Layer 0 - AM_RANGE(0x108000, 0x10bfff) AM_WRITE(SMH_RAM ) // - AM_RANGE(0x10c000, 0x10c003) AM_WRITE(SMH_RAM) AM_BASE(&blmbycar_scroll_1 ) // Scroll 1 - AM_RANGE(0x10c004, 0x10c007) AM_WRITE(SMH_RAM) AM_BASE(&blmbycar_scroll_0 ) // Scroll 0 - AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(blmbycar_palette_w ) // Palette + AM_RANGE(0x100000, 0x103fff) AM_WRITEONLY // ??? + AM_RANGE(0x104000, 0x105fff) AM_RAM_WRITE(blmbycar_vram_1_w) AM_BASE(&blmbycar_vram_1) // Layer 1 + AM_RANGE(0x106000, 0x107fff) AM_RAM_WRITE(blmbycar_vram_0_w) AM_BASE(&blmbycar_vram_0) // Layer 0 + AM_RANGE(0x108000, 0x10bfff) AM_WRITEONLY // ??? + AM_RANGE(0x10c000, 0x10c003) AM_WRITEONLY AM_BASE(&blmbycar_scroll_1) // Scroll 1 + AM_RANGE(0x10c004, 0x10c007) AM_WRITEONLY AM_BASE(&blmbycar_scroll_0) // Scroll 0 + AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(blmbycar_palette_w) // Palette AM_RANGE(0x200600, 0x203fff) AM_RAM - AM_RANGE(0x204000, 0x2045ff) AM_RAM_WRITE(blmbycar_palette_w) AM_BASE(&paletteram16 ) // Palette + AM_RANGE(0x204000, 0x2045ff) AM_RAM_WRITE(blmbycar_palette_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0x204600, 0x207fff) AM_RAM AM_RANGE(0x440000, 0x441fff) AM_RAM - AM_RANGE(0x444000, 0x445fff) AM_RAM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites (size?) - AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW" ) - AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P1_P2" ) - AM_RANGE(0x700004, 0x700005) AM_READ(blmbycar_opt_wheel_r ) // Wheel (optical) - AM_RANGE(0x700006, 0x700007) AM_READ_PORT("UNK" ) - AM_RANGE(0x700008, 0x700009) AM_READ(blmbycar_pot_wheel_r ) // Wheel (potentiometer) - AM_RANGE(0x70000a, 0x70000b) AM_WRITE(SMH_NOP ) // ? Wheel - AM_RANGE(0x70000c, 0x70000d) AM_WRITE(blmbycar_okibank_w ) // Sound + AM_RANGE(0x444000, 0x445fff) AM_WRITEONLY AM_BASE(&spriteram16) AM_SIZE(&spriteram_size)// Sprites (size?) + AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW") + AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P1_P2") + AM_RANGE(0x700004, 0x700005) AM_READ(blmbycar_opt_wheel_r) // Wheel (optical) + AM_RANGE(0x700006, 0x700007) AM_READ_PORT("UNK") + AM_RANGE(0x700008, 0x700009) AM_READ(blmbycar_pot_wheel_r) // Wheel (potentiometer) + AM_RANGE(0x70000a, 0x70000b) AM_WRITENOP // ? Wheel + AM_RANGE(0x70000c, 0x70000d) AM_WRITE(blmbycar_okibank_w) // Sound AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // Sound - AM_RANGE(0x70006a, 0x70006b) AM_WRITE(blmbycar_pot_wheel_reset_w ) // Wheel (potentiometer) - AM_RANGE(0x70007a, 0x70007b) AM_WRITE(blmbycar_pot_wheel_shift_w ) // + AM_RANGE(0x70006a, 0x70006b) AM_WRITE(blmbycar_pot_wheel_reset_w) // Wheel (potentiometer) + AM_RANGE(0x70007a, 0x70007b) AM_WRITE(blmbycar_pot_wheel_shift_w) // ADDRESS_MAP_END static READ16_HANDLER( waterball_unk_r ) @@ -153,24 +153,24 @@ static READ16_HANDLER( waterball_unk_r ) static ADDRESS_MAP_START( watrball_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0xfec000, 0xfeffff) AM_RAM - AM_RANGE(0x100000, 0x103fff) AM_WRITE(SMH_RAM ) // - AM_RANGE(0x104000, 0x105fff) AM_RAM_WRITE(blmbycar_vram_1_w) AM_BASE(&blmbycar_vram_1 ) // Layer 1 - AM_RANGE(0x106000, 0x107fff) AM_RAM_WRITE(blmbycar_vram_0_w) AM_BASE(&blmbycar_vram_0 ) // Layer 0 - AM_RANGE(0x108000, 0x10bfff) AM_WRITE(SMH_RAM ) // - AM_RANGE(0x10c000, 0x10c003) AM_WRITE(SMH_RAM) AM_BASE(&blmbycar_scroll_1 ) // Scroll 1 - AM_RANGE(0x10c004, 0x10c007) AM_WRITE(SMH_RAM) AM_BASE(&blmbycar_scroll_0 ) // Scroll 0 - AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(blmbycar_palette_w ) // Palette + AM_RANGE(0x100000, 0x103fff) AM_WRITEONLY // ??? + AM_RANGE(0x104000, 0x105fff) AM_RAM_WRITE(blmbycar_vram_1_w) AM_BASE(&blmbycar_vram_1) // Layer 1 + AM_RANGE(0x106000, 0x107fff) AM_RAM_WRITE(blmbycar_vram_0_w) AM_BASE(&blmbycar_vram_0) // Layer 0 + AM_RANGE(0x108000, 0x10bfff) AM_WRITEONLY // ??? + AM_RANGE(0x10c000, 0x10c003) AM_WRITEONLY AM_BASE(&blmbycar_scroll_1) // Scroll 1 + AM_RANGE(0x10c004, 0x10c007) AM_WRITEONLY AM_BASE(&blmbycar_scroll_0) // Scroll 0 + AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(blmbycar_palette_w) // Palette AM_RANGE(0x200600, 0x203fff) AM_RAM - AM_RANGE(0x204000, 0x2045ff) AM_RAM_WRITE(blmbycar_palette_w) AM_BASE(&paletteram16 ) // Palette + AM_RANGE(0x204000, 0x2045ff) AM_RAM_WRITE(blmbycar_palette_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0x204600, 0x207fff) AM_RAM AM_RANGE(0x440000, 0x441fff) AM_RAM - AM_RANGE(0x444000, 0x445fff) AM_RAM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size ) // Sprites (size?) - AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW" ) - AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P1_P2" ) - AM_RANGE(0x700006, 0x700007) AM_READ(SMH_NOP ) // read - AM_RANGE(0x700008, 0x700009) AM_READ(waterball_unk_r ) // 0x0008 must toggle - AM_RANGE(0x70000a, 0x70000b) AM_WRITE(SMH_NOP ) // ?? busy - AM_RANGE(0x70000c, 0x70000d) AM_WRITE(blmbycar_okibank_w ) // Sound + AM_RANGE(0x444000, 0x445fff) AM_WRITEONLY AM_BASE(&spriteram16) AM_SIZE(&spriteram_size)// Sprites (size?) + AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW") + AM_RANGE(0x700002, 0x700003) AM_READ_PORT("P1_P2") + AM_RANGE(0x700006, 0x700007) AM_READNOP // read + AM_RANGE(0x700008, 0x700009) AM_READ(waterball_unk_r) // 0x0008 must toggle + AM_RANGE(0x70000a, 0x70000b) AM_WRITEONLY // ?? busy + AM_RANGE(0x70000c, 0x70000d) AM_WRITE(blmbycar_okibank_w) // Sound AM_RANGE(0x70000e, 0x70000f) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // ADDRESS_MAP_END diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index 5d964568b5d..90abbb1d05a 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -79,7 +79,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_READWRITE(K052109_051960_r, K052109_051960_w) AM_RANGE(0x4000, 0x57ff) AM_RAM AM_RANGE(0x5800, 0x5fff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE(&ram) - AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c index 7a857084421..f7f53e4289d 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -58,7 +58,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x180000, 0x1bffff) AM_RAM_WRITE(blockout_videoram_w) AM_BASE(&blockout_videoram) AM_RANGE(0x1d4000, 0x1dffff) AM_RAM /* work RAM */ AM_RANGE(0x1f4000, 0x1fffff) AM_RAM /* work RAM */ - AM_RANGE(0x200000, 0x207fff) AM_RAM_WRITE(SMH_RAM) AM_BASE(&blockout_frontvideoram) + AM_RANGE(0x200000, 0x207fff) AM_WRITEONLY AM_BASE(&blockout_frontvideoram) AM_RANGE(0x208000, 0x21ffff) AM_RAM /* ??? */ AM_RANGE(0x280002, 0x280003) AM_WRITE(blockout_frontcolor_w) AM_RANGE(0x280200, 0x2805ff) AM_RAM_WRITE(blockout_paletteram_w) AM_BASE(&paletteram16) diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c index ea4cf75097f..db8db9f85ee 100644 --- a/src/mame/drivers/blstroid.c +++ b/src/mame/drivers/blstroid.c @@ -87,7 +87,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff8200, 0xff8201) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_scanline_int_ack_w) AM_RANGE(0xff8400, 0xff8401) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_video_int_ack_w) AM_RANGE(0xff8600, 0xff8601) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_eeprom_enable_w) - AM_RANGE(0xff8800, 0xff89ff) AM_MIRROR(0x7f8000) AM_WRITE(SMH_RAM) AM_BASE(&blstroid_priorityram) + AM_RANGE(0xff8800, 0xff89ff) AM_MIRROR(0x7f8000) AM_WRITEONLY AM_BASE(&blstroid_priorityram) AM_RANGE(0xff8a00, 0xff8a01) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_sound_w) AM_RANGE(0xff8c00, 0xff8c01) AM_MIRROR(0x7f81fe) AM_WRITE(atarigen_sound_reset_w) AM_RANGE(0xff8e00, 0xff8e01) AM_MIRROR(0x7f81fe) AM_WRITE(blstroid_halt_until_hblank_0_w) diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 61841537110..f694549cb95 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -1243,12 +1243,12 @@ static ADDRESS_MAP_START( bnstars_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xfce00058, 0xfce0005b) AM_WRITENOP AM_RANGE(0xfce0005c, 0xfce0005f) AM_WRITENOP - AM_RANGE(0xfce00400, 0xfce0045f) AM_WRITE(SMH_RAM) AM_BASE(&ms32_roz_ctrl[0]) - AM_RANGE(0xfce00700, 0xfce0075f) AM_WRITE(SMH_RAM) AM_BASE(&ms32_roz_ctrl[1]) // guess - AM_RANGE(0xfce00a00, 0xfce00a17) AM_WRITE(SMH_RAM) AM_BASE(&ms32_tx0_scroll) - AM_RANGE(0xfce00a20, 0xfce00a37) AM_WRITE(SMH_RAM) AM_BASE(&ms32_bg0_scroll) - AM_RANGE(0xfce00c00, 0xfce00c17) AM_WRITE(SMH_RAM) AM_BASE(&ms32_tx1_scroll) - AM_RANGE(0xfce00c20, 0xfce00c37) AM_WRITE(SMH_RAM) AM_BASE(&ms32_bg1_scroll) + AM_RANGE(0xfce00400, 0xfce0045f) AM_WRITEONLY AM_BASE(&ms32_roz_ctrl[0]) + AM_RANGE(0xfce00700, 0xfce0075f) AM_WRITEONLY AM_BASE(&ms32_roz_ctrl[1]) // guess + AM_RANGE(0xfce00a00, 0xfce00a17) AM_WRITEONLY AM_BASE(&ms32_tx0_scroll) + AM_RANGE(0xfce00a20, 0xfce00a37) AM_WRITEONLY AM_BASE(&ms32_bg0_scroll) + AM_RANGE(0xfce00c00, 0xfce00c17) AM_WRITEONLY AM_BASE(&ms32_tx1_scroll) + AM_RANGE(0xfce00c20, 0xfce00c37) AM_WRITEONLY AM_BASE(&ms32_bg1_scroll) AM_RANGE(0xfce00e00, 0xfce00e03) AM_WRITE(bnstars1_mahjong_select_w) // ? @@ -1266,7 +1266,7 @@ static ADDRESS_MAP_START( bnstars_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0xfec08000, 0xfec0ffff) AM_RAM_WRITE(ms32_bg0_ram_w) AM_BASE(&ms32_bg0_ram) AM_RANGE(0xfee00000, 0xfee1ffff) AM_RAM - AM_RANGE(0xffe00000, 0xffffffff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0xffe00000, 0xffffffff) AM_ROMBANK(1) ADDRESS_MAP_END #if 0 diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c index 96e2616c801..1e753b08582 100644 --- a/src/mame/drivers/bombjack.c +++ b/src/mame/drivers/bombjack.c @@ -144,7 +144,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(bombjack_videoram_w) AM_BASE(&videoram) AM_RANGE(0x9400, 0x97ff) AM_RAM_WRITE(bombjack_colorram_w) AM_BASE(&colorram) - AM_RANGE(0x9820, 0x987f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0x9820, 0x987f) AM_WRITEONLY AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0x9a00, 0x9a00) AM_WRITENOP AM_RANGE(0x9c00, 0x9cff) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_le_w) AM_BASE(&paletteram) AM_RANGE(0x9e00, 0x9e00) AM_WRITE(bombjack_background_w) diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index 008238de932..4614a80010a 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -109,13 +109,13 @@ static ADDRESS_MAP_START( boogwing_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x24e344, 0x24e345) AM_READ_PORT("INPUTS") AM_RANGE(0x24e000, 0x24e7ff) AM_WRITE(deco16_104_prot_w) AM_BASE(&deco16_prot_ram) - AM_RANGE(0x260000, 0x26000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf12_control) + AM_RANGE(0x260000, 0x26000f) AM_WRITEONLY AM_BASE(&deco16_pf12_control) AM_RANGE(0x264000, 0x265fff) AM_RAM_WRITE(deco16_pf1_data_w) AM_BASE(&deco16_pf1_data) AM_RANGE(0x266000, 0x267fff) AM_RAM_WRITE(deco16_pf2_data_w) AM_BASE(&deco16_pf2_data) AM_RANGE(0x268000, 0x268fff) AM_RAM AM_BASE(&deco16_pf1_rowscroll) AM_RANGE(0x26a000, 0x26afff) AM_RAM AM_BASE(&deco16_pf2_rowscroll) - AM_RANGE(0x270000, 0x27000f) AM_WRITE(SMH_RAM) AM_BASE(&deco16_pf34_control) + AM_RANGE(0x270000, 0x27000f) AM_WRITEONLY AM_BASE(&deco16_pf34_control) AM_RANGE(0x274000, 0x275fff) AM_RAM_WRITE(deco16_pf3_data_w) AM_BASE(&deco16_pf3_data) AM_RANGE(0x276000, 0x277fff) AM_RAM_WRITE(deco16_pf4_data_w) AM_BASE(&deco16_pf4_data) AM_RANGE(0x278000, 0x278fff) AM_RAM AM_BASE(&deco16_pf3_rowscroll) @@ -137,7 +137,7 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE("oki1", okim6295_r, okim6295_w) AM_RANGE(0x130000, 0x130001) AM_DEVREADWRITE("oki2", okim6295_r, okim6295_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) - AM_RANGE(0x1f0000, 0x1f1fff) AM_READWRITE(SMH_BANK(8), SMH_BANK(8)) + AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(8) AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index 0704c4b4afc..b6c8e3936f9 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -147,7 +147,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2000, 0x27ff) AM_READWRITE(bottom9_bankedram2_r, bottom9_bankedram2_w) AM_BASE(&paletteram) AM_RANGE(0x0000, 0x3fff) AM_READWRITE(K052109_051960_r, K052109_051960_w) AM_RANGE(0x4000, 0x5fff) AM_RAM - AM_RANGE(0x6000, 0x7fff) AM_READWRITE(SMH_BANK(1), SMH_ROM) + AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(1) AM_RANGE(0x8000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 96ff109d241..f256d257dc3 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -191,7 +191,7 @@ static ADDRESS_MAP_START( boxer_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1b00, 0x1bff) AM_WRITE(boxer_crowd_w) AM_RANGE(0x1c00, 0x1cff) AM_WRITE(boxer_irq_reset_w) AM_RANGE(0x1d00, 0x1dff) AM_WRITE(boxer_bell_w) - AM_RANGE(0x1e00, 0x1eff) AM_WRITE(SMH_RAM) AM_BASE(&boxer_sprite_ram) + AM_RANGE(0x1e00, 0x1eff) AM_WRITEONLY AM_BASE(&boxer_sprite_ram) AM_RANGE(0x1f00, 0x1fff) AM_WRITE(watchdog_reset_w) AM_RANGE(0x3000, 0x3fff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index d04070f31f7..97b31304520 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -251,10 +251,10 @@ static WRITE8_HANDLER( lnc_w ) if (offset <= 0x3bff) ; else if (offset >= 0x3c00 && offset <= 0x3fff) { lnc_videoram_w(space,offset - 0x3c00,data); return; } else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(space,offset - 0x7c00,data); return; } - else if (offset == 0x8000) { return; } /* SMH_NOP */ + else if (offset == 0x8000) { return; } /* AM_NOP */ else if (offset == 0x8001) { bnj_video_control_w(space,0,data); return; } else if (offset == 0x8003) ; - else if (offset == 0x9000) { return; } /* SMH_NOP */ + else if (offset == 0x9000) { return; } /* AM_NOP */ else if (offset == 0x9002) { audio_command_w(space,0,data); return; } else if (offset >= 0xb000 && offset <= 0xb1ff) ; else logerror("CPU '%s' PC %04x: warning - write %02x to unmapped memory address %04x\n",space->cpu->tag,cpu_get_pc(space->cpu),data,offset); @@ -272,7 +272,7 @@ static WRITE8_HANDLER( mmonkey_w ) else if (offset >= 0x7c00 && offset <= 0x7fff) { lnc_mirrorvideoram_w(space,offset - 0x7c00,data); return; } else if (offset == 0x8001) { bnj_video_control_w(space,0,data); return; } else if (offset == 0x8003) ; - else if (offset == 0x9000) { return; } /* SMH_NOP */ + else if (offset == 0x9000) { return; } /* AM_NOP */ else if (offset == 0x9002) { audio_command_w(space,0,data); return; } else if (offset >= 0xb000 && offset <= 0xbfff) { mmonkey_protection_w(space,offset - 0xb000, data); return; } else logerror("CPU '%s' PC %04x: warning - write %02x to unmapped memory address %04x\n",space->cpu->tag,cpu_get_pc(space->cpu),data,offset); @@ -367,7 +367,7 @@ static ADDRESS_MAP_START( btime_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4002, 0x4002) AM_READ_PORT("SYSTEM") AM_WRITE(btime_video_control_w) AM_RANGE(0x4003, 0x4003) AM_READ_PORT("DSW1") AM_WRITE(audio_command_w) AM_RANGE(0x4004, 0x4004) AM_READ_PORT("DSW2") AM_WRITE(bnj_scroll1_w) - AM_RANGE(0xb000, 0xffff) AM_READ(SMH_ROM) + AM_RANGE(0xb000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( cookrace_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -405,15 +405,15 @@ static ADDRESS_MAP_START( tisland_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4003, 0x4003) AM_READ_PORT("DSW1") AM_WRITE(audio_command_w) AM_RANGE(0x4004, 0x4004) AM_READ_PORT("DSW2") AM_WRITE(bnj_scroll1_w) AM_RANGE(0x4005, 0x4005) AM_WRITE(bnj_scroll2_w) - AM_RANGE(0x9000, 0xffff) AM_READ(SMH_ROM) + AM_RANGE(0x9000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( zoar_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xffff) AM_WRITE(zoar_w) /* override the following entries to */ /* support ROM decryption */ AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&rambase) - AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) - AM_RANGE(0x8400, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&btime_colorram) + AM_RANGE(0x8000, 0x83ff) AM_WRITEONLY AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) + AM_RANGE(0x8400, 0x87ff) AM_WRITEONLY AM_BASE(&btime_colorram) AM_RANGE(0x8800, 0x8bff) AM_WRITE(btime_mirrorvideoram_w) AM_RANGE(0x8c00, 0x8fff) AM_WRITE(btime_mirrorcolorram_w) AM_RANGE(0x9000, 0x9000) AM_WRITE(zoar_video_control_w) @@ -421,11 +421,11 @@ static ADDRESS_MAP_START( zoar_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9801, 0x9801) AM_READ_PORT("DSW2") AM_RANGE(0x9802, 0x9802) AM_READ_PORT("P1") AM_RANGE(0x9803, 0x9803) AM_READ_PORT("P2") - AM_RANGE(0x9800, 0x9803) AM_WRITE(SMH_RAM) AM_BASE(&zoar_scrollram) + AM_RANGE(0x9800, 0x9803) AM_WRITEONLY AM_BASE(&zoar_scrollram) AM_RANGE(0x9804, 0x9804) AM_READ_PORT("SYSTEM") AM_WRITE(bnj_scroll2_w) AM_RANGE(0x9805, 0x9805) AM_WRITE(bnj_scroll1_w) AM_RANGE(0x9806, 0x9806) AM_WRITE(audio_command_w) - AM_RANGE(0xd000, 0xffff) AM_READ(SMH_ROM) + AM_RANGE(0xd000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( lnc_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -433,16 +433,16 @@ static ADDRESS_MAP_START( lnc_map, ADDRESS_SPACE_PROGRAM, 8 ) /* support ROM decryption */ AM_RANGE(0x0000, 0x3bff) AM_RAM AM_BASE(&rambase) AM_RANGE(0x3c00, 0x3fff) AM_RAM_WRITE(lnc_videoram_w) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) - AM_RANGE(0x7800, 0x7bff) AM_WRITE(SMH_RAM) AM_BASE(&btime_colorram) /* this is just here to initialize the pointer */ + AM_RANGE(0x7800, 0x7bff) AM_WRITEONLY AM_BASE(&btime_colorram) /* this is just here to initialize the pointer */ AM_RANGE(0x7c00, 0x7fff) AM_READWRITE(btime_mirrorvideoram_r, lnc_mirrorvideoram_w) AM_RANGE(0x8000, 0x8000) AM_READ_PORT("DSW1") AM_WRITENOP /* ??? */ AM_RANGE(0x8001, 0x8001) AM_READ_PORT("DSW2") AM_WRITE(bnj_video_control_w) - AM_RANGE(0x8003, 0x8003) AM_WRITE(SMH_RAM) AM_BASE(&lnc_charbank) + AM_RANGE(0x8003, 0x8003) AM_WRITEONLY AM_BASE(&lnc_charbank) AM_RANGE(0x9000, 0x9000) AM_READ_PORT("P1") AM_WRITENOP /* IRQ ack??? */ AM_RANGE(0x9001, 0x9001) AM_READ_PORT("P2") AM_RANGE(0x9002, 0x9002) AM_READ_PORT("SYSTEM") AM_WRITE(audio_command_w) AM_RANGE(0xb000, 0xb1ff) AM_RAM - AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( mmonkey_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -450,16 +450,16 @@ static ADDRESS_MAP_START( mmonkey_map, ADDRESS_SPACE_PROGRAM, 8 ) /* support ROM decryption */ AM_RANGE(0x0000, 0x3bff) AM_RAM AM_BASE(&rambase) AM_RANGE(0x3c00, 0x3fff) AM_RAM_WRITE(lnc_videoram_w) AM_BASE(&btime_videoram) AM_SIZE(&btime_videoram_size) - AM_RANGE(0x7800, 0x7bff) AM_WRITE(SMH_RAM) AM_BASE(&btime_colorram) /* this is just here to initialize the pointer */ + AM_RANGE(0x7800, 0x7bff) AM_WRITEONLY AM_BASE(&btime_colorram) /* this is just here to initialize the pointer */ AM_RANGE(0x7c00, 0x7fff) AM_READWRITE(btime_mirrorvideoram_r, lnc_mirrorvideoram_w) AM_RANGE(0x8000, 0x8000) AM_READ_PORT("DSW1") AM_RANGE(0x8001, 0x8001) AM_READ_PORT("DSW2") AM_WRITE(bnj_video_control_w) - AM_RANGE(0x8003, 0x8003) AM_WRITE(SMH_RAM) AM_BASE(&lnc_charbank) + AM_RANGE(0x8003, 0x8003) AM_WRITEONLY AM_BASE(&lnc_charbank) AM_RANGE(0x9000, 0x9000) AM_READ_PORT("P1") AM_WRITENOP /* IRQ ack??? */ AM_RANGE(0x9001, 0x9001) AM_READ_PORT("P2") AM_RANGE(0x9002, 0x9002) AM_READ_PORT("SYSTEM") AM_WRITE(audio_command_w) AM_RANGE(0xb000, 0xbfff) AM_READWRITE(mmonkey_protection_r, mmonkey_protection_w) - AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM) + AM_RANGE(0xc000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( bnj_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -477,7 +477,7 @@ static ADDRESS_MAP_START( bnj_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5400, 0x5400) AM_WRITE(bnj_scroll1_w) AM_RANGE(0x5800, 0x5800) AM_WRITE(bnj_scroll2_w) AM_RANGE(0x5c00, 0x5c0f) AM_WRITE(btime_paletteram_w) AM_BASE(&paletteram) - AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) + AM_RANGE(0xa000, 0xffff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( disco_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -494,7 +494,7 @@ static ADDRESS_MAP_START( disco_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9800, 0x9800) AM_READ_PORT("DSW1") AM_RANGE(0x9a00, 0x9a00) AM_READ_PORT("DSW2") AM_WRITE(audio_command_w) AM_RANGE(0x9c00, 0x9c00) AM_READ_PORT("VBLANK") AM_WRITE(disco_video_control_w) - AM_RANGE(0xa000, 0xffff) AM_READ(SMH_ROM) + AM_RANGE(0xa000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -516,7 +516,7 @@ static ADDRESS_MAP_START( disco_audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x5000, 0x5fff) AM_DEVWRITE("ay1", ay8910_address_w) AM_RANGE(0x6000, 0x6fff) AM_DEVWRITE("ay2", ay8910_data_w) AM_RANGE(0x7000, 0x7fff) AM_DEVWRITE("ay2", ay8910_address_w) - AM_RANGE(0x8000, 0x8fff) AM_READWRITE(soundlatch_r, SMH_NOP) /* ack ? */ + AM_RANGE(0x8000, 0x8fff) AM_READ(soundlatch_r) AM_WRITENOP /* ack ? */ AM_RANGE(0xf000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c index bdd951ddf4b..62f61780652 100644 --- a/src/mame/drivers/btoads.c +++ b/src/mame/drivers/btoads.c @@ -190,8 +190,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x20000180, 0x200001ff) AM_READ_PORT("UNK") AM_RANGE(0x20000200, 0x2000027f) AM_READ_PORT("SPECIAL") AM_RANGE(0x20000280, 0x200002ff) AM_READ_PORT("SW1") - AM_RANGE(0x20000000, 0x200000ff) AM_WRITE(SMH_RAM) AM_BASE(&btoads_sprite_scale) - AM_RANGE(0x20000100, 0x2000017f) AM_WRITE(SMH_RAM) AM_BASE(&btoads_sprite_control) + AM_RANGE(0x20000000, 0x200000ff) AM_WRITEONLY AM_BASE(&btoads_sprite_scale) + AM_RANGE(0x20000100, 0x2000017f) AM_WRITEONLY AM_BASE(&btoads_sprite_control) AM_RANGE(0x20000180, 0x200001ff) AM_WRITE(btoads_display_control_w) AM_RANGE(0x20000200, 0x2000027f) AM_WRITE(btoads_scroll0_w) AM_RANGE(0x20000280, 0x200002ff) AM_WRITE(btoads_scroll1_w) diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index 46b979bd809..bb82a2e10a2 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -138,7 +138,7 @@ static ADDRESS_MAP_START( buggychl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x87ff) AM_RAM /* 6116 SRAM (36) */ AM_RANGE(0x8800, 0x8fff) AM_RAM /* 6116 SRAM (35) */ AM_RANGE(0x9000, 0x9fff) AM_WRITE(buggychl_sprite_lookup_w) - AM_RANGE(0xa000, 0xbfff) AM_READWRITE(SMH_BANK(1), buggychl_chargen_w) AM_BASE(&buggychl_character_ram) + AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(1) AM_WRITE(buggychl_chargen_w) AM_BASE(&buggychl_character_ram) AM_RANGE(0xc800, 0xcfff) AM_RAM AM_BASE(&videoram) AM_SIZE(&videoram_size) AM_RANGE(0xd100, 0xd100) AM_WRITE(buggychl_ctrl_w) AM_RANGE(0xd200, 0xd200) AM_WRITE(bankswitch_w) @@ -146,7 +146,7 @@ static ADDRESS_MAP_START( buggychl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd303, 0xd303) AM_WRITE(buggychl_sprite_lookup_bank_w) AM_RANGE(0xd400, 0xd400) AM_READWRITE(buggychl_mcu_r, buggychl_mcu_w) AM_RANGE(0xd401, 0xd401) AM_READ(buggychl_mcu_status_r) - AM_RANGE(0xd500, 0xd57f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size) + AM_RANGE(0xd500, 0xd57f) AM_WRITEONLY AM_BASE(&spriteram) AM_SIZE(&spriteram_size) AM_RANGE(0xd600, 0xd600) AM_READ_PORT("DSW1") AM_RANGE(0xd601, 0xd601) AM_READ_PORT("DSW2") AM_RANGE(0xd602, 0xd602) AM_READ_PORT("DSW3") @@ -158,9 +158,9 @@ static ADDRESS_MAP_START( buggychl_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xd610, 0xd610) AM_WRITE(sound_command_w) AM_RANGE(0xd618, 0xd618) AM_WRITENOP /* accelerator clear */ AM_RANGE(0xd700, 0xd7ff) AM_WRITE(paletteram_xxxxRRRRGGGGBBBB_be_w) AM_BASE(&paletteram) - AM_RANGE(0xd840, 0xd85f) AM_WRITE(SMH_RAM) AM_BASE(&buggychl_scrollv) - AM_RANGE(0xdb00, 0xdbff) AM_WRITE(SMH_RAM) AM_BASE(&buggychl_scrollh) - AM_RANGE(0xdc04, 0xdc04) AM_WRITE(SMH_RAM) /* should be fg scroll */ + AM_RANGE(0xd840, 0xd85f) AM_WRITEONLY AM_BASE(&buggychl_scrollv) + AM_RANGE(0xdb00, 0xdbff) AM_WRITEONLY AM_BASE(&buggychl_scrollh) + AM_RANGE(0xdc04, 0xdc04) AM_WRITEONLY /* should be fg scroll */ AM_RANGE(0xdc06, 0xdc06) AM_WRITE(buggychl_bg_scrollx_w) ADDRESS_MAP_END @@ -173,7 +173,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x4820, 0x4820) AM_RAM /* VOL/BAL for the 7630 on the MSM5232 output */ AM_RANGE(0x4830, 0x4830) AM_RAM /* TRBL/BASS for the 7630 on the MSM5232 output */ AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r) -// AM_RANGE(0x5001, 0x5001) AM_READ(SMH_RAM) /* is command pending? */ +// AM_RANGE(0x5001, 0x5001) AM_READNOP /* is command pending? */ AM_RANGE(0x5001, 0x5001) AM_WRITE(nmi_enable_w) AM_RANGE(0x5002, 0x5002) AM_WRITE(nmi_disable_w) AM_RANGE(0x5003, 0x5003) AM_WRITE(sound_enable_w) diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c index f33e30e299c..e4045009848 100644 --- a/src/mame/video/bbusters.c +++ b/src/mame/video/bbusters.c @@ -27,11 +27,11 @@ static tilemap *fix_tilemap,*pf1_tilemap,*pf2_tilemap; static const UINT8 *scale_table_ptr; static UINT8 scale_line_count; -UINT16 *bbuster_pf1_data,*bbuster_pf2_data,*bbuster_pf1_scroll_data,*bbuster_pf2_scroll_data; +UINT16 *bbusters_pf1_data,*bbusters_pf2_data,*bbusters_pf1_scroll_data,*bbusters_pf2_scroll_data; /******************************************************************************/ -static TILE_GET_INFO( get_bbuster_tile_info ) +static TILE_GET_INFO( get_bbusters_tile_info ) { UINT16 tile=videoram16[tile_index]; SET_TILE_INFO(0,tile&0xfff,tile>>12,0); @@ -39,31 +39,31 @@ static TILE_GET_INFO( get_bbuster_tile_info ) static TILE_GET_INFO( get_pf1_tile_info ) { - UINT16 tile=bbuster_pf1_data[tile_index]; + UINT16 tile=bbusters_pf1_data[tile_index]; SET_TILE_INFO(3,tile&0xfff,tile>>12,0); } static TILE_GET_INFO( get_pf2_tile_info ) { - UINT16 tile=bbuster_pf2_data[tile_index]; + UINT16 tile=bbusters_pf2_data[tile_index]; SET_TILE_INFO(4,tile&0xfff,tile>>12,0); } -WRITE16_HANDLER( bbuster_video_w ) +WRITE16_HANDLER( bbusters_video_w ) { COMBINE_DATA(&videoram16[offset]); tilemap_mark_tile_dirty(fix_tilemap,offset); } -WRITE16_HANDLER( bbuster_pf1_w ) +WRITE16_HANDLER( bbusters_pf1_w ) { - COMBINE_DATA(&bbuster_pf1_data[offset]); + COMBINE_DATA(&bbusters_pf1_data[offset]); tilemap_mark_tile_dirty(pf1_tilemap,offset); } -WRITE16_HANDLER( bbuster_pf2_w ) +WRITE16_HANDLER( bbusters_pf2_w ) { - COMBINE_DATA(&bbuster_pf2_data[offset]); + COMBINE_DATA(&bbusters_pf2_data[offset]); tilemap_mark_tile_dirty(pf2_tilemap,offset); } @@ -71,7 +71,7 @@ WRITE16_HANDLER( bbuster_pf2_w ) VIDEO_START( bbuster ) { - fix_tilemap = tilemap_create(machine, get_bbuster_tile_info,tilemap_scan_rows,8,8,32,32); + fix_tilemap = tilemap_create(machine, get_bbusters_tile_info,tilemap_scan_rows,8,8,32,32); pf1_tilemap = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_cols,16,16,128,32); pf2_tilemap = tilemap_create(machine, get_pf2_tile_info,tilemap_scan_cols,16,16,128,32); @@ -81,7 +81,7 @@ VIDEO_START( bbuster ) VIDEO_START( mechatt ) { - fix_tilemap = tilemap_create(machine, get_bbuster_tile_info,tilemap_scan_rows,8,8,32,32); + fix_tilemap = tilemap_create(machine, get_bbusters_tile_info,tilemap_scan_rows,8,8,32,32); pf1_tilemap = tilemap_create(machine, get_pf1_tile_info,tilemap_scan_cols,16,16,256,32); pf2_tilemap = tilemap_create(machine, get_pf2_tile_info,tilemap_scan_cols,16,16,256,32); @@ -267,10 +267,10 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const UINT1 VIDEO_UPDATE( bbuster ) { - tilemap_set_scrollx( pf1_tilemap,0, bbuster_pf1_scroll_data[0] ); - tilemap_set_scrolly( pf1_tilemap,0, bbuster_pf1_scroll_data[1] ); - tilemap_set_scrollx( pf2_tilemap,0, bbuster_pf2_scroll_data[0] ); - tilemap_set_scrolly( pf2_tilemap,0, bbuster_pf2_scroll_data[1] ); + tilemap_set_scrollx( pf1_tilemap,0, bbusters_pf1_scroll_data[0] ); + tilemap_set_scrolly( pf1_tilemap,0, bbusters_pf1_scroll_data[1] ); + tilemap_set_scrollx( pf2_tilemap,0, bbusters_pf2_scroll_data[0] ); + tilemap_set_scrolly( pf2_tilemap,0, bbusters_pf2_scroll_data[1] ); tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0); // draw_sprites(screen->machine,bitmap,buffered_spriteram16_2,2,0x8,0x8); @@ -283,10 +283,10 @@ VIDEO_UPDATE( bbuster ) VIDEO_UPDATE( mechatt ) { - tilemap_set_scrollx( pf1_tilemap,0, bbuster_pf1_scroll_data[0] ); - tilemap_set_scrolly( pf1_tilemap,0, bbuster_pf1_scroll_data[1] ); - tilemap_set_scrollx( pf2_tilemap,0, bbuster_pf2_scroll_data[0] ); - tilemap_set_scrolly( pf2_tilemap,0, bbuster_pf2_scroll_data[1] ); + tilemap_set_scrollx( pf1_tilemap,0, bbusters_pf1_scroll_data[0] ); + tilemap_set_scrolly( pf1_tilemap,0, bbusters_pf1_scroll_data[1] ); + tilemap_set_scrollx( pf2_tilemap,0, bbusters_pf2_scroll_data[0] ); + tilemap_set_scrolly( pf2_tilemap,0, bbusters_pf2_scroll_data[1] ); tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0); tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0);