From 540e563866d84304e54b0c91e844a75e426e21bd Mon Sep 17 00:00:00 2001 From: iq_132 <1191709+iq132@users.noreply.github.com> Date: Tue, 10 Feb 2015 05:13:08 +0000 Subject: [PATCH] Let's try this again. --- src/burn/burn.h | 5 +- src/burn/devices/8257dma.cpp | 6 +- src/burn/devices/nmk004.cpp | 4 +- src/burn/devices/tms34061.cpp | 4 +- src/burn/driver.h | 7 - src/burn/drv/capcom/cps_mem.cpp | 46 +-- src/burn/drv/capcom/d_cps1.cpp | 172 +++++----- src/burn/drv/capcom/d_cps2.cpp | 6 +- src/burn/drv/cave/d_dodonpachi.cpp | 22 +- src/burn/drv/cave/d_donpachi.cpp | 16 +- src/burn/drv/cave/d_esprade.cpp | 16 +- src/burn/drv/cave/d_feversos.cpp | 16 +- src/burn/drv/cave/d_gaia.cpp | 16 +- src/burn/drv/cave/d_guwange.cpp | 16 +- src/burn/drv/cave/d_hotdogst.cpp | 14 +- src/burn/drv/cave/d_korokoro.cpp | 20 +- src/burn/drv/cave/d_mazinger.cpp | 22 +- src/burn/drv/cave/d_metmqstr.cpp | 22 +- src/burn/drv/cave/d_pwrinst2.cpp | 42 +-- src/burn/drv/cave/d_sailormn.cpp | 26 +- src/burn/drv/cave/d_tjumpman.cpp | 14 +- src/burn/drv/cave/d_uopoko.cpp | 12 +- src/burn/drv/cps3/cps3run.cpp | 42 +-- src/burn/drv/dataeast/d_actfancr.cpp | 32 +- src/burn/drv/dataeast/d_boogwing.cpp | 28 +- src/burn/drv/dataeast/d_cbuster.cpp | 26 +- src/burn/drv/dataeast/d_cninja.cpp | 146 ++++---- src/burn/drv/dataeast/d_darkseal.cpp | 20 +- src/burn/drv/dataeast/d_dassault.cpp | 34 +- src/burn/drv/dataeast/d_dec0.cpp | 114 +++---- src/burn/drv/dataeast/d_dec8.cpp | 202 +++++------ src/burn/drv/dataeast/d_dietgogo.cpp | 18 +- src/burn/drv/dataeast/d_funkyjet.cpp | 16 +- src/burn/drv/dataeast/d_karnov.cpp | 16 +- src/burn/drv/dataeast/d_lemmings.cpp | 20 +- src/burn/drv/dataeast/d_pktgaldx.cpp | 20 +- src/burn/drv/dataeast/d_rohga.cpp | 126 +++---- src/burn/drv/dataeast/d_sidepckt.cpp | 20 +- src/burn/drv/dataeast/d_supbtime.cpp | 18 +- src/burn/drv/dataeast/d_tumblep.cpp | 16 +- src/burn/drv/dataeast/d_vaportra.cpp | 18 +- src/burn/drv/dataeast/deco16ic.cpp | 4 +- src/burn/drv/galaxian/d_galaxian.cpp | 64 ++-- src/burn/drv/galaxian/gal_run.cpp | 6 +- src/burn/drv/irem/d_m62.cpp | 2 +- src/burn/drv/irem/d_vigilant.cpp | 2 +- src/burn/drv/konami/d_88games.cpp | 16 +- src/burn/drv/konami/d_ajax.cpp | 20 +- src/burn/drv/konami/d_aliens.cpp | 16 +- src/burn/drv/konami/d_asterix.cpp | 14 +- src/burn/drv/konami/d_battlnts.cpp | 16 +- src/burn/drv/konami/d_bishi.cpp | 8 +- src/burn/drv/konami/d_bladestl.cpp | 18 +- src/burn/drv/konami/d_blockhl.cpp | 14 +- src/burn/drv/konami/d_bottom9.cpp | 8 +- src/burn/drv/konami/d_circusc.cpp | 18 +- src/burn/drv/konami/d_contra.cpp | 30 +- src/burn/drv/konami/d_crimfght.cpp | 14 +- src/burn/drv/konami/d_dbz.cpp | 26 +- src/burn/drv/konami/d_finalzr.cpp | 16 +- src/burn/drv/konami/d_gberet.cpp | 4 +- src/burn/drv/konami/d_gbusters.cpp | 14 +- src/burn/drv/konami/d_gijoe.cpp | 12 +- src/burn/drv/konami/d_gradius3.cpp | 20 +- src/burn/drv/konami/d_gyruss.cpp | 22 +- src/burn/drv/konami/d_hcastle.cpp | 20 +- src/burn/drv/konami/d_hexion.cpp | 2 +- src/burn/drv/konami/d_ironhors.cpp | 18 +- src/burn/drv/konami/d_jailbrek.cpp | 14 +- src/burn/drv/konami/d_labyrunr.cpp | 14 +- src/burn/drv/konami/d_lethal.cpp | 12 +- src/burn/drv/konami/d_mainevt.cpp | 8 +- src/burn/drv/konami/d_megazone.cpp | 20 +- src/burn/drv/konami/d_mikie.cpp | 14 +- src/burn/drv/konami/d_mogura.cpp | 2 +- src/burn/drv/konami/d_moo.cpp | 34 +- src/burn/drv/konami/d_mystwarr.cpp | 88 ++--- src/burn/drv/konami/d_nemesis.cpp | 254 +++++++------- src/burn/drv/konami/d_parodius.cpp | 8 +- src/burn/drv/konami/d_rockrage.cpp | 18 +- src/burn/drv/konami/d_rocnrope.cpp | 12 +- src/burn/drv/konami/d_rollerg.cpp | 11 +- src/burn/drv/konami/d_scotrsht.cpp | 8 +- src/burn/drv/konami/d_shaolins.cpp | 10 +- src/burn/drv/konami/d_simpsons.cpp | 8 +- src/burn/drv/konami/d_spy.cpp | 18 +- src/burn/drv/konami/d_surpratk.cpp | 8 +- src/burn/drv/konami/d_thunderx.cpp | 24 +- src/burn/drv/konami/d_timeplt.cpp | 42 +-- src/burn/drv/konami/d_tmnt.cpp | 66 ++-- src/burn/drv/konami/d_tutankhm.cpp | 8 +- src/burn/drv/konami/d_twin16.cpp | 46 +-- src/burn/drv/konami/d_ultraman.cpp | 6 +- src/burn/drv/konami/d_vendetta.cpp | 14 +- src/burn/drv/konami/d_xexex.cpp | 20 +- src/burn/drv/konami/d_xmen.cpp | 8 +- src/burn/drv/konami/d_yiear.cpp | 6 +- src/burn/drv/megadrive/megadrive.cpp | 96 +++--- src/burn/drv/neogeo/d_neogeo.cpp | 82 ++--- src/burn/drv/neogeo/neo_run.cpp | 84 ++--- src/burn/drv/pce/pce.cpp | 18 +- src/burn/drv/pgm/pgm_asic25.cpp | 14 +- src/burn/drv/pgm/pgm_asic27a_type1.cpp | 44 +-- src/burn/drv/pgm/pgm_asic27a_type2.cpp | 16 +- src/burn/drv/pgm/pgm_asic27a_type3.cpp | 18 +- src/burn/drv/pgm/pgm_asic3.cpp | 2 +- src/burn/drv/pgm/pgm_run.cpp | 30 +- src/burn/drv/pre90s/d_alinvade.cpp | 8 +- src/burn/drv/pre90s/d_alpha68k.cpp | 12 +- src/burn/drv/pre90s/d_ambush.cpp | 2 +- src/burn/drv/pre90s/d_arabian.cpp | 2 +- src/burn/drv/pre90s/d_armedf.cpp | 36 +- src/burn/drv/pre90s/d_atetris.cpp | 18 +- src/burn/drv/pre90s/d_aztarac.cpp | 8 +- src/burn/drv/pre90s/d_baraduke.cpp | 16 +- src/burn/drv/pre90s/d_bionicc.cpp | 14 +- src/burn/drv/pre90s/d_blockout.cpp | 14 +- src/burn/drv/pre90s/d_capbowl.cpp | 10 +- src/burn/drv/pre90s/d_commando.cpp | 2 +- src/burn/drv/pre90s/d_cybertnk.cpp | 26 +- src/burn/drv/pre90s/d_ddragon.cpp | 54 +-- src/burn/drv/pre90s/d_dkong.cpp | 24 +- src/burn/drv/pre90s/d_epos.cpp | 2 +- src/burn/drv/pre90s/d_funkybee.cpp | 2 +- src/burn/drv/pre90s/d_gauntlet.cpp | 56 ++-- src/burn/drv/pre90s/d_ginganin.cpp | 16 +- src/burn/drv/pre90s/d_gng.cpp | 36 +- src/burn/drv/pre90s/d_higemaru.cpp | 6 +- src/burn/drv/pre90s/d_ikki.cpp | 8 +- src/burn/drv/pre90s/d_jack.cpp | 24 +- src/burn/drv/pre90s/d_kangaroo.cpp | 4 +- src/burn/drv/pre90s/d_kncljoe.cpp | 4 +- src/burn/drv/pre90s/d_kyugo.cpp | 2 +- src/burn/drv/pre90s/d_ladybug.cpp | 4 +- src/burn/drv/pre90s/d_lastduel.cpp | 56 ++-- src/burn/drv/pre90s/d_meijinsn.cpp | 6 +- src/burn/drv/pre90s/d_mole.cpp | 6 +- src/burn/drv/pre90s/d_mrflea.cpp | 6 +- src/burn/drv/pre90s/d_mustache.cpp | 12 +- src/burn/drv/pre90s/d_mystston.cpp | 8 +- src/burn/drv/pre90s/d_pac2650.cpp | 14 +- src/burn/drv/pre90s/d_pacland.cpp | 16 +- src/burn/drv/pre90s/d_pkunwar.cpp | 2 +- src/burn/drv/pre90s/d_prehisle.cpp | 12 +- src/burn/drv/pre90s/d_punchout.cpp | 4 +- src/burn/drv/pre90s/d_quizo.cpp | 2 +- src/burn/drv/pre90s/d_renegade.cpp | 26 +- src/burn/drv/pre90s/d_route16.cpp | 2 +- src/burn/drv/pre90s/d_rpunch.cpp | 12 +- src/burn/drv/pre90s/d_scregg.cpp | 18 +- src/burn/drv/pre90s/d_sf.cpp | 6 +- src/burn/drv/pre90s/d_skykid.cpp | 18 +- src/burn/drv/pre90s/d_snk68.cpp | 24 +- src/burn/drv/pre90s/d_solomon.cpp | 2 +- src/burn/drv/pre90s/d_sonson.cpp | 14 +- src/burn/drv/pre90s/d_srumbler.cpp | 14 +- src/burn/drv/pre90s/d_tail2nose.cpp | 16 +- src/burn/drv/pre90s/d_tbowl.cpp | 32 +- src/burn/drv/pre90s/d_tecmo.cpp | 2 +- src/burn/drv/pre90s/d_terracre.cpp | 18 +- src/burn/drv/pre90s/d_tigeroad.cpp | 10 +- src/burn/drv/pre90s/d_toki.cpp | 46 +-- src/burn/drv/pre90s/d_wwfsstar.cpp | 12 +- src/burn/drv/pre90s/d_xain.cpp | 30 +- src/burn/drv/psikyo/d_psikyo.cpp | 16 +- src/burn/drv/pst90s/d_1945kiii.cpp | 16 +- src/burn/drv/pst90s/d_aerofgt.cpp | 118 +++---- src/burn/drv/pst90s/d_aquarium.cpp | 14 +- src/burn/drv/pst90s/d_blmbycar.cpp | 12 +- src/burn/drv/pst90s/d_bloodbro.cpp | 36 +- src/burn/drv/pst90s/d_crospang.cpp | 14 +- src/burn/drv/pst90s/d_crshrace.cpp | 20 +- src/burn/drv/pst90s/d_dcon.cpp | 16 +- src/burn/drv/pst90s/d_ddragon3.cpp | 50 +-- src/burn/drv/pst90s/d_deniam.cpp | 12 +- src/burn/drv/pst90s/d_diverboy.cpp | 8 +- src/burn/drv/pst90s/d_dooyong.cpp | 82 ++--- src/burn/drv/pst90s/d_drgnmst.cpp | 16 +- src/burn/drv/pst90s/d_drtomy.cpp | 10 +- src/burn/drv/pst90s/d_esd16.cpp | 78 ++--- src/burn/drv/pst90s/d_f1gp.cpp | 42 +-- src/burn/drv/pst90s/d_fstarfrc.cpp | 40 +-- src/burn/drv/pst90s/d_funybubl.cpp | 4 +- src/burn/drv/pst90s/d_fuukifg3.cpp | 20 +- src/burn/drv/pst90s/d_gaelco.cpp | 16 +- src/burn/drv/pst90s/d_gaiden.cpp | 16 +- src/burn/drv/pst90s/d_galpanic.cpp | 126 +++---- src/burn/drv/pst90s/d_galspnbl.cpp | 22 +- src/burn/drv/pst90s/d_gotcha.cpp | 12 +- src/burn/drv/pst90s/d_gumbo.cpp | 20 +- src/burn/drv/pst90s/d_hyperpac.cpp | 44 +-- src/burn/drv/pst90s/d_jchan.cpp | 34 +- src/burn/drv/pst90s/d_kaneko16.cpp | 178 +++++----- src/burn/drv/pst90s/d_lordgun.cpp | 20 +- src/burn/drv/pst90s/d_mcatadv.cpp | 12 +- src/burn/drv/pst90s/d_midas.cpp | 12 +- src/burn/drv/pst90s/d_mugsmash.cpp | 12 +- src/burn/drv/pst90s/d_mwarr.cpp | 58 ++-- src/burn/drv/pst90s/d_news.cpp | 2 +- src/burn/drv/pst90s/d_nmg5.cpp | 24 +- src/burn/drv/pst90s/d_nmk16.cpp | 300 ++++++++--------- src/burn/drv/pst90s/d_ohmygod.cpp | 16 +- src/burn/drv/pst90s/d_pass.cpp | 10 +- src/burn/drv/pst90s/d_pirates.cpp | 16 +- src/burn/drv/pst90s/d_playmark.cpp | 42 +-- src/burn/drv/pst90s/d_powerins.cpp | 14 +- src/burn/drv/pst90s/d_pushman.cpp | 14 +- src/burn/drv/pst90s/d_sandscrp.cpp | 22 +- src/burn/drv/pst90s/d_seta.cpp | 444 ++++++++++++------------- src/burn/drv/pst90s/d_seta2.cpp | 154 ++++----- src/burn/drv/pst90s/d_shadfrce.cpp | 17 +- src/burn/drv/pst90s/d_silkroad.cpp | 10 +- src/burn/drv/pst90s/d_silvmil.cpp | 14 +- src/burn/drv/pst90s/d_suna16.cpp | 46 +-- src/burn/drv/pst90s/d_taotaido.cpp | 14 +- src/burn/drv/pst90s/d_tecmosys.cpp | 26 +- src/burn/drv/pst90s/d_tetrisp2.cpp | 106 +++--- src/burn/drv/pst90s/d_tumbleb.cpp | 84 ++--- src/burn/drv/pst90s/d_unico.cpp | 48 +-- src/burn/drv/pst90s/d_vmetal.cpp | 20 +- src/burn/drv/pst90s/d_welltris.cpp | 14 +- src/burn/drv/pst90s/d_wwfwfest.cpp | 12 +- src/burn/drv/pst90s/d_xorworld.cpp | 6 +- src/burn/drv/pst90s/d_yunsun16.cpp | 12 +- src/burn/drv/pst90s/d_zerozone.cpp | 12 +- src/burn/drv/sega/d_angelkds.cpp | 2 +- src/burn/drv/sega/d_dotrikun.cpp | 2 +- src/burn/drv/sega/d_hangon.cpp | 18 +- src/burn/drv/sega/d_suprloco.cpp | 4 +- src/burn/drv/sega/d_sys1.cpp | 4 +- src/burn/drv/sega/d_sys16b.cpp | 330 +++++++++--------- src/burn/drv/sega/d_sys18.cpp | 50 +-- src/burn/drv/sega/d_zaxxon.cpp | 28 +- src/burn/drv/sega/sys16_fd1094.cpp | 28 +- src/burn/drv/sega/sys16_run.cpp | 200 +++++------ src/burn/drv/taito/d_arkanoid.cpp | 2 +- src/burn/drv/taito/d_ashnojoe.cpp | 10 +- src/burn/drv/taito/d_asuka.cpp | 42 +-- src/burn/drv/taito/d_bublbobl.cpp | 2 +- src/burn/drv/taito/d_darius2.cpp | 44 +-- src/burn/drv/taito/d_darkmist.cpp | 16 +- src/burn/drv/taito/d_lkage.cpp | 2 +- src/burn/drv/taito/d_othunder.cpp | 8 +- src/burn/drv/taito/d_slapshot.cpp | 14 +- src/burn/drv/taito/d_superchs.cpp | 34 +- src/burn/drv/taito/d_taitob.cpp | 146 ++++---- src/burn/drv/taito/d_taitof2.cpp | 338 +++++++++---------- src/burn/drv/taito/d_taitomisc.cpp | 124 +++---- src/burn/drv/taito/d_taitox.cpp | 10 +- src/burn/drv/taito/d_taitoz.cpp | 188 +++++------ src/burn/drv/taito/taito_m68705.cpp | 4 +- src/burn/drv/toaplan/d_batrider.cpp | 16 +- src/burn/drv/toaplan/d_batsugun.cpp | 6 +- src/burn/drv/toaplan/d_battleg.cpp | 16 +- src/burn/drv/toaplan/d_bbakraid.cpp | 16 +- src/burn/drv/toaplan/d_demonwld.cpp | 12 +- src/burn/drv/toaplan/d_dogyuun.cpp | 6 +- src/burn/drv/toaplan/d_fixeight.cpp | 12 +- src/burn/drv/toaplan/d_ghox.cpp | 6 +- src/burn/drv/toaplan/d_hellfire.cpp | 10 +- src/burn/drv/toaplan/d_kbash.cpp | 6 +- src/burn/drv/toaplan/d_kbash2.cpp | 6 +- src/burn/drv/toaplan/d_mahoudai.cpp | 14 +- src/burn/drv/toaplan/d_outzone.cpp | 10 +- src/burn/drv/toaplan/d_pipibibs.cpp | 8 +- src/burn/drv/toaplan/d_rallybik.cpp | 14 +- src/burn/drv/toaplan/d_samesame.cpp | 8 +- src/burn/drv/toaplan/d_shippumd.cpp | 14 +- src/burn/drv/toaplan/d_slapfght.cpp | 6 +- src/burn/drv/toaplan/d_snowbro2.cpp | 6 +- src/burn/drv/toaplan/d_tekipaki.cpp | 6 +- src/burn/drv/toaplan/d_truxton.cpp | 10 +- src/burn/drv/toaplan/d_truxton2.cpp | 12 +- src/burn/drv/toaplan/d_vfive.cpp | 8 +- src/burn/drv/toaplan/d_vimana.cpp | 8 +- src/burn/drv/toaplan/d_zerowing.cpp | 12 +- src/burn/snd/ymf278b.c | 2 +- src/cpu/arm7_intf.cpp | 8 +- src/cpu/arm7_intf.h | 11 + src/cpu/arm_intf.cpp | 8 +- src/cpu/arm_intf.h | 11 + src/cpu/h6280_intf.cpp | 2 +- src/cpu/h6280_intf.h | 11 + src/cpu/hd6309_intf.cpp | 18 +- src/cpu/hd6309_intf.h | 11 + src/cpu/konami/konami.cpp | 18 +- src/cpu/konami_intf.cpp | 6 +- src/cpu/konami_intf.h | 11 + src/cpu/m6502_intf.cpp | 12 +- src/cpu/m6502_intf.h | 11 + src/cpu/m68000_intf.cpp | 18 +- src/cpu/m68000_intf.h | 6 + src/cpu/m6800_intf.cpp | 30 +- src/cpu/m6800_intf.h | 41 +++ src/cpu/m6805/6805ops.c | 10 +- src/cpu/m6805/m6805.cpp | 10 +- src/cpu/m6805_intf.h | 7 + src/cpu/m6809_intf.cpp | 12 +- src/cpu/m6809_intf.h | 11 + src/cpu/nec/nec.cpp | 8 +- src/cpu/nec_intf.cpp | 6 +- src/cpu/nec_intf.h | 4 + src/cpu/s2650_intf.h | 9 + src/cpu/sh2/sh2.cpp | 2 +- src/cpu/sh2_intf.h | 9 + src/cpu/tlcs90_intf.h | 8 + src/cpu/z80_intf.cpp | 6 +- src/cpu/z80_intf.h | 22 +- 308 files changed, 4532 insertions(+), 4371 deletions(-) diff --git a/src/burn/burn.h b/src/burn/burn.h index 013359448..f64e39f7f 100644 --- a/src/burn/burn.h +++ b/src/burn/burn.h @@ -169,7 +169,6 @@ struct BurnDIPInfo { char* szText; }; - // --------------------------------------------------------------------------- // Common CPU definitions @@ -194,11 +193,9 @@ struct BurnDIPInfo { #define MAP_WRITE 2 #define MAP_FETCHOP 4 #define MAP_FETCHARG 8 -#define MAP_FETCH (MAP_FETCHOP|MAP_FETCHARG) -#define MAP_ROM (MAP_READ|MAP_FETCH) +#define MAP_ROM (MAP_READ|MAP_FETCHOP|MAP_FETCHARG) #define MAP_RAM (MAP_ROM|MAP_WRITE) - // --------------------------------------------------------------------------- extern bool bBurnUseMMX; diff --git a/src/burn/devices/8257dma.cpp b/src/burn/devices/8257dma.cpp index 71588c874..432978c46 100644 --- a/src/burn/devices/8257dma.cpp +++ b/src/burn/devices/8257dma.cpp @@ -158,7 +158,7 @@ static INT32 i8257_do_operation(INT32 channel) { m_status |= (0x01 << channel); - m_out_tc_func(ASSERT_LINE); + m_out_tc_func(CPU_IRQSTATUS_ACK); } switch (mode) @@ -196,7 +196,7 @@ static INT32 i8257_do_operation(INT32 channel) m_registers[5] = m_registers[7]; } - m_out_tc_func(CLEAR_LINE); + m_out_tc_func(CPU_IRQSTATUS_NONE); } return done; @@ -290,7 +290,7 @@ void i8257_update_status() } /* set the halt line */ - m_out_hrq_func(pending_transfer ? ASSERT_LINE : CLEAR_LINE); + m_out_hrq_func(pending_transfer ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static void i8257_prepare_msb_flip() diff --git a/src/burn/devices/nmk004.cpp b/src/burn/devices/nmk004.cpp index 2222ba54d..2a10ec467 100644 --- a/src/burn/devices/nmk004.cpp +++ b/src/burn/devices/nmk004.cpp @@ -143,8 +143,8 @@ void NMK004_init() tlcs90Init(0, 8000000); tlcs90Open(0); - tlcs90MapMemory(NMK004PROGROM, 0x0000, 0xefff, MAP_ROM); - tlcs90MapMemory(ram, 0xf000, 0xf7ff, MAP_RAM); + tlcs90MapMemory(NMK004PROGROM, 0x0000, 0xefff, TLCS90_ROM); + tlcs90MapMemory(ram, 0xf000, 0xf7ff, TLCS90_RAM); tlcs90SetReadHandler(nmk004_tlcs90_read); tlcs90SetWriteHandler(nmk004_tlcs90_write); tlcs90SetWritePortHandler(nmk004_tlcs90_write_port); diff --git a/src/burn/devices/tms34061.cpp b/src/burn/devices/tms34061.cpp index f69e6f2cf..192095db6 100644 --- a/src/burn/devices/tms34061.cpp +++ b/src/burn/devices/tms34061.cpp @@ -145,9 +145,9 @@ static void update_interrupts() { /* if the status bit is set, and ints are enabled, turn it on */ if ((m_regs[TMS34061_STATUS] & 0x0001) && (m_regs[TMS34061_CONTROL1] & 0x0400)) - m_interrupt_cb(ASSERT_LINE); + m_interrupt_cb(CPU_IRQSTATUS_ACK); else - m_interrupt_cb(CLEAR_LINE); + m_interrupt_cb(CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/driver.h b/src/burn/driver.h index 83e7ed363..d3c913df4 100644 --- a/src/burn/driver.h +++ b/src/burn/driver.h @@ -56,13 +56,6 @@ __extension__ typedef long long INT64; #define HAS_YM3526 1 #define HAS_Y8950 1 -enum { - CLEAR_LINE = 0, - ASSERT_LINE, - HOLD_LINE, - PULSE_LINE -}; - #define timer_get_time() BurnTimerGetTime() #define READ8_HANDLER(name) UINT8 name(void) diff --git a/src/burn/drv/capcom/cps_mem.cpp b/src/burn/drv/capcom/cps_mem.cpp index 4d9cb9d58..99ce13b2a 100644 --- a/src/burn/drv/capcom/cps_mem.cpp +++ b/src/burn/drv/capcom/cps_mem.cpp @@ -87,15 +87,15 @@ void CpsMapObjectBanks(INT32 nBank) nCpsObjectBank = nBank; if (nCpsObjectBank) { - SekMapMemory(CpsRam708 + 0x8000, 0x708000, 0x709FFF, MAP_RAM); - SekMapMemory(CpsRam708 + 0x8000, 0x70A000, 0x70BFFF, MAP_RAM); - SekMapMemory(CpsRam708 + 0x8000, 0x70C000, 0x70DFFF, MAP_RAM); - SekMapMemory(CpsRam708 + 0x8000, 0x70E000, 0x70FFFF, MAP_RAM); + SekMapMemory(CpsRam708 + 0x8000, 0x708000, 0x709FFF, SM_RAM); + SekMapMemory(CpsRam708 + 0x8000, 0x70A000, 0x70BFFF, SM_RAM); + SekMapMemory(CpsRam708 + 0x8000, 0x70C000, 0x70DFFF, SM_RAM); + SekMapMemory(CpsRam708 + 0x8000, 0x70E000, 0x70FFFF, SM_RAM); } else { - SekMapMemory(CpsRam708, 0x708000, 0x709FFF, MAP_RAM); - SekMapMemory(CpsRam708, 0x70A000, 0x70BFFF, MAP_RAM); - SekMapMemory(CpsRam708, 0x70C000, 0x70DFFF, MAP_RAM); - SekMapMemory(CpsRam708, 0x70E000, 0x70FFFF, MAP_RAM); + SekMapMemory(CpsRam708, 0x708000, 0x709FFF, SM_RAM); + SekMapMemory(CpsRam708, 0x70A000, 0x70BFFF, SM_RAM); + SekMapMemory(CpsRam708, 0x70C000, 0x70DFFF, SM_RAM); + SekMapMemory(CpsRam708, 0x70E000, 0x70FFFF, SM_RAM); } } } @@ -252,16 +252,16 @@ INT32 CpsMemInit() // Map in memory: // 68000 Rom (as seen as is, through read) - SekMapMemory(CpsRom, 0, nCpsRomLen - 1, MAP_READ); + SekMapMemory(CpsRom, 0, nCpsRomLen - 1, SM_READ); // 68000 Rom (as seen decrypted, through fetch) if (nCpsCodeLen > 0) { // Decoded part (up to nCpsCodeLen) - SekMapMemory(CpsCode, 0, nCpsCodeLen - 1, MAP_FETCH); + SekMapMemory(CpsCode, 0, nCpsCodeLen - 1, SM_FETCH); } if (nCpsRomLen > nCpsCodeLen) { // The rest (up to nCpsRomLen) - SekMapMemory(CpsRom + nCpsCodeLen, nCpsCodeLen, nCpsRomLen - 1, MAP_FETCH); + SekMapMemory(CpsRom + nCpsCodeLen, nCpsCodeLen, nCpsRomLen - 1, SM_FETCH); } if (Cps == 2) { @@ -269,24 +269,24 @@ INT32 CpsMemInit() CpsMapObjectBanks(0); #if 0 - SekMapHandler(3, 0x660000, 0x663FFF, MAP_RAM); + SekMapHandler(3, 0x660000, 0x663FFF, SM_RAM); SekSetReadByteHandler(3, CPSExtraNVRAMReadByte); SekSetWriteByteHandler(3, CPSExtraNVRAMWriteByte); #else - SekMapMemory(CpsRam660, 0x660000, 0x663FFF, MAP_RAM); + SekMapMemory(CpsRam660, 0x660000, 0x663FFF, SM_RAM); #endif -// SekMapHandler(4, 0x708000, 0x709FFF, MAP_WRITE); -// SekMapHandler(4, 0x70A000, 0x70BFFF, MAP_WRITE); -// SekMapHandler(4, 0x70C000, 0x70DFFF, MAP_WRITE); -// SekMapHandler(4, 0x70E000, 0x70FFFF, MAP_WRITE); +// SekMapHandler(4, 0x708000, 0x709FFF, SM_WRITE); +// SekMapHandler(4, 0x70A000, 0x70BFFF, SM_WRITE); +// SekMapHandler(4, 0x70C000, 0x70DFFF, SM_WRITE); +// SekMapHandler(4, 0x70E000, 0x70FFFF, SM_WRITE); // SekSetWriteByteHandler(4, CpsWriteSpriteByte); // SekSetWriteWordHandler(4, CpsWriteSpriteWord); } - SekMapMemory(CpsRam90, 0x900000, 0x92FFFF, MAP_RAM); // Gfx Ram - SekMapMemory(CpsRamFF, 0xFF0000, 0xFFFFFF, MAP_RAM); // Work Ram + SekMapMemory(CpsRam90, 0x900000, 0x92FFFF, SM_RAM); // Gfx Ram + SekMapMemory(CpsRamFF, 0xFF0000, 0xFFFFFF, SM_RAM); // Work Ram SekSetReadByteHandler(0, CpsReadByte); SekSetWriteByteHandler(0, CpsWriteByte); @@ -295,7 +295,7 @@ INT32 CpsMemInit() // QSound if ((Cps == 2) && !Cps2DisableQSnd) { - SekMapHandler(1, 0x618000, 0x619FFF, MAP_RAM); + SekMapHandler(1, 0x618000, 0x619FFF, SM_RAM); SekSetReadByteHandler(1, CPSQSoundC0ReadByte); SekSetWriteByteHandler(1, CPSQSoundC0WriteByte); @@ -307,11 +307,11 @@ INT32 CpsMemInit() CpsEncZRom[(i << 1) + 0] = CpsEncZRom[i]; CpsEncZRom[(i << 1) + 1] = 0xFF; } - SekMapMemory(CpsEncZRom, 0xF00000, 0xF0FFFF, MAP_ROM); + SekMapMemory(CpsEncZRom, 0xF00000, 0xF0FFFF, SM_ROM); // QSound shared RAM - SekMapHandler(1, 0xF18000, 0xF19FFF, MAP_RAM); - SekMapHandler(2, 0xF1E000, 0xF1FFFF, MAP_RAM); + SekMapHandler(1, 0xF18000, 0xF19FFF, SM_RAM); + SekMapHandler(2, 0xF1E000, 0xF1FFFF, SM_RAM); SekSetReadByteHandler(1, CPSQSoundC0ReadByte); SekSetWriteByteHandler(1, CPSQSoundC0WriteByte); diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp index 3e34dbb3b..6994d04c2 100644 --- a/src/burn/drv/capcom/d_cps1.cpp +++ b/src/burn/drv/capcom/d_cps1.cpp @@ -13204,7 +13204,7 @@ static INT32 CawingblInit() nRet = DrvInit(); SekOpen(0); - SekMapHandler(1, 0x882000, 0x882fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x882000, 0x882fff, SM_READ | SM_WRITE); SekSetReadByteHandler(1, CawingblInputReadByte); SekSetReadWordHandler(1, CawingblInputReadWord); SekSetWriteByteHandler(1, CawingblInputWriteByte); @@ -13240,7 +13240,7 @@ static INT32 Cawingb2Init() nRet = DrvInit(); SekOpen(0); - SekMapHandler(1, 0x882000, 0x882fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x882000, 0x882fff, SM_READ | SM_WRITE); SekSetReadByteHandler(1, CawingblInputReadByte); SekSetReadWordHandler(1, CawingblInputReadWord); SekSetWriteByteHandler(1, CawingblInputWriteByte); @@ -13331,10 +13331,10 @@ static INT32 DinopicInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x991fff, MAP_RAM); - SekMapHandler(1, 0x980000, 0x98000f, MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x991fff, SM_RAM); + SekMapHandler(1, 0x980000, 0x98000f, SM_WRITE); SekSetWriteWordHandler(1, DinopicScrollWrite); - SekMapHandler(2, 0x800200, 0x8002ff, MAP_WRITE); + SekMapHandler(2, 0x800200, 0x8002ff, SM_WRITE); SekSetWriteWordHandler(2, DinopicLayerWrite); SekClose(); @@ -13355,7 +13355,7 @@ static INT32 DinohInit() nRet = TwelveMhzInit(); SekOpen(0); - SekMapHandler(1, 0xf18000, 0xf19fff, MAP_READ); + SekMapHandler(1, 0xf18000, 0xf19fff, SM_READ); SekSetReadByteHandler(1, DinohuntQSharedRamRead); SekClose(); @@ -13374,7 +13374,7 @@ static INT32 Dinopic4Init() nRet = TwelveMhzInit(); /* SekOpen(0); - SekMapHandler(1, 0xf18000, 0xf19fff, MAP_READ); + SekMapHandler(1, 0xf18000, 0xf19fff, SM_READ); SekSetReadByteHandler(1, DinohuntQSharedRamRead); SekClose();*/ @@ -13406,7 +13406,7 @@ static INT32 DinotInit() nRet = TwelveMhzInit(); SekOpen(0); - SekMapHandler(1, 0xf18000, 0xf19fff, MAP_READ); + SekMapHandler(1, 0xf18000, 0xf19fff, SM_READ); SekSetReadByteHandler(1, DinohuntQSharedRamRead); SekClose(); @@ -13429,10 +13429,10 @@ static INT32 DinotpicInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x991fff, MAP_RAM); - SekMapHandler(1, 0x980000, 0x98000f, MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x991fff, SM_RAM); + SekMapHandler(1, 0x980000, 0x98000f, SM_WRITE); SekSetWriteWordHandler(1, DinopicScrollWrite); - SekMapHandler(2, 0x800200, 0x8002ff, MAP_WRITE); + SekMapHandler(2, 0x800200, 0x8002ff, SM_WRITE); SekSetWriteWordHandler(2, DinopicLayerWrite); SekClose(); @@ -13449,7 +13449,7 @@ static INT32 DinohuntInit() nRet = TwelveMhzInit(); SekOpen(0); - SekMapHandler(1, 0xf18000, 0xf19fff, MAP_READ); + SekMapHandler(1, 0xf18000, 0xf19fff, SM_READ); SekSetReadByteHandler(1, DinohuntQSharedRamRead); SekClose(); @@ -13551,7 +13551,7 @@ static INT32 FfightblInit() INT32 nRet = DrvInit(); SekOpen(0); - SekMapHandler(1, 0x880000, 0x89ffff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x880000, 0x89ffff, SM_READ | SM_WRITE); SekSetReadByteHandler(1, FcrashInputReadByte); SekSetReadWordHandler(1, FcrashInputReadWord); SekSetWriteByteHandler(1, FcrashInputWriteByte); @@ -13589,7 +13589,7 @@ static INT32 FcrashInit() INT32 nRet = DrvInit(); SekOpen(0); - SekMapHandler(1, 0x880000, 0x89ffff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x880000, 0x89ffff, SM_READ | SM_WRITE); SekSetReadByteHandler(1, FcrashInputReadByte); SekSetReadWordHandler(1, FcrashInputReadWord); SekSetWriteByteHandler(1, FcrashInputWriteByte); @@ -13698,7 +13698,7 @@ static INT32 GanbareInit() INT32 nRet = DrvInit(); SekOpen(0); - SekMapHandler(1, 0xff0000, 0xffffff, MAP_RAM); + SekMapHandler(1, 0xff0000, 0xffffff, SM_RAM); SekSetReadByteHandler(1, GanbareTimeKeeperReadByte); SekSetReadWordHandler(1, GanbareTimeKeeperReadWord); SekSetWriteByteHandler(1, GanbareTimeKeeperWriteByte); @@ -13880,12 +13880,12 @@ static INT32 DaimakaibInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x991fff, MAP_RAM); - SekMapHandler(1, 0x880000, 0x88ffff, MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x991fff, SM_RAM); + SekMapHandler(1, 0x880000, 0x88ffff, SM_WRITE); SekSetWriteWordHandler(1, Daimakaib88WriteWord); - SekMapHandler(2, 0x980000, 0x98ffff, MAP_WRITE); + SekMapHandler(2, 0x980000, 0x98ffff, SM_WRITE); SekSetWriteWordHandler(2, Daimakaib98WriteWord); - SekMapHandler(3, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(3, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(3, DaimakaibFFWriteByte); SekSetWriteWordHandler(3, DaimakaibFFWriteWord); SekClose(); @@ -14037,8 +14037,8 @@ static INT32 KnightsbInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, MAP_RAM); - SekMapHandler(1, 0x980000, 0x98ffff, MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, SM_RAM); + SekMapHandler(1, 0x980000, 0x98ffff, SM_WRITE); SekSetWriteWordHandler(1, Knightsb98WriteWord); SekClose(); @@ -14179,12 +14179,12 @@ static INT32 KodbInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x900000, 0x903fff, MAP_RAM); - SekMapMemory(CpsBootlegSpriteRam, 0x904000, 0x907fff, MAP_RAM); - SekMapHandler(1, 0x980000, 0x99ffff, MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x900000, 0x903fff, SM_RAM); + SekMapMemory(CpsBootlegSpriteRam, 0x904000, 0x907fff, SM_RAM); + SekMapHandler(1, 0x980000, 0x99ffff, SM_WRITE); SekSetWriteByteHandler(1, Kodb98WriteByte); SekSetWriteWordHandler(1, Kodb98WriteWord); - SekMapHandler(2, 0x992000, 0x992009, MAP_READ); + SekMapHandler(2, 0x992000, 0x992009, SM_READ); SekSetReadByteHandler(2, KodbInputReadByte); SekClose(); @@ -14452,12 +14452,12 @@ static INT32 PunipicInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, MAP_RAM); - SekMapHandler(1, 0xf18000, 0xf19fff, MAP_READ); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, SM_RAM); + SekMapHandler(1, 0xf18000, 0xf19fff, SM_READ); SekSetReadByteHandler(1, PunipicF18Read); - SekMapHandler(2, 0x980000, 0x980fff, MAP_WRITE); + SekMapHandler(2, 0x980000, 0x980fff, SM_WRITE); SekSetWriteWordHandler(2, Punipic98WriteWord); - SekMapHandler(3, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(3, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(3, PunipicFFWriteByte); SekSetWriteWordHandler(3, PunipicFFWriteWord); SekClose(); @@ -14488,12 +14488,12 @@ static INT32 Punipic2Init() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, MAP_RAM); - SekMapHandler(1, 0xf18000, 0xf19fff, MAP_READ); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, SM_RAM); + SekMapHandler(1, 0xf18000, 0xf19fff, SM_READ); SekSetReadByteHandler(1, PunipicF18Read); - SekMapHandler(2, 0x980000, 0x980fff, MAP_WRITE); + SekMapHandler(2, 0x980000, 0x980fff, SM_WRITE); SekSetWriteWordHandler(2, Punipic98WriteWord); - SekMapHandler(3, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(3, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(3, PunipicFFWriteByte); SekSetWriteWordHandler(3, PunipicFFWriteWord); SekClose(); @@ -14517,12 +14517,12 @@ static INT32 Punipic3Init() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, MAP_RAM); - SekMapHandler(1, 0xf18000, 0xf19fff, MAP_READ); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, SM_RAM); + SekMapHandler(1, 0xf18000, 0xf19fff, SM_READ); SekSetReadByteHandler(1, PunipicF18Read); - SekMapHandler(2, 0x980000, 0x980fff, MAP_WRITE); + SekMapHandler(2, 0x980000, 0x980fff, SM_WRITE); SekSetWriteWordHandler(2, Punipic98WriteWord); - SekMapHandler(3, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(3, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(3, PunipicFFWriteByte); SekSetWriteWordHandler(3, PunipicFFWriteWord); SekClose(); @@ -14780,9 +14780,9 @@ static INT32 Sf2bInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x700000, 0x703fff, MAP_RAM); - SekMapMemory(CpsBootlegSpriteRam, 0x704000, 0x707fff, MAP_RAM); // mirror? - SekMapHandler(1, 0x708000, 0x7fffff, MAP_READ | MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x700000, 0x703fff, SM_RAM); + SekMapMemory(CpsBootlegSpriteRam, 0x704000, 0x707fff, SM_RAM); // mirror? + SekMapHandler(1, 0x708000, 0x7fffff, SM_READ | SM_WRITE); SekSetReadByteHandler(1, Sf2bReadByte); SekSetReadWordHandler(1, Sf2bReadWord); SekSetWriteByteHandler(1, Sf2bWriteByte); @@ -14830,8 +14830,8 @@ static INT32 Sf2dkot2Init() nRet = Sf2ceInit(); SekOpen(0); - SekMapMemory(CpsRom + 0x000000, 0x280000, 0x2fffff, MAP_ROM); - SekMapMemory(CpsRom + 0x080000, 0x200000, 0x27ffff, MAP_ROM); + SekMapMemory(CpsRom + 0x000000, 0x280000, 0x2fffff, SM_ROM); + SekMapMemory(CpsRom + 0x080000, 0x200000, 0x27ffff, SM_ROM); SekClose(); return nRet; @@ -14879,7 +14879,7 @@ static INT32 Sf2rbInit() INT32 nRet = Sf2ceInit(); SekOpen(0); - SekMapHandler(1, 0x200000, 0x2fffff, MAP_READ); + SekMapHandler(1, 0x200000, 0x2fffff, SM_READ); SekSetReadByteHandler(1, Sf2rbProtReadByte); SekSetReadWordHandler(1, Sf2rbProtReadWord); SekClose(); @@ -14922,7 +14922,7 @@ static INT32 Sf2rb2Init() INT32 nRet = Sf2ceInit(); SekOpen(0); - SekMapHandler(1, 0x200000, 0x2fffff, MAP_READ); + SekMapHandler(1, 0x200000, 0x2fffff, SM_READ); SekSetReadByteHandler(1, Sf2rb2ProtReadByte); SekSetReadWordHandler(1, Sf2rb2ProtReadWord); SekClose(); @@ -15226,9 +15226,9 @@ static INT32 Sf2mdtInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x700000, 0x703fff, MAP_RAM); - SekMapMemory(CpsBootlegSpriteRam, 0x704000, 0x707fff, MAP_RAM); // mirror? can use either of this - seems to make no difference - SekMapHandler(1, 0x708000, 0x7fffff, MAP_READ | MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x700000, 0x703fff, SM_RAM); + SekMapMemory(CpsBootlegSpriteRam, 0x704000, 0x707fff, SM_RAM); // mirror? can use either of this - seems to make no difference + SekMapHandler(1, 0x708000, 0x7fffff, SM_READ | SM_WRITE); SekSetReadByteHandler(1, Sf2mdtReadByte); SekSetReadWordHandler(1, Sf2mdtReadWord); SekSetWriteByteHandler(1, Sf2mdtWriteByte); @@ -15261,10 +15261,10 @@ static INT32 Sf2mdtaInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x700000, 0x703fff, MAP_RAM); - SekMapMemory(CpsBootlegSpriteRam, 0x704000, 0x707fff, MAP_RAM); // mirror? can use either of this - seems to make no difference - SekMapMemory(CpsRamFF, 0xfc0000, 0xfcffff, MAP_RAM); - SekMapHandler(1, 0x708000, 0x7fffff, MAP_READ | MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x700000, 0x703fff, SM_RAM); + SekMapMemory(CpsBootlegSpriteRam, 0x704000, 0x707fff, SM_RAM); // mirror? can use either of this - seems to make no difference + SekMapMemory(CpsRamFF, 0xfc0000, 0xfcffff, SM_RAM); + SekMapHandler(1, 0x708000, 0x7fffff, SM_READ | SM_WRITE); SekSetReadByteHandler(1, Sf2mdtReadByte); SekSetReadWordHandler(1, Sf2mdtReadWord); SekSetWriteByteHandler(1, Sf2mdtWriteByte); @@ -15297,10 +15297,10 @@ static INT32 Sf2mdtbInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x700000, 0x703fff, MAP_RAM); - SekMapMemory(CpsBootlegSpriteRam, 0x704000, 0x707fff, MAP_RAM); // mirror? can use either of this - seems to make no difference - SekMapMemory(CpsRamFF, 0xfc0000, 0xfcffff, MAP_RAM); - SekMapHandler(1, 0x708000, 0x7fffff, MAP_READ | MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x700000, 0x703fff, SM_RAM); + SekMapMemory(CpsBootlegSpriteRam, 0x704000, 0x707fff, SM_RAM); // mirror? can use either of this - seems to make no difference + SekMapMemory(CpsRamFF, 0xfc0000, 0xfcffff, SM_RAM); + SekMapHandler(1, 0x708000, 0x7fffff, SM_READ | SM_WRITE); SekSetReadByteHandler(1, Sf2mdtReadByte); SekSetReadWordHandler(1, Sf2mdtReadWord); SekSetWriteByteHandler(1, Sf2mdtWriteByte); @@ -15438,8 +15438,8 @@ static INT32 Sf2ceeab2Init() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, MAP_RAM); - SekMapHandler(1, 0x980000, 0x980fff, MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, SM_RAM); + SekMapHandler(1, 0x980000, 0x980fff, SM_WRITE); SekSetWriteWordHandler(1, Sf2ceeablScrollWrite); SekClose(); @@ -15665,7 +15665,7 @@ static INT32 Sf2ceuablInit() nRet = Sf2ceInit(); SekOpen(0); - SekMapHandler(1, 0x800000, 0x800200, MAP_RAM); + SekMapHandler(1, 0x800000, 0x800200, SM_RAM); SekSetReadByteHandler(1, Sf2ceuablReadByte); SekSetWriteByteHandler(1, Sf2ceuablWriteByte); SekSetWriteWordHandler(1, Sf2ceuablWriteWord); @@ -15746,7 +15746,7 @@ static INT32 Sf2ceuab7Init() INT32 nRet = Sf2ceInit(); SekOpen(0); - SekMapHandler(1, 0x570000, 0x57ffff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x570000, 0x57ffff, SM_READ | SM_WRITE); SekSetReadWordHandler(1, Sf2ceuab7ProtReadWord); SekSetWriteWordHandler(1, Sf2ceuab7ProtWriteWord); SekClose(); @@ -15803,7 +15803,7 @@ static INT32 Sf2dongbInit() INT32 nRet = Sf2ceInit(); SekOpen(0); - SekMapHandler(1, 0x180000, 0x1fffff, MAP_READ); + SekMapHandler(1, 0x180000, 0x1fffff, SM_READ); SekSetReadByteHandler(1, Sf2dongbProtReadByte); SekSetReadWordHandler(1, Sf2dongbProtReadWord); SekClose(); @@ -15863,7 +15863,7 @@ static INT32 Sf2hfjbInit() INT32 nRet = Sf2ceInit(); SekOpen(0); - SekMapHandler(1, 0x800000, 0x807fff, MAP_WRITE); + SekMapHandler(1, 0x800000, 0x807fff, SM_WRITE); SekSetWriteByteHandler(1, Sf2hfjbWriteByte); SekSetWriteWordHandler(1, Sf2hfjbWriteWord); SekClose(); @@ -15988,15 +15988,15 @@ static INT32 SlampicInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsZRom, 0xf00000, 0xf0ffff, MAP_ROM); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, MAP_RAM); - SekMapHandler(1, 0xf18000, 0xf19fff, MAP_READ); + SekMapMemory(CpsZRom, 0xf00000, 0xf0ffff, SM_ROM); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, SM_RAM); + SekMapHandler(1, 0xf18000, 0xf19fff, SM_READ); SekSetReadByteHandler(1, SlampicF18Read); - SekMapHandler(2, 0xf1e000, 0xf1ffff, MAP_READ); + SekMapHandler(2, 0xf1e000, 0xf1ffff, SM_READ); SekSetReadByteHandler(2, SlampicF18Read); - SekMapHandler(3, 0x980000, 0x980fff, MAP_WRITE); + SekMapHandler(3, 0x980000, 0x980fff, SM_WRITE); SekSetWriteWordHandler(3, SlampicScrollWrite); - SekMapHandler(4, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(4, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(4, SlampicFFWriteByte); SekSetWriteWordHandler(4, SlampicFFWriteWord); SekClose(); @@ -16120,10 +16120,10 @@ static INT32 VarthbInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, MAP_RAM); - SekMapHandler(1, 0x980000, 0x980fff, MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, SM_RAM); + SekMapHandler(1, 0x980000, 0x980fff, SM_WRITE); SekSetWriteWordHandler(1, VarthbScrollWriteWord); - SekMapHandler(2, 0x800000, 0x807fff, MAP_WRITE); + SekMapHandler(2, 0x800000, 0x807fff, SM_WRITE); SekSetWriteByteHandler(2, VarthbRegWriteByte); SekSetWriteWordHandler(2, VarthbRegWriteWord); SekClose(); @@ -16281,15 +16281,15 @@ static INT32 WofhInit() nRet = TwelveMhzInit(); SekOpen(0); - SekMapHandler(3, 0x880000, 0x89ffff, MAP_READ | MAP_WRITE); + SekMapHandler(3, 0x880000, 0x89ffff, SM_READ | SM_WRITE); SekSetReadByteHandler(3, WofhInputReadByte); SekSetReadWordHandler(3, WofhInputReadWord); SekSetWriteByteHandler(3, WofhInputWriteByte); SekSetWriteWordHandler(3, WofhInputWriteWord); - SekMapHandler(4, 0x135000, 0x135fff, MAP_READ); + SekMapHandler(4, 0x135000, 0x135fff, SM_READ); SekSetReadByteHandler(4, Wofh135ReadByte); SekSetReadWordHandler(4, Wofh135ReadWord); - SekMapHandler(5, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(5, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(5, WofbFFWriteByte); SekSetWriteWordHandler(5, WofbFFWriteWord); SekClose(); @@ -16342,18 +16342,18 @@ static INT32 SgyxzInit() nRet = TwelveMhzInit(); SekOpen(0); - SekMapHandler(3, 0x880000, 0x89ffff, MAP_READ | MAP_WRITE); + SekMapHandler(3, 0x880000, 0x89ffff, SM_READ | SM_WRITE); SekSetReadByteHandler(3, WofhInputReadByte); SekSetReadWordHandler(3, WofhInputReadWord); SekSetWriteByteHandler(3, WofhInputWriteByte); SekSetWriteWordHandler(3, WofhInputWriteWord); - SekMapHandler(4, 0x135000, 0x135fff, MAP_READ); + SekMapHandler(4, 0x135000, 0x135fff, SM_READ); SekSetReadByteHandler(4, Wofh135ReadByte); SekSetReadWordHandler(4, Wofh135ReadWord); - SekMapHandler(5, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(5, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(5, WofbFFWriteByte); SekSetWriteWordHandler(5, WofbFFWriteWord); - SekMapHandler(6, 0x900000, 0x9007FF, MAP_WRITE); + SekMapHandler(6, 0x900000, 0x9007FF, SM_WRITE); SekSetWriteLongHandler(6, SgyxzSpriteRamWriteLong); SekClose(); @@ -16390,12 +16390,12 @@ static INT32 Wof3jsaInit() INT32 nRet = TwelveMhzInit(); SekOpen(0); - SekMapHandler(3, 0x880000, 0x89ffff, MAP_READ | MAP_WRITE); + SekMapHandler(3, 0x880000, 0x89ffff, SM_READ | SM_WRITE); SekSetReadByteHandler(3, WofhInputReadByte); SekSetReadWordHandler(3, WofhInputReadWord); SekSetWriteByteHandler(3, WofhInputWriteByte); SekSetWriteWordHandler(3, WofhInputWriteWord); - SekMapHandler(4, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(4, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(4, WofbFFWriteByte); SekSetWriteWordHandler(4, WofbFFWriteWord); SekClose(); @@ -16500,12 +16500,12 @@ static INT32 Wof3sjInit() INT32 nRet = TwelveMhzInit(); SekOpen(0); - SekMapHandler(3, 0x880000, 0x89ffff, MAP_READ | MAP_WRITE); + SekMapHandler(3, 0x880000, 0x89ffff, SM_READ | SM_WRITE); SekSetReadByteHandler(3, Wof3sjInputReadByte); SekSetReadWordHandler(3, Wof3sjInputReadWord); SekSetWriteByteHandler(3, Wof3sjInputWriteByte); SekSetWriteWordHandler(3, Wof3sjInputWriteWord); - SekMapHandler(4, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(4, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(4, WofbFFWriteByte); SekSetWriteWordHandler(4, WofbFFWriteWord); SekClose(); @@ -16526,12 +16526,12 @@ static INT32 WofsjInit() INT32 nRet = TwelveMhzInit(); SekOpen(0); - SekMapHandler(3, 0x880000, 0x89ffff, MAP_READ | MAP_WRITE); + SekMapHandler(3, 0x880000, 0x89ffff, SM_READ | SM_WRITE); SekSetReadByteHandler(3, Wof3sjInputReadByte); SekSetReadWordHandler(3, Wof3sjInputReadWord); SekSetWriteByteHandler(3, Wof3sjInputWriteByte); SekSetWriteWordHandler(3, Wof3sjInputWriteWord); - SekMapHandler(4, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(4, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(4, WofbFFWriteByte); SekSetWriteWordHandler(4, WofbFFWriteWord); SekClose(); @@ -16661,10 +16661,10 @@ static INT32 WofbInit() CpsBootlegSpriteRam = (UINT8*)BurnMalloc(0x4000); SekOpen(0); - SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, MAP_RAM); - SekMapHandler(1, 0x980000, 0x98ffff, MAP_WRITE); + SekMapMemory(CpsBootlegSpriteRam, 0x990000, 0x993fff, SM_RAM); + SekMapHandler(1, 0x980000, 0x98ffff, SM_WRITE); SekSetWriteWordHandler(1, Wofb98WriteWord); - SekMapHandler(2, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(2, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(2, WofbFFWriteByte); SekSetWriteWordHandler(2, WofbFFWriteWord); SekClose(); diff --git a/src/burn/drv/capcom/d_cps2.cpp b/src/burn/drv/capcom/d_cps2.cpp index e370cd27c..55b6821fb 100644 --- a/src/burn/drv/capcom/d_cps2.cpp +++ b/src/burn/drv/capcom/d_cps2.cpp @@ -11416,10 +11416,10 @@ static INT32 PhoenixInit() nCpsNumScanlines = 262; // phoenix sets seem to be sensitive to timing?? SekOpen(0); - SekMapHandler(3, 0xff0000, 0xffffff, MAP_WRITE); + SekMapHandler(3, 0xff0000, 0xffffff, SM_WRITE); SekSetWriteByteHandler(3, PhoenixOutputWriteByte); SekSetWriteWordHandler(3, PhoenixOutputWriteWord); - SekMapHandler(4, 0x700000, 0x701fff, MAP_WRITE); + SekMapHandler(4, 0x700000, 0x701fff, SM_WRITE); SekSetWriteByteHandler(4, PhoenixSpriteWriteByte); SekSetWriteWordHandler(4, PhoenixSpriteWriteWord); SekClose(); @@ -12061,7 +12061,7 @@ static INT32 Gigaman2Init() nRet = CpsRunInit(); SekOpen(0); - SekMapMemory(Gigaman2DummyQsndRam, 0x618000, 0x619fff, MAP_RAM); + SekMapMemory(Gigaman2DummyQsndRam, 0x618000, 0x619fff, SM_RAM); SekClose(); // nCpsNumScanlines = 262; // phoenix sets seem to be sensitive to timing?? diff --git a/src/burn/drv/cave/d_dodonpachi.cpp b/src/burn/drv/cave/d_dodonpachi.cpp index e63f188ad..4167fb9f0 100644 --- a/src/burn/drv/cave/d_dodonpachi.cpp +++ b/src/burn/drv/cave/d_dodonpachi.cpp @@ -535,18 +535,18 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x500000, 0x507FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x600000, 0x607FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2] + 0x4000, 0x700000, 0x703FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2] + 0x4000, 0x704000, 0x707FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2] + 0x4000, 0x708000, 0x70BFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2] + 0x4000, 0x70C000, 0x70FFFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x500000, 0x507FFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x600000, 0x607FFF, SM_RAM); + SekMapMemory(CaveTileRAM[2] + 0x4000, 0x700000, 0x703FFF, SM_RAM); + SekMapMemory(CaveTileRAM[2] + 0x4000, 0x704000, 0x707FFF, SM_RAM); + SekMapMemory(CaveTileRAM[2] + 0x4000, 0x708000, 0x70BFFF, SM_RAM); + SekMapMemory(CaveTileRAM[2] + 0x4000, 0x70C000, 0x70FFFF, SM_RAM); - SekMapMemory(CavePalSrc, 0xC00000, 0xC0FFFF, MAP_ROM); // Palette RAM (write goes through handler) - SekMapHandler(1, 0xC00000, 0xC0FFFF, MAP_WRITE); // + SekMapMemory(CavePalSrc, 0xC00000, 0xC0FFFF, SM_ROM); // Palette RAM (write goes through handler) + SekMapHandler(1, 0xC00000, 0xC0FFFF, SM_WRITE); // SekSetReadWordHandler(0, ddonpachReadWord); SekSetReadByteHandler(0, ddonpachReadByte); diff --git a/src/burn/drv/cave/d_donpachi.cpp b/src/burn/drv/cave/d_donpachi.cpp index 0612c6a58..06d0c0a40 100644 --- a/src/burn/drv/cave/d_donpachi.cpp +++ b/src/burn/drv/cave/d_donpachi.cpp @@ -594,14 +594,14 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x200000, 0x207FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x300000, 0x307FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2] + 0x4000, 0x400000, 0x403FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2] + 0x4000, 0x404000, 0x407FFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0x500000, 0x50FFFF, MAP_RAM); - SekMapMemory(CavePalSrc, 0xA08000, 0xA08FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x200000, 0x207FFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x300000, 0x307FFF, SM_RAM); + SekMapMemory(CaveTileRAM[2] + 0x4000, 0x400000, 0x403FFF, SM_RAM); + SekMapMemory(CaveTileRAM[2] + 0x4000, 0x404000, 0x407FFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0x500000, 0x50FFFF, SM_RAM); + SekMapMemory(CavePalSrc, 0xA08000, 0xA08FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, donpachiReadWord); SekSetReadByteHandler(0, donpachiReadByte); diff --git a/src/burn/drv/cave/d_esprade.cpp b/src/burn/drv/cave/d_esprade.cpp index 14e872dc1..e59ac93ad 100644 --- a/src/burn/drv/cave/d_esprade.cpp +++ b/src/burn/drv/cave/d_esprade.cpp @@ -567,15 +567,15 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x500000, 0x507FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x600000, 0x607FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2], 0x700000, 0x707FFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x500000, 0x507FFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x600000, 0x607FFF, SM_RAM); + SekMapMemory(CaveTileRAM[2], 0x700000, 0x707FFF, SM_RAM); - SekMapMemory(CavePalSrc, 0xC00000, 0xC0FFFF, MAP_ROM); // Palette RAM (write goes through handler) - SekMapHandler(1, 0xC00000, 0xC0FFFF, MAP_WRITE); // + SekMapMemory(CavePalSrc, 0xC00000, 0xC0FFFF, SM_ROM); // Palette RAM (write goes through handler) + SekMapHandler(1, 0xC00000, 0xC0FFFF, SM_WRITE); // SekSetReadWordHandler(0, espradeReadWord); SekSetReadByteHandler(0, espradeReadByte); diff --git a/src/burn/drv/cave/d_feversos.cpp b/src/burn/drv/cave/d_feversos.cpp index acd66ae00..a50562167 100644 --- a/src/burn/drv/cave/d_feversos.cpp +++ b/src/burn/drv/cave/d_feversos.cpp @@ -521,14 +521,14 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x500000, 0x507FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x600000, 0x607FFF, MAP_RAM); - SekMapMemory(CavePalSrc, 0x708000, 0x708FFF, MAP_RAM); // Palette RAM - SekMapMemory(Ram02, 0x710000, 0x710BFF, MAP_ROM); - SekMapMemory(Ram02, 0x710C00, 0x710FFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x500000, 0x507FFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x600000, 0x607FFF, SM_RAM); + SekMapMemory(CavePalSrc, 0x708000, 0x708FFF, SM_RAM); // Palette RAM + SekMapMemory(Ram02, 0x710000, 0x710BFF, SM_ROM); + SekMapMemory(Ram02, 0x710C00, 0x710FFF, SM_RAM); SekSetReadWordHandler(0, feversosReadWord); SekSetReadByteHandler(0, feversosReadByte); diff --git a/src/burn/drv/cave/d_gaia.cpp b/src/burn/drv/cave/d_gaia.cpp index ba0916c00..27bf46a29 100644 --- a/src/burn/drv/cave/d_gaia.cpp +++ b/src/burn/drv/cave/d_gaia.cpp @@ -781,15 +781,15 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x500000, 0x50FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x600000, 0x60FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2], 0x700000, 0x70FFFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x500000, 0x50FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x600000, 0x60FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[2], 0x700000, 0x70FFFF, SM_RAM); - SekMapMemory(CavePalSrc, 0xC00000, 0xC0FFFF, MAP_ROM); // Palette RAM (write goes through handler) - SekMapHandler(1, 0xC00000, 0xC0FFFF, MAP_WRITE); // + SekMapMemory(CavePalSrc, 0xC00000, 0xC0FFFF, SM_ROM); // Palette RAM (write goes through handler) + SekMapHandler(1, 0xC00000, 0xC0FFFF, SM_WRITE); // SekSetReadWordHandler(0, gaiaReadWord); SekSetReadByteHandler(0, gaiaReadByte); diff --git a/src/burn/drv/cave/d_guwange.cpp b/src/burn/drv/cave/d_guwange.cpp index a8dc92dc2..3c046e678 100644 --- a/src/burn/drv/cave/d_guwange.cpp +++ b/src/burn/drv/cave/d_guwange.cpp @@ -579,15 +579,15 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x200000, 0x20FFFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x500000, 0x507FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x600000, 0x607FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2], 0x700000, 0x707FFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x200000, 0x20FFFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x500000, 0x507FFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x600000, 0x607FFF, SM_RAM); + SekMapMemory(CaveTileRAM[2], 0x700000, 0x707FFF, SM_RAM); - SekMapMemory(CavePalSrc, 0xC00000, 0xC0FFFF, MAP_ROM); // Palette RAM (write goes through handler) - SekMapHandler(1, 0xC00000, 0xC0FFFF, MAP_WRITE); // + SekMapMemory(CavePalSrc, 0xC00000, 0xC0FFFF, SM_ROM); // Palette RAM (write goes through handler) + SekMapHandler(1, 0xC00000, 0xC0FFFF, SM_WRITE); // SekSetReadWordHandler(0, guwangeReadWord); SekSetReadByteHandler(0, guwangeReadByte); diff --git a/src/burn/drv/cave/d_hotdogst.cpp b/src/burn/drv/cave/d_hotdogst.cpp index 68fa51ba8..3c82b9519 100644 --- a/src/burn/drv/cave/d_hotdogst.cpp +++ b/src/burn/drv/cave/d_hotdogst.cpp @@ -661,13 +661,13 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x300000, 0x30FFFF, MAP_RAM); - SekMapMemory(CavePalSrc, 0x408000, 0x408FFF, MAP_RAM); // Palette RAM - SekMapMemory(CaveTileRAM[0], 0x880000, 0x887FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x900000, 0x907FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2], 0x980000, 0x987FFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0xf00000, 0xf0fFFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x300000, 0x30FFFF, SM_RAM); + SekMapMemory(CavePalSrc, 0x408000, 0x408FFF, SM_RAM); // Palette RAM + SekMapMemory(CaveTileRAM[0], 0x880000, 0x887FFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x900000, 0x907FFF, SM_RAM); + SekMapMemory(CaveTileRAM[2], 0x980000, 0x987FFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0xf00000, 0xf0fFFF, SM_RAM); SekSetReadByteHandler(0, hotdogstReadByte); SekSetWriteByteHandler(0, hotdogstWriteByte); diff --git a/src/burn/drv/cave/d_korokoro.cpp b/src/burn/drv/cave/d_korokoro.cpp index e20839b35..a74fa3d63 100644 --- a/src/burn/drv/cave/d_korokoro.cpp +++ b/src/burn/drv/cave/d_korokoro.cpp @@ -566,11 +566,11 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(CaveTileRAM[0], 0x100000, 0x107FFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0x180000, 0x187FFF, MAP_RAM); - SekMapMemory(CavePalSrc, 0x200000, 0x207FFF, MAP_RAM); - SekMapMemory(Ram01, 0x300000, 0x30FFFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(CaveTileRAM[0], 0x100000, 0x107FFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0x180000, 0x187FFF, SM_RAM); + SekMapMemory(CavePalSrc, 0x200000, 0x207FFF, SM_RAM); + SekMapMemory(Ram01, 0x300000, 0x30FFFF, SM_RAM); SekSetReadWordHandler(0, korokoroReadWord); SekSetReadByteHandler(0, korokoroReadByte); @@ -646,11 +646,11 @@ static INT32 crushermInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(CaveTileRAM[0], 0x100000, 0x107FFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0x180000, 0x187FFF, MAP_RAM); - SekMapMemory(CavePalSrc, 0x200000, 0x207FFF, MAP_RAM); - SekMapMemory(Ram01, 0x340000, 0x34FFFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(CaveTileRAM[0], 0x100000, 0x107FFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0x180000, 0x187FFF, SM_RAM); + SekMapMemory(CavePalSrc, 0x200000, 0x207FFF, SM_RAM); + SekMapMemory(Ram01, 0x340000, 0x34FFFF, SM_RAM); SekSetReadWordHandler(0, korokoroReadWord); SekSetReadByteHandler(0, korokoroReadByte); diff --git a/src/burn/drv/cave/d_mazinger.cpp b/src/burn/drv/cave/d_mazinger.cpp index e7d16770c..55f148076 100644 --- a/src/burn/drv/cave/d_mazinger.cpp +++ b/src/burn/drv/cave/d_mazinger.cpp @@ -704,18 +704,18 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0x200000, 0x20FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1] + 0x4000, 0x400000, 0x403FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1] + 0x4000, 0x404000, 0x407FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0] + 0x4000, 0x500000, 0x503FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0] + 0x4000, 0x504000, 0x507FFF, MAP_RAM); - SekMapMemory(CavePalSrc, 0xC08000, 0xc087FF, MAP_RAM); // Palette RAM - SekMapMemory(CavePalSrc + 0x8800, 0xC08800, 0xC0FFFF, MAP_ROM); // Palette RAM (write goes through handler) - SekMapHandler(1, 0xC08800, 0xC0FFFF, MAP_WRITE); // + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0x200000, 0x20FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[1] + 0x4000, 0x400000, 0x403FFF, SM_RAM); + SekMapMemory(CaveTileRAM[1] + 0x4000, 0x404000, 0x407FFF, SM_RAM); + SekMapMemory(CaveTileRAM[0] + 0x4000, 0x500000, 0x503FFF, SM_RAM); + SekMapMemory(CaveTileRAM[0] + 0x4000, 0x504000, 0x507FFF, SM_RAM); + SekMapMemory(CavePalSrc, 0xC08000, 0xc087FF, SM_RAM); // Palette RAM + SekMapMemory(CavePalSrc + 0x8800, 0xC08800, 0xC0FFFF, SM_ROM); // Palette RAM (write goes through handler) + SekMapHandler(1, 0xC08800, 0xC0FFFF, SM_WRITE); // - SekMapMemory(Rom01 + 0x80000, 0xD00000, 0xD7FFFF, MAP_ROM); // CPU 0 ROM + SekMapMemory(Rom01 + 0x80000, 0xD00000, 0xD7FFFF, SM_ROM); // CPU 0 ROM SekSetReadByteHandler(0, mazingerReadByte); SekSetWriteByteHandler(0, mazingerWriteByte); diff --git a/src/burn/drv/cave/d_metmqstr.cpp b/src/burn/drv/cave/d_metmqstr.cpp index 9410da5e2..6a946694c 100644 --- a/src/burn/drv/cave/d_metmqstr.cpp +++ b/src/burn/drv/cave/d_metmqstr.cpp @@ -724,17 +724,17 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Rom01 + 0x080000, 0x100000, 0x17FFFF, MAP_ROM); - SekMapMemory(Rom01 + 0x100000, 0x200000, 0x27FFFF, MAP_ROM); - SekMapMemory(CaveTileRAM[2], 0x880000, 0x887FFF, MAP_RAM); - SekMapMemory(Ram01 + 0x00000, 0x888000, 0x88FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x900000, 0x907FFF, MAP_RAM); - SekMapMemory(Ram01 + 0x08000, 0x908000, 0x90FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x980000, 0x987FFF, MAP_RAM); - SekMapMemory(Ram01 + 0x10000, 0x988000, 0x98FFFF, MAP_RAM); - SekMapMemory(CavePalSrc, 0x408000, 0x408FFF, MAP_RAM); // Palette RAM - SekMapMemory(CaveSpriteRAM, 0xF00000, 0xF0FFFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Rom01 + 0x080000, 0x100000, 0x17FFFF, SM_ROM); + SekMapMemory(Rom01 + 0x100000, 0x200000, 0x27FFFF, SM_ROM); + SekMapMemory(CaveTileRAM[2], 0x880000, 0x887FFF, SM_RAM); + SekMapMemory(Ram01 + 0x00000, 0x888000, 0x88FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x900000, 0x907FFF, SM_RAM); + SekMapMemory(Ram01 + 0x08000, 0x908000, 0x90FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x980000, 0x987FFF, SM_RAM); + SekMapMemory(Ram01 + 0x10000, 0x988000, 0x98FFFF, SM_RAM); + SekMapMemory(CavePalSrc, 0x408000, 0x408FFF, SM_RAM); // Palette RAM + SekMapMemory(CaveSpriteRAM, 0xF00000, 0xF0FFFF, SM_RAM); SekSetReadByteHandler(0, metmqstrReadByte); SekSetWriteByteHandler(0, metmqstrWriteByte); SekSetReadWordHandler(0, metmqstrReadWord); diff --git a/src/burn/drv/cave/d_pwrinst2.cpp b/src/burn/drv/cave/d_pwrinst2.cpp index 331e9de52..583a13f33 100644 --- a/src/burn/drv/cave/d_pwrinst2.cpp +++ b/src/burn/drv/cave/d_pwrinst2.cpp @@ -891,16 +891,16 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x1FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x400000, 0x40FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2], 0x800000, 0x807FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x880000, 0x887FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x900000, 0x907FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[3] + 0x4000, 0x980000, 0x983FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[3] + 0x4000, 0x984000, 0x987FFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0xa00000, 0xa07FFF, MAP_RAM); - SekMapMemory(Ram01 + 0x10000, 0xa08000, 0xa1FFFF, MAP_RAM); - SekMapMemory(CavePalSrc, 0xf00000, 0xf04FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x1FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x400000, 0x40FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[2], 0x800000, 0x807FFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x880000, 0x887FFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x900000, 0x907FFF, SM_RAM); + SekMapMemory(CaveTileRAM[3] + 0x4000, 0x980000, 0x983FFF, SM_RAM); + SekMapMemory(CaveTileRAM[3] + 0x4000, 0x984000, 0x987FFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0xa00000, 0xa07FFF, SM_RAM); + SekMapMemory(Ram01 + 0x10000, 0xa08000, 0xa1FFFF, SM_RAM); + SekMapMemory(CavePalSrc, 0xf00000, 0xf04FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, pwrinst2ReadWord); SekSetWriteWordHandler(0, pwrinst2WriteWord); SekSetReadByteHandler(0, pwrinst2ReadByte); @@ -973,17 +973,17 @@ static INT32 PlegendsInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x1FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x400000, 0x40FFFF, MAP_RAM); - SekMapMemory(Rom01 + 0x200000, 0x600000, 0x6FFFFF, MAP_ROM); - SekMapMemory(CaveTileRAM[2], 0x800000, 0x807FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x880000, 0x887FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x900000, 0x907FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[3] + 0x4000, 0x980000, 0x983FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[3] + 0x4000, 0x984000, 0x987FFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0xa00000, 0xa07FFF, MAP_RAM); - SekMapMemory(Ram01 + 0x10000, 0xa08000, 0xa1FFFF, MAP_RAM); - SekMapMemory(CavePalSrc, 0xf00000, 0xf04FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x1FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x400000, 0x40FFFF, SM_RAM); + SekMapMemory(Rom01 + 0x200000, 0x600000, 0x6FFFFF, SM_ROM); + SekMapMemory(CaveTileRAM[2], 0x800000, 0x807FFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x880000, 0x887FFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x900000, 0x907FFF, SM_RAM); + SekMapMemory(CaveTileRAM[3] + 0x4000, 0x980000, 0x983FFF, SM_RAM); + SekMapMemory(CaveTileRAM[3] + 0x4000, 0x984000, 0x987FFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0xa00000, 0xa07FFF, SM_RAM); + SekMapMemory(Ram01 + 0x10000, 0xa08000, 0xa1FFFF, SM_RAM); + SekMapMemory(CavePalSrc, 0xf00000, 0xf04FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, pwrinst2ReadWord); SekSetWriteWordHandler(0, pwrinst2WriteWord); SekSetReadByteHandler(0, pwrinst2ReadByte); diff --git a/src/burn/drv/cave/d_sailormn.cpp b/src/burn/drv/cave/d_sailormn.cpp index 59e95827d..f3fd467bb 100644 --- a/src/burn/drv/cave/d_sailormn.cpp +++ b/src/burn/drv/cave/d_sailormn.cpp @@ -90,6 +90,8 @@ static void drvZ80Bankswitch(INT32 nBank) static void drvYM2151IRQHandler(INT32 nStatus) { if (nStatus) { +// ZetRaiseIrq(255); +// nCaveCyclesDone[1] += ZetRun(0x0400); ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); @@ -899,19 +901,19 @@ static INT32 gameInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x110001, MAP_RAM); // ram (Air Gallet tests too far) - SekMapMemory(Rom02, 0x200000, 0x3FFFFF, MAP_ROM); - SekMapMemory(Ram02, 0x400000, 0x407FFF, MAP_RAM); - SekMapMemory(Ram03, 0x40C000, 0x410001, MAP_RAM); // RAM (Air Gallet tests too far) - SekMapMemory(CaveSpriteRAM, 0x500000, 0x510001, MAP_RAM); // Sprite RAM (Air Gallet tests too far) - SekMapMemory(CaveTileRAM[0], 0x800000, 0x807FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[1], 0x880000, 0x887FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[2], 0x900000, 0x908001, MAP_RAM); // Air Gallet tests too far + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x110001, SM_RAM); // ram (Air Gallet tests too far) + SekMapMemory(Rom02, 0x200000, 0x3FFFFF, SM_ROM); + SekMapMemory(Ram02, 0x400000, 0x407FFF, SM_RAM); + SekMapMemory(Ram03, 0x40C000, 0x410001, SM_RAM); // RAM (Air Gallet tests too far) + SekMapMemory(CaveSpriteRAM, 0x500000, 0x510001, SM_RAM); // Sprite RAM (Air Gallet tests too far) + SekMapMemory(CaveTileRAM[0], 0x800000, 0x807FFF, SM_RAM); + SekMapMemory(CaveTileRAM[1], 0x880000, 0x887FFF, SM_RAM); + SekMapMemory(CaveTileRAM[2], 0x900000, 0x908001, SM_RAM); // Air Gallet tests too far - SekMapMemory(CavePalSrc, 0x408000, 0x4087FF, MAP_RAM); // Palette RAM - SekMapMemory(CavePalSrc + 0x8800, 0x408800, 0x40BFFF, MAP_ROM); // Palette RAM (write goes through handler) - SekMapHandler(1, 0x408800, 0x40BFFF, MAP_WRITE); // + SekMapMemory(CavePalSrc, 0x408000, 0x4087FF, SM_RAM); // Palette RAM + SekMapMemory(CavePalSrc + 0x8800, 0x408800, 0x40BFFF, SM_ROM); // Palette RAM (write goes through handler) + SekMapHandler(1, 0x408800, 0x40BFFF, SM_WRITE); // SekSetReadWordHandler(0, sailormnReadWord); SekSetReadByteHandler(0, sailormnReadByte); diff --git a/src/burn/drv/cave/d_tjumpman.cpp b/src/burn/drv/cave/d_tjumpman.cpp index 340dbce9b..ab0765c8f 100644 --- a/src/burn/drv/cave/d_tjumpman.cpp +++ b/src/burn/drv/cave/d_tjumpman.cpp @@ -519,18 +519,18 @@ static INT32 DrvInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x300000, 0x303FFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x304000, 0x307FFF, MAP_RAM); // mirror - SekMapMemory(CaveSpriteRAM, 0x200000, 0x20FFFF, MAP_RAM); - SekMapMemory(CavePalSrc, 0x500000, 0x50FFFF, MAP_ROM); + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x300000, 0x303FFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x304000, 0x307FFF, SM_RAM); // mirror + SekMapMemory(CaveSpriteRAM, 0x200000, 0x20FFFF, SM_RAM); + SekMapMemory(CavePalSrc, 0x500000, 0x50FFFF, SM_ROM); SekSetReadWordHandler(0, tjumpmanReadWord); SekSetReadByteHandler(0, tjumpmanReadByte); SekSetWriteWordHandler(0, tjumpmanWriteWord); SekSetWriteByteHandler(0, tjumpmanWriteByte); - SekMapHandler(1, 0x500000, 0x50FFFF, MAP_WRITE); + SekMapHandler(1, 0x500000, 0x50FFFF, SM_WRITE); SekSetWriteWordHandler(1, tjumpmanWriteWordPalette); SekSetWriteByteHandler(1, tjumpmanWriteBytePalette); SekClose(); diff --git a/src/burn/drv/cave/d_uopoko.cpp b/src/burn/drv/cave/d_uopoko.cpp index f2e4e18ab..c1482a06d 100644 --- a/src/burn/drv/cave/d_uopoko.cpp +++ b/src/burn/drv/cave/d_uopoko.cpp @@ -512,13 +512,13 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, MAP_RAM); - SekMapMemory(CaveTileRAM[0], 0x500000, 0x507FFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(CaveSpriteRAM, 0x400000, 0x40FFFF, SM_RAM); + SekMapMemory(CaveTileRAM[0], 0x500000, 0x507FFF, SM_RAM); - SekMapMemory(CavePalSrc, 0x800000, 0x80FFFF, MAP_ROM); // Palette RAM (write goes through handler) - SekMapHandler(1, 0x800000, 0x80FFFF, MAP_WRITE); // + SekMapMemory(CavePalSrc, 0x800000, 0x80FFFF, SM_ROM); // Palette RAM (write goes through handler) + SekMapHandler(1, 0x800000, 0x80FFFF, SM_WRITE); // SekSetReadWordHandler(0, uopokoReadWord); SekSetReadByteHandler(0, uopokoReadByte); diff --git a/src/burn/drv/cps3/cps3run.cpp b/src/burn/drv/cps3/cps3run.cpp index 16ad2f77d..97f7fdc0a 100644 --- a/src/burn/drv/cps3/cps3run.cpp +++ b/src/burn/drv/cps3/cps3run.cpp @@ -631,7 +631,7 @@ void __fastcall cps3WriteWord(UINT32 addr, UINT16 data) if (cram_bank != data) { cram_bank = data & 7; //bprintf(PRINT_NORMAL, _T("CRAM bank set to %d\n"), data); - Sh2MapMemory(((UINT8 *)RamCRam) + (cram_bank << 20), 0x04100000, 0x041fffff, MAP_RAM); + Sh2MapMemory(((UINT8 *)RamCRam) + (cram_bank << 20), 0x04100000, 0x041fffff, SH2_RAM); } break; @@ -1031,7 +1031,7 @@ static INT32 Cps3Reset() { // re-map cram_bank cram_bank = 0; - Sh2MapMemory((UINT8 *)RamCRam, 0x04100000, 0x041fffff, MAP_RAM); + Sh2MapMemory((UINT8 *)RamCRam, 0x04100000, 0x041fffff, SH2_RAM); Cps3PatchRegion(); @@ -1149,12 +1149,12 @@ INT32 cps3Init() Sh2Open(0); // Map 68000 memory: - Sh2MapMemory(RomBios, 0x00000000, 0x0007ffff, MAP_ROM); // BIOS - Sh2MapMemory(RamMain, 0x02000000, 0x0207ffff, MAP_RAM); // Main RAM - Sh2MapMemory((UINT8 *) RamSpr, 0x04000000, 0x0407ffff, MAP_RAM); -// Sh2MapMemory(RamCRam, 0x04100000, 0x041fffff, MAP_RAM); // map this while reset -// Sh2MapMemory(RamGfx, 0x04200000, 0x043fffff, MAP_WRITE); - Sh2MapMemory((UINT8 *) RamSS, 0x05040000, 0x0504ffff, MAP_RAM); // 'SS' RAM (Score Screen) (text tilemap + toles) + Sh2MapMemory(RomBios, 0x00000000, 0x0007ffff, SH2_ROM); // BIOS + Sh2MapMemory(RamMain, 0x02000000, 0x0207ffff, SH2_RAM); // Main RAM + Sh2MapMemory((UINT8 *) RamSpr, 0x04000000, 0x0407ffff, SH2_RAM); +// Sh2MapMemory(RamCRam, 0x04100000, 0x041fffff, SH2_RAM); // map this while reset +// Sh2MapMemory(RamGfx, 0x04200000, 0x043fffff, SH2_WRITE); + Sh2MapMemory((UINT8 *) RamSS, 0x05040000, 0x0504ffff, SH2_RAM); // 'SS' RAM (Score Screen) (text tilemap + toles) Sh2SetReadByteHandler (0, cps3ReadByte); Sh2SetReadWordHandler (0, cps3ReadWord); @@ -1163,9 +1163,9 @@ INT32 cps3Init() Sh2SetWriteWordHandler(0, cps3WriteWord); Sh2SetWriteLongHandler(0, cps3WriteLong); - Sh2MapMemory(RamC000_D, 0xc0000000, 0xc00003ff, MAP_FETCH); // Executes code from here - Sh2MapMemory(RamC000, 0xc0000000, 0xc00003ff, MAP_READ); - Sh2MapHandler(1, 0xc0000000, 0xc00003ff, MAP_WRITE); + Sh2MapMemory(RamC000_D, 0xc0000000, 0xc00003ff, SH2_FETCH); // Executes code from here + Sh2MapMemory(RamC000, 0xc0000000, 0xc00003ff, SH2_READ); + Sh2MapHandler(1, 0xc0000000, 0xc00003ff, SH2_WRITE); Sh2SetWriteByteHandler(1, cps3C0WriteByte); Sh2SetWriteWordHandler(1, cps3C0WriteWord); @@ -1174,14 +1174,14 @@ INT32 cps3Init() if( !BurnDrvGetHardwareCode() & HARDWARE_CAPCOM_CPS3_NO_CD ) { if (cps3_isSpecial) { - Sh2MapMemory(RomGame, 0x06000000, 0x06ffffff, MAP_READ); // Decrypted SH2 Code - Sh2MapMemory(RomGame_D, 0x06000000, 0x06ffffff, MAP_FETCH); // Decrypted SH2 Code + Sh2MapMemory(RomGame, 0x06000000, 0x06ffffff, SH2_READ); // Decrypted SH2 Code + Sh2MapMemory(RomGame_D, 0x06000000, 0x06ffffff, SH2_FETCH); // Decrypted SH2 Code } else { - Sh2MapMemory(RomGame_D, 0x06000000, 0x06ffffff, MAP_READ | MAP_FETCH); // Decrypted SH2 Code + Sh2MapMemory(RomGame_D, 0x06000000, 0x06ffffff, SH2_READ | SH2_FETCH); // Decrypted SH2 Code } } else { - Sh2MapMemory(RomGame_D, 0x06000000, 0x06ffffff, MAP_FETCH); // Decrypted SH2 Code - Sh2MapHandler(2, 0x06000000, 0x06ffffff, MAP_READ | MAP_WRITE); + Sh2MapMemory(RomGame_D, 0x06000000, 0x06ffffff, SH2_FETCH); // Decrypted SH2 Code + Sh2MapHandler(2, 0x06000000, 0x06ffffff, SH2_READ | SH2_WRITE); if (cps3_isSpecial) { Sh2SetReadByteHandler (2, cps3RomReadByteSpe); @@ -1200,7 +1200,7 @@ INT32 cps3Init() } } - Sh2MapHandler(3, 0x040e0000, 0x040e02ff, MAP_RAM); + Sh2MapHandler(3, 0x040e0000, 0x040e02ff, SH2_RAM); Sh2SetReadByteHandler (3, cps3SndReadByte); Sh2SetReadWordHandler (3, cps3SndReadWord); Sh2SetReadLongHandler (3, cps3SndReadLong); @@ -1208,8 +1208,8 @@ INT32 cps3Init() Sh2SetWriteWordHandler(3, cps3SndWriteWord); Sh2SetWriteLongHandler(3, cps3SndWriteLong); - Sh2MapMemory((UINT8 *)RamPal, 0x04080000, 0x040bffff, MAP_READ); // 16bit BE Colors - Sh2MapHandler(4, 0x04080000, 0x040bffff, MAP_WRITE); + Sh2MapMemory((UINT8 *)RamPal, 0x04080000, 0x040bffff, SH2_READ); // 16bit BE Colors + Sh2MapHandler(4, 0x04080000, 0x040bffff, SH2_WRITE); Sh2SetReadByteHandler (4, cps3VidReadByte); Sh2SetReadWordHandler (4, cps3VidReadWord); @@ -1221,7 +1221,7 @@ INT32 cps3Init() #ifdef SPEED_HACK // install speedup read handler Sh2MapHandler(5, 0x02000000 | (cps3_speedup_ram_address & 0x030000), - 0x0200ffff | (cps3_speedup_ram_address & 0x030000), MAP_READ); + 0x0200ffff | (cps3_speedup_ram_address & 0x030000), SH2_READ); Sh2SetReadByteHandler (5, cps3RamReadByte); Sh2SetReadWordHandler (5, cps3RamReadWord); Sh2SetReadLongHandler (5, cps3RamReadLong); @@ -2134,7 +2134,7 @@ INT32 cps3Scan(INT32 nAction, INT32 *pnMin) cps3_palette_change = 1; // remap RamCRam - Sh2MapMemory(((UINT8 *)RamCRam) + (cram_bank << 20), 0x04100000, 0x041fffff, MAP_RAM); + Sh2MapMemory(((UINT8 *)RamCRam) + (cram_bank << 20), 0x04100000, 0x041fffff, SH2_RAM); } diff --git a/src/burn/drv/dataeast/d_actfancr.cpp b/src/burn/drv/dataeast/d_actfancr.cpp index 659d6a0a0..7c14d13d0 100644 --- a/src/burn/drv/dataeast/d_actfancr.cpp +++ b/src/burn/drv/dataeast/d_actfancr.cpp @@ -502,8 +502,8 @@ static void Dec0SoundInit() { M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(Drv6502RAM, 0x0000, 0x07ff, MAP_RAM); - M6502MapMemory(Drv6502ROM + 0x4000, 0x4000, 0xffff, MAP_ROM); + M6502MapMemory(Drv6502RAM, 0x0000, 0x07ff, M6502_RAM); + M6502MapMemory(Drv6502ROM + 0x4000, 0x4000, 0xffff, M6502_ROM); M6502SetWriteHandler(Dec0_sound_write); M6502SetReadHandler(Dec0_sound_read); M6502Close(); @@ -563,12 +563,12 @@ static INT32 ActfanInit() h6280Init(0); h6280Open(0); - h6280MapMemory(Drv6280ROM, 0x000000, 0x03ffff, MAP_ROM); - h6280MapMemory(DrvPf1RAM, 0x062000, 0x063fff, MAP_RAM); - h6280MapMemory(DrvPf2RAM, 0x072000, 0x073fff, MAP_RAM); - h6280MapMemory(DrvSprRAM, 0x100000, 0x1007ff, MAP_RAM); - h6280MapMemory(DrvPalRAM, 0x120000, 0x1205ff, MAP_ROM); - h6280MapMemory(Drv6280RAM, 0x1f0000, 0x1f3fff, MAP_RAM); + h6280MapMemory(Drv6280ROM, 0x000000, 0x03ffff, H6280_ROM); + h6280MapMemory(DrvPf1RAM, 0x062000, 0x063fff, H6280_RAM); + h6280MapMemory(DrvPf2RAM, 0x072000, 0x073fff, H6280_RAM); + h6280MapMemory(DrvSprRAM, 0x100000, 0x1007ff, H6280_RAM); + h6280MapMemory(DrvPalRAM, 0x120000, 0x1205ff, H6280_ROM); + h6280MapMemory(Drv6280RAM, 0x1f0000, 0x1f3fff, H6280_RAM); h6280SetWriteHandler(actfan_main_write); h6280SetReadHandler(actfan_main_read); h6280Close(); @@ -627,14 +627,14 @@ static INT32 TriothepInit() h6280Init(0); h6280Open(0); - h6280MapMemory(Drv6280ROM, 0x000000, 0x03ffff, MAP_ROM); - h6280MapMemory(DrvPf2RAM, 0x044000, 0x045fff, MAP_RAM); - h6280MapMemory(DrvPf2Scr, 0x046000, 0x0467ff, MAP_RAM); - h6280MapMemory(DrvPf1RAM, 0x064000, 0x0647ff, MAP_RAM); - h6280MapMemory(DrvPf1Scr, 0x066000, 0x0667ff, MAP_RAM); - h6280MapMemory(DrvSprRAM, 0x120000, 0x1207ff, MAP_RAM); - h6280MapMemory(DrvPalRAM, 0x130000, 0x1305ff, MAP_ROM); - h6280MapMemory(Drv6280RAM, 0x1f0000, 0x1f3fff, MAP_RAM); + h6280MapMemory(Drv6280ROM, 0x000000, 0x03ffff, H6280_ROM); + h6280MapMemory(DrvPf2RAM, 0x044000, 0x045fff, H6280_RAM); + h6280MapMemory(DrvPf2Scr, 0x046000, 0x0467ff, H6280_RAM); + h6280MapMemory(DrvPf1RAM, 0x064000, 0x0647ff, H6280_RAM); + h6280MapMemory(DrvPf1Scr, 0x066000, 0x0667ff, H6280_RAM); + h6280MapMemory(DrvSprRAM, 0x120000, 0x1207ff, H6280_RAM); + h6280MapMemory(DrvPalRAM, 0x130000, 0x1305ff, H6280_ROM); + h6280MapMemory(Drv6280RAM, 0x1f0000, 0x1f3fff, H6280_RAM); h6280SetWriteHandler(triothep_main_write); h6280SetReadHandler(triothep_main_read); h6280Close(); diff --git a/src/burn/drv/dataeast/d_boogwing.cpp b/src/burn/drv/dataeast/d_boogwing.cpp index 0c90d5027..3495b0459 100644 --- a/src/burn/drv/dataeast/d_boogwing.cpp +++ b/src/burn/drv/dataeast/d_boogwing.cpp @@ -432,20 +432,20 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_READ); - SekMapMemory(Drv68KCode, 0x000000, 0x0fffff, MAP_FETCH); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x242000, 0x2427ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0x246000, 0x2467ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[0], 0x264000, 0x265fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x266000, 0x267fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x268000, 0x268fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x26a000, 0x26afff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x274000, 0x275fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x276000, 0x277fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x278000, 0x278fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x27a000, 0x27afff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x284000, 0x285fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_READ); + SekMapMemory(Drv68KCode, 0x000000, 0x0fffff, SM_FETCH); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x242000, 0x2427ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0x246000, 0x2467ff, SM_RAM); + SekMapMemory(deco16_pf_ram[0], 0x264000, 0x265fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x266000, 0x267fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x268000, 0x268fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x26a000, 0x26afff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x274000, 0x275fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x276000, 0x277fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x278000, 0x278fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x27a000, 0x27afff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x284000, 0x285fff, SM_RAM); SekSetWriteWordHandler(0, boogwing_main_write_word); SekSetWriteByteHandler(0, boogwing_main_write_byte); SekSetReadWordHandler(0, boogwing_main_read_word); diff --git a/src/burn/drv/dataeast/d_cbuster.cpp b/src/burn/drv/dataeast/d_cbuster.cpp index 04314ff84..e139bc322 100644 --- a/src/burn/drv/dataeast/d_cbuster.cpp +++ b/src/burn/drv/dataeast/d_cbuster.cpp @@ -427,19 +427,19 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x083fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[0], 0x0a0000, 0x0a1fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x0a2000, 0x0a2fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x0a4000, 0x0a47ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x0a6000, 0x0a67ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x0a8000, 0x0a8fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x0aa000, 0x0abfff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x0ac000, 0x0ac7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x0ae000, 0x0ae7ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x0b0000, 0x0b07ff, MAP_RAM); - SekMapMemory(DrvPalRAM0, 0x0b8000, 0x0b8fff, MAP_RAM); - SekMapMemory(DrvPalRAM1, 0x0b9000, 0x0b9fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x083fff, SM_RAM); + SekMapMemory(deco16_pf_ram[0], 0x0a0000, 0x0a1fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x0a2000, 0x0a2fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x0a4000, 0x0a47ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x0a6000, 0x0a67ff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x0a8000, 0x0a8fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x0aa000, 0x0abfff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x0ac000, 0x0ac7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x0ae000, 0x0ae7ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x0b0000, 0x0b07ff, SM_RAM); + SekMapMemory(DrvPalRAM0, 0x0b8000, 0x0b8fff, SM_RAM); + SekMapMemory(DrvPalRAM1, 0x0b9000, 0x0b9fff, SM_RAM); SekSetWriteWordHandler(0, cbuster_main_write_word); SekSetWriteByteHandler(0, cbuster_main_write_byte); SekSetReadWordHandler(0, cbuster_main_read_word); diff --git a/src/burn/drv/dataeast/d_cninja.cpp b/src/burn/drv/dataeast/d_cninja.cpp index dcfe2c909..0dfc8c949 100644 --- a/src/burn/drv/dataeast/d_cninja.cpp +++ b/src/burn/drv/dataeast/d_cninja.cpp @@ -1175,18 +1175,18 @@ static INT32 CninjaInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0bffff, MAP_ROM); - SekMapMemory(deco16_pf_ram[0], 0x144000, 0x144fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x146000, 0x146fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x14c000, 0x14c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x14e000, 0x14e7ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x154000, 0x154fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x156000, 0x156fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x15c000, 0x15c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x15e000, 0x15e7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x184000, 0x187fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x19c000, 0x19dfff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x1a4000, 0x1a47ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0bffff, SM_ROM); + SekMapMemory(deco16_pf_ram[0], 0x144000, 0x144fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x146000, 0x146fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x14c000, 0x14c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x14e000, 0x14e7ff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x154000, 0x154fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x156000, 0x156fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x15c000, 0x15c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x15e000, 0x15e7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x184000, 0x187fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x19c000, 0x19dfff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x1a4000, 0x1a47ff, SM_RAM); SekSetWriteWordHandler(0, cninja_main_write_word); SekSetWriteByteHandler(0, cninja_main_write_byte); SekSetReadWordHandler(0, cninja_main_read_word); @@ -1275,18 +1275,18 @@ static INT32 EdrandyInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(deco16_pf_ram[0], 0x144000, 0x144fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x146000, 0x146fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x14c000, 0x14c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x14e000, 0x14e7ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x154000, 0x154fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x156000, 0x156fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x15c000, 0x15c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x15e000, 0x15e7ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x188000, 0x189fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x194000, 0x197fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x1bc000, 0x1bc7ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(deco16_pf_ram[0], 0x144000, 0x144fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x146000, 0x146fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x14c000, 0x14c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x14e000, 0x14e7ff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x154000, 0x154fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x156000, 0x156fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x15c000, 0x15c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x15e000, 0x15e7ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x188000, 0x189fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x194000, 0x197fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x1bc000, 0x1bc7ff, SM_RAM); SekSetWriteWordHandler(0, cninja_main_write_word); SekSetWriteByteHandler(0, cninja_main_write_byte); SekSetReadWordHandler(0, cninja_main_read_word); @@ -1385,19 +1385,19 @@ static INT32 MutantfInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0x140000, 0x1407ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x160000, 0x161fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[0], 0x304000, 0x305fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x306000, 0x307fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x308000, 0x3087ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x30a000, 0x30a7ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x314000, 0x315fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x316000, 0x317fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x318000, 0x3187ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x31a000, 0x31a7ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0x140000, 0x1407ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x160000, 0x161fff, SM_RAM); + SekMapMemory(deco16_pf_ram[0], 0x304000, 0x305fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x306000, 0x307fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x308000, 0x3087ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x30a000, 0x30a7ff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x314000, 0x315fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x316000, 0x317fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x318000, 0x3187ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x31a000, 0x31a7ff, SM_RAM); SekSetWriteWordHandler(0, mutantf_main_write_word); SekSetWriteByteHandler(0, mutantf_main_write_byte); SekSetReadWordHandler(0, mutantf_main_read_word); @@ -1471,18 +1471,18 @@ static INT32 CninjablInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0bffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x138000, 0x1387ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[0], 0x144000, 0x144fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x146000, 0x146fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x14c000, 0x14c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x14e000, 0x14e7ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x154000, 0x154fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x156000, 0x156fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x15c000, 0x15c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x15e000, 0x15e7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x180000, 0x187fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x19c000, 0x19dfff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0bffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x138000, 0x1387ff, SM_RAM); + SekMapMemory(deco16_pf_ram[0], 0x144000, 0x144fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x146000, 0x146fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x14c000, 0x14c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x14e000, 0x14e7ff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x154000, 0x154fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x156000, 0x156fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x15c000, 0x15c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x15e000, 0x15e7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x180000, 0x187fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x19c000, 0x19dfff, SM_RAM); SekSetWriteWordHandler(0, cninja_main_write_word); SekSetWriteByteHandler(0, cninja_main_write_byte); SekSetReadWordHandler(0, cninja_main_read_word); @@ -1585,18 +1585,18 @@ static INT32 StoneageInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0bffff, MAP_ROM); - SekMapMemory(deco16_pf_ram[0], 0x144000, 0x144fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x146000, 0x146fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x14c000, 0x14c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x14e000, 0x14e7ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x154000, 0x154fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x156000, 0x156fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x15c000, 0x15c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x15e000, 0x15e7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x184000, 0x187fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x19c000, 0x19dfff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x1a4000, 0x1a47ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0bffff, SM_ROM); + SekMapMemory(deco16_pf_ram[0], 0x144000, 0x144fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x146000, 0x146fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x14c000, 0x14c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x14e000, 0x14e7ff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x154000, 0x154fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x156000, 0x156fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x15c000, 0x15c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x15e000, 0x15e7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x184000, 0x187fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x19c000, 0x19dfff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x1a4000, 0x1a47ff, SM_RAM); SekSetWriteWordHandler(0, cninja_main_write_word); SekSetWriteByteHandler(0, cninja_main_write_byte); SekSetReadWordHandler(0, cninja_main_read_word); @@ -1712,18 +1712,18 @@ static INT32 Robocop2Init() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(deco16_pf_ram[0], 0x144000, 0x144fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x146000, 0x146fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x14c000, 0x14c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x14e000, 0x14e7ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x154000, 0x154fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x156000, 0x156fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x15c000, 0x15c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x15e000, 0x15e7ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x180000, 0x1807ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x1a8000, 0x1a9fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x1b8000, 0x1bbfff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(deco16_pf_ram[0], 0x144000, 0x144fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x146000, 0x146fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x14c000, 0x14c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x14e000, 0x14e7ff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x154000, 0x154fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x156000, 0x156fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x15c000, 0x15c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x15e000, 0x15e7ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x180000, 0x1807ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x1a8000, 0x1a9fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x1b8000, 0x1bbfff, SM_RAM); SekSetWriteWordHandler(0, robocop2_main_write_word); SekSetWriteByteHandler(0, robocop2_main_write_byte); SekSetReadWordHandler(0, robocop2_main_read_word); diff --git a/src/burn/drv/dataeast/d_darkseal.cpp b/src/burn/drv/dataeast/d_darkseal.cpp index 85aafa748..ac771e8ad 100644 --- a/src/burn/drv/dataeast/d_darkseal.cpp +++ b/src/burn/drv/dataeast/d_darkseal.cpp @@ -378,16 +378,16 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x140000, 0x141fff, MAP_RAM); // split ram - SekMapMemory(DrvPf3RAM + 0x001000, 0x200000, 0x200fff, MAP_RAM); // mirror - SekMapMemory(DrvPf3RAM, 0x202000, 0x203fff, MAP_RAM); - SekMapMemory(DrvPf12RowRAM, 0x220000, 0x220fff, MAP_RAM); - SekMapMemory(DrvPf34RowRAM, 0x222000, 0x222fff, MAP_RAM); - SekMapMemory(DrvPf2RAM, 0x260000, 0x261fff, MAP_RAM); - SekMapMemory(DrvPf1RAM, 0x262000, 0x263fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x140000, 0x141fff, SM_RAM); // split ram + SekMapMemory(DrvPf3RAM + 0x001000, 0x200000, 0x200fff, SM_RAM); // mirror + SekMapMemory(DrvPf3RAM, 0x202000, 0x203fff, SM_RAM); + SekMapMemory(DrvPf12RowRAM, 0x220000, 0x220fff, SM_RAM); + SekMapMemory(DrvPf34RowRAM, 0x222000, 0x222fff, SM_RAM); + SekMapMemory(DrvPf2RAM, 0x260000, 0x261fff, SM_RAM); + SekMapMemory(DrvPf1RAM, 0x262000, 0x263fff, SM_RAM); SekSetWriteWordHandler(0, darkseal_write_word); SekSetWriteByteHandler(0, darkseal_write_byte); SekSetReadWordHandler(0, darkseal_read_word); diff --git a/src/burn/drv/dataeast/d_dassault.cpp b/src/burn/drv/dataeast/d_dassault.cpp index 8e33579dd..5aecd8d87 100644 --- a/src/burn/drv/dataeast/d_dassault.cpp +++ b/src/burn/drv/dataeast/d_dassault.cpp @@ -628,24 +628,24 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM0, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[0], 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x202000, 0x203fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x212000, 0x212fff, MAP_WRITE); - SekMapMemory(deco16_pf_ram[2], 0x240000, 0x240fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x242000, 0x242fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x252000, 0x252fff, MAP_WRITE); - SekMapMemory(Drv68KRAM0, 0x3f8000, 0x3fbfff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0x3fc000, 0x3fcfff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0x3fe000, 0x3fefff, MAP_FETCH); + SekMapMemory(Drv68KROM0, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(deco16_pf_ram[0], 0x200000, 0x201fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x202000, 0x203fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x212000, 0x212fff, SM_WRITE); + SekMapMemory(deco16_pf_ram[2], 0x240000, 0x240fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x242000, 0x242fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x252000, 0x252fff, SM_WRITE); + SekMapMemory(Drv68KRAM0, 0x3f8000, 0x3fbfff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0x3fc000, 0x3fcfff, SM_RAM); + SekMapMemory(DrvShareRAM, 0x3fe000, 0x3fefff, SM_FETCH); SekSetWriteWordHandler(0, dassault_main_write_word); SekSetWriteByteHandler(0, dassault_main_write_byte); SekSetReadWordHandler(0, dassault_main_read_word); SekSetReadByteHandler(0, dassault_main_read_byte); - SekMapHandler(1, 0x3fe000, 0x3fefff, MAP_WRITE | MAP_READ); + SekMapHandler(1, 0x3fe000, 0x3fefff, SM_WRITE | SM_READ); SekSetWriteWordHandler(1, dassault_irq_write_word); SekSetWriteByteHandler(1, dassault_irq_write_byte); SekSetReadWordHandler(1, dassault_irq_read_word); @@ -654,17 +654,17 @@ static INT32 DrvInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Drv68KROM1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM1, 0x3f8000, 0x3fbfff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x3fc000, 0x3fcfff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0x3fe000, 0x3fefff, MAP_FETCH); + SekMapMemory(Drv68KROM1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM1, 0x3f8000, 0x3fbfff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x3fc000, 0x3fcfff, SM_RAM); + SekMapMemory(DrvShareRAM, 0x3fe000, 0x3fefff, SM_FETCH); SekSetWriteWordHandler(0, dassault_sub_write_word); SekSetWriteByteHandler(0, dassault_sub_write_byte); SekSetReadWordHandler(0, dassault_sub_read_word); SekSetReadByteHandler(0, dassault_sub_read_byte); - SekMapHandler(1, 0x3fe000, 0x3fefff, MAP_WRITE | MAP_READ); + SekMapHandler(1, 0x3fe000, 0x3fefff, SM_WRITE | SM_READ); SekSetWriteWordHandler(1, dassault_irq_write_word); SekSetWriteByteHandler(1, dassault_irq_write_byte); diff --git a/src/burn/drv/dataeast/d_dec0.cpp b/src/burn/drv/dataeast/d_dec0.cpp index 6abbd4071..ae8a6b0a1 100644 --- a/src/burn/drv/dataeast/d_dec0.cpp +++ b/src/burn/drv/dataeast/d_dec0.cpp @@ -3032,37 +3032,37 @@ static void SlyspySetProtectionMap(UINT8 Type) // so far I've not seen evidence that the game activates the alt RAM banks and this implementation is much // cleaner and quicker - SekMapHandler(8, 0x240000, 0x24ffff, MAP_WRITE); + SekMapHandler(8, 0x240000, 0x24ffff, SM_WRITE); SekSetWriteByteHandler(8, SlyspyProt68KWriteByte); SekSetWriteWordHandler(8, SlyspyProt68KWriteWord); switch (Type) { case 0: { - SekMapMemory(DrvVideo1ColScrollRam , 0x242000, 0x24207f, MAP_WRITE); - SekMapMemory(DrvVideo1RowScrollRam , 0x242400, 0x2427ff, MAP_WRITE); - SekMapMemory(DrvVideo1Ram , 0x246000, 0x247fff, MAP_WRITE); - SekMapMemory(DrvCharColScrollRam , 0x24c000, 0x24c07f, MAP_WRITE); - SekMapMemory(DrvCharRowScrollRam , 0x24c400, 0x24c7ff, MAP_WRITE); - SekMapMemory(DrvCharRam , 0x24e000, 0x24ffff, MAP_WRITE); + SekMapMemory(DrvVideo1ColScrollRam , 0x242000, 0x24207f, SM_WRITE); + SekMapMemory(DrvVideo1RowScrollRam , 0x242400, 0x2427ff, SM_WRITE); + SekMapMemory(DrvVideo1Ram , 0x246000, 0x247fff, SM_WRITE); + SekMapMemory(DrvCharColScrollRam , 0x24c000, 0x24c07f, SM_WRITE); + SekMapMemory(DrvCharRowScrollRam , 0x24c400, 0x24c7ff, SM_WRITE); + SekMapMemory(DrvCharRam , 0x24e000, 0x24ffff, SM_WRITE); break; } case 1: { - SekMapMemory(DrvCharRam , 0x248000, 0x249fff, MAP_WRITE); - SekMapMemory(DrvVideo1Ram , 0x24c000, 0x24dfff, MAP_WRITE); + SekMapMemory(DrvCharRam , 0x248000, 0x249fff, SM_WRITE); + SekMapMemory(DrvVideo1Ram , 0x24c000, 0x24dfff, SM_WRITE); break; } case 2: { - SekMapMemory(DrvVideo1Ram , 0x240000, 0x241fff, MAP_WRITE); - SekMapMemory(DrvCharRam , 0x242000, 0x243fff, MAP_WRITE); - SekMapMemory(DrvCharRam , 0x24e000, 0x24ffff, MAP_WRITE); + SekMapMemory(DrvVideo1Ram , 0x240000, 0x241fff, SM_WRITE); + SekMapMemory(DrvCharRam , 0x242000, 0x243fff, SM_WRITE); + SekMapMemory(DrvCharRam , 0x24e000, 0x24ffff, SM_WRITE); break; } case 3: { - SekMapMemory(DrvCharRam , 0x240000, 0x241fff, MAP_WRITE); - SekMapMemory(DrvVideo1Ram , 0x248000, 0x249fff, MAP_WRITE); + SekMapMemory(DrvCharRam , 0x240000, 0x241fff, SM_WRITE); + SekMapMemory(DrvVideo1Ram , 0x248000, 0x249fff, SM_WRITE); break; } } @@ -3521,18 +3521,18 @@ static INT32 Dec0MachineInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(DrvCharColScrollRam , 0x242000, 0x24207f, MAP_RAM); - SekMapMemory(DrvCharRowScrollRam , 0x242400, 0x2427ff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x4000 , 0x242800, 0x243fff, MAP_RAM); - SekMapMemory(DrvVideo1ColScrollRam , 0x248000, 0x24807f, MAP_RAM); - SekMapMemory(DrvVideo1RowScrollRam , 0x248400, 0x2487ff, MAP_RAM); - SekMapMemory(DrvVideo2ColScrollRam , 0x24c800, 0x24c87f, MAP_RAM); - SekMapMemory(DrvVideo2RowScrollRam , 0x24cc00, 0x24cfff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x310000, 0x3107ff, MAP_RAM); - SekMapMemory(DrvPalette2Ram , 0x314000, 0x3147ff, MAP_RAM); - SekMapMemory(Drv68KRam , 0xff8000, 0xffbfff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0xffc000, 0xffc7ff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(DrvCharColScrollRam , 0x242000, 0x24207f, SM_RAM); + SekMapMemory(DrvCharRowScrollRam , 0x242400, 0x2427ff, SM_RAM); + SekMapMemory(Drv68KRam + 0x4000 , 0x242800, 0x243fff, SM_RAM); + SekMapMemory(DrvVideo1ColScrollRam , 0x248000, 0x24807f, SM_RAM); + SekMapMemory(DrvVideo1RowScrollRam , 0x248400, 0x2487ff, SM_RAM); + SekMapMemory(DrvVideo2ColScrollRam , 0x24c800, 0x24c87f, SM_RAM); + SekMapMemory(DrvVideo2RowScrollRam , 0x24cc00, 0x24cfff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x310000, 0x3107ff, SM_RAM); + SekMapMemory(DrvPalette2Ram , 0x314000, 0x3147ff, SM_RAM); + SekMapMemory(Drv68KRam , 0xff8000, 0xffbfff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0xffc000, 0xffc7ff, SM_RAM); SekSetReadByteHandler(0, Dec068KReadByte); SekSetWriteByteHandler(0, Dec068KWriteByte); SekSetReadWordHandler(0, Dec068KReadWord); @@ -3541,8 +3541,8 @@ static INT32 Dec0MachineInit() M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502Ram , 0x0000, 0x05ff, MAP_RAM); - M6502MapMemory(DrvM6502Rom , 0x8000, 0xffff, MAP_ROM); + M6502MapMemory(DrvM6502Ram , 0x0000, 0x05ff, M6502_RAM); + M6502MapMemory(DrvM6502Rom , 0x8000, 0xffff, M6502_ROM); M6502SetReadHandler(Dec0SoundReadByte); M6502SetWriteHandler(Dec0SoundWriteByte); M6502Close(); @@ -3852,7 +3852,7 @@ static INT32 HippodrmInit() Dec0DrawFunction = HippodrmDraw; SekOpen(0); - SekMapHandler(1, 0x180000, 0x180fff, MAP_RAM); + SekMapHandler(1, 0x180000, 0x180fff, SM_RAM); SekSetReadByteHandler(1, HippodrmShared68KReadByte); SekSetWriteByteHandler(1, HippodrmShared68KWriteByte); SekSetReadWordHandler(1, HippodrmShared68KReadWord); @@ -3861,9 +3861,9 @@ static INT32 HippodrmInit() h6280Init(0); h6280Open(0); - h6280MapMemory(DrvH6280Rom , 0x000000, 0x00ffff, MAP_ROM); - h6280MapMemory(DrvSharedRam, 0x180000, 0x1800ff, MAP_RAM); - h6280MapMemory(DrvH6280Ram , 0x1f0000, 0x1f1fff, MAP_RAM); + h6280MapMemory(DrvH6280Rom , 0x000000, 0x00ffff, H6280_ROM); + h6280MapMemory(DrvSharedRam, 0x180000, 0x1800ff, H6280_RAM); + h6280MapMemory(DrvH6280Ram , 0x1f0000, 0x1f1fff, H6280_RAM); h6280SetReadHandler(HippodrmH6280ReadProg); h6280SetWriteHandler(HippodrmH6280WriteProg); h6280Close(); @@ -3924,7 +3924,7 @@ static INT32 RobocopInit() Dec0DrawFunction = RobocopDraw; SekOpen(0); - SekMapHandler(1, 0x180000, 0x180fff, MAP_RAM); + SekMapHandler(1, 0x180000, 0x180fff, SM_RAM); SekSetReadByteHandler(1, RobocopShared68KReadByte); SekSetWriteByteHandler(1, RobocopShared68KWriteByte); SekSetReadWordHandler(1, RobocopShared68KReadWord); @@ -3933,9 +3933,9 @@ static INT32 RobocopInit() h6280Init(0); h6280Open(0); - h6280MapMemory(DrvH6280Rom , 0x000000, 0x00ffff, MAP_ROM); - h6280MapMemory(DrvH6280Ram , 0x1f0000, 0x1f1fff, MAP_RAM); - h6280MapMemory(DrvSharedRam, 0x1f2000, 0x1f3fff, MAP_RAM); + h6280MapMemory(DrvH6280Rom , 0x000000, 0x00ffff, H6280_ROM); + h6280MapMemory(DrvH6280Ram , 0x1f0000, 0x1f1fff, H6280_RAM); + h6280MapMemory(DrvSharedRam, 0x1f2000, 0x1f3fff, H6280_RAM); h6280SetReadHandler(RobocopH6280ReadProg); h6280SetWriteHandler(RobocopH6280WriteProg); h6280Close(); @@ -4021,13 +4021,13 @@ static INT32 SlyspyDrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(DrvVideo2ColScrollRam , 0x300800, 0x30087f, MAP_RAM); - SekMapMemory(DrvVideo2RowScrollRam , 0x300c00, 0x300fff, MAP_RAM); - SekMapMemory(DrvVideo2Ram , 0x301000, 0x3017ff, MAP_RAM); - SekMapMemory(Drv68KRam , 0x304000, 0x307fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x308000, 0x3087ff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x310000, 0x3107ff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(DrvVideo2ColScrollRam , 0x300800, 0x30087f, SM_RAM); + SekMapMemory(DrvVideo2RowScrollRam , 0x300c00, 0x300fff, SM_RAM); + SekMapMemory(DrvVideo2Ram , 0x301000, 0x3017ff, SM_RAM); + SekMapMemory(Drv68KRam , 0x304000, 0x307fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x308000, 0x3087ff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x310000, 0x3107ff, SM_RAM); SekSetReadByteHandler(0, Slyspy68KReadByte); SekSetWriteByteHandler(0, Slyspy68KWriteByte); SekSetReadWordHandler(0, Slyspy68KReadWord); @@ -4036,8 +4036,8 @@ static INT32 SlyspyDrvInit() h6280Init(0); h6280Open(0); - h6280MapMemory(DrvH6280Rom , 0x000000, 0x00ffff, MAP_ROM); - h6280MapMemory(DrvH6280Ram , 0x1f0000, 0x1f1fff, MAP_RAM); + h6280MapMemory(DrvH6280Rom , 0x000000, 0x00ffff, H6280_ROM); + h6280MapMemory(DrvH6280Ram , 0x1f0000, 0x1f1fff, H6280_RAM); h6280SetReadHandler(SlyspyH6280ReadProg); h6280SetWriteHandler(SlyspyH6280WriteProg); h6280Close(); @@ -4227,16 +4227,16 @@ static INT32 MidresInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x1407ff, MAP_RAM); - SekMapMemory(DrvVideo1ColScrollRam , 0x240000, 0x24007f, MAP_RAM); - SekMapMemory(DrvVideo1RowScrollRam , 0x240400, 0x2407ff, MAP_RAM); - SekMapMemory(DrvVideo2ColScrollRam , 0x2c0000, 0x2c007f, MAP_RAM); - SekMapMemory(DrvVideo2RowScrollRam , 0x2c0400, 0x2c07ff, MAP_RAM); - SekMapMemory(DrvCharColScrollRam , 0x340000, 0x34007f, MAP_RAM); - SekMapMemory(DrvCharRowScrollRam , 0x340400, 0x3407ff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x1407ff, SM_RAM); + SekMapMemory(DrvVideo1ColScrollRam , 0x240000, 0x24007f, SM_RAM); + SekMapMemory(DrvVideo1RowScrollRam , 0x240400, 0x2407ff, SM_RAM); + SekMapMemory(DrvVideo2ColScrollRam , 0x2c0000, 0x2c007f, SM_RAM); + SekMapMemory(DrvVideo2RowScrollRam , 0x2c0400, 0x2c07ff, SM_RAM); + SekMapMemory(DrvCharColScrollRam , 0x340000, 0x34007f, SM_RAM); + SekMapMemory(DrvCharRowScrollRam , 0x340400, 0x3407ff, SM_RAM); SekSetReadByteHandler(0, Midres68KReadByte); SekSetWriteByteHandler(0, Midres68KWriteByte); SekSetReadWordHandler(0, Midres68KReadWord); @@ -4245,8 +4245,8 @@ static INT32 MidresInit() h6280Init(0); h6280Open(0); - h6280MapMemory(DrvH6280Rom , 0x000000, 0x00ffff, MAP_ROM); - h6280MapMemory(DrvH6280Ram , 0x1f0000, 0x1f1fff, MAP_RAM); + h6280MapMemory(DrvH6280Rom , 0x000000, 0x00ffff, H6280_ROM); + h6280MapMemory(DrvH6280Ram , 0x1f0000, 0x1f1fff, H6280_RAM); h6280SetReadHandler(MidresH6280ReadProg); h6280SetWriteHandler(MidresH6280WriteProg); h6280Close(); diff --git a/src/burn/drv/dataeast/d_dec8.cpp b/src/burn/drv/dataeast/d_dec8.cpp index 7daa86818..9a628fe70 100644 --- a/src/burn/drv/dataeast/d_dec8.cpp +++ b/src/burn/drv/dataeast/d_dec8.cpp @@ -957,7 +957,7 @@ static void bankswitch(INT32 data) { RomBank = (data & 0x0f) * 0x4000; - HD6309MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, MAP_ROM); // bank + HD6309MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, HD6309_ROM); // bank } void ghostb_main_write(UINT16 address, UINT8 data) @@ -1320,22 +1320,22 @@ static INT32 DrvInit() HD6309Init(0); HD6309Open(0); - HD6309MapMemory(DrvMainRAM, 0x0000, 0x17ff, MAP_RAM); - HD6309MapMemory(DrvVidRAM, 0x1800, 0x1fff, MAP_RAM); - HD6309MapMemory(DrvPf0RAM, 0x2000, 0x2bff, MAP_RAM);// 0 - 27ff - HD6309MapMemory(DrvRowRAM, 0x2c00, 0x2fff, MAP_RAM);// c00-dff - HD6309MapMemory(DrvSprRAM, 0x3000, 0x37ff, MAP_RAM); - HD6309MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, MAP_ROM); // bank - HD6309MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(DrvMainRAM, 0x0000, 0x17ff, HD6309_RAM); + HD6309MapMemory(DrvVidRAM, 0x1800, 0x1fff, HD6309_RAM); + HD6309MapMemory(DrvPf0RAM, 0x2000, 0x2bff, HD6309_RAM);// 0 - 27ff + HD6309MapMemory(DrvRowRAM, 0x2c00, 0x2fff, HD6309_RAM);// c00-dff + HD6309MapMemory(DrvSprRAM, 0x3000, 0x37ff, HD6309_RAM); + HD6309MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, HD6309_ROM); // bank + HD6309MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, HD6309_ROM); HD6309SetWriteHandler(ghostb_main_write); HD6309SetReadHandler(ghostb_main_read); HD6309Close(); M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, MAP_RAM); - M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, MAP_READ); - M6502MapMemory(DrvM6502OPS + 0x8000, 0x8000, 0xffff, MAP_FETCH); + M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, M6502_RAM); + M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, M6502_READ); + M6502MapMemory(DrvM6502OPS + 0x8000, 0x8000, 0xffff, M6502_FETCH); M6502SetReadHandler(ghostb_sound_read); M6502SetWriteHandler(ghostb_sound_write); M6502Close(); @@ -1767,7 +1767,7 @@ static INT32 GhostbScan(INT32 nAction, INT32 *pnMin) if (nAction & ACB_WRITE) { HD6309Open(0); - HD6309MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, MAP_ROM); + HD6309MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, HD6309_ROM); HD6309Close(); } } @@ -1934,7 +1934,7 @@ static void m6809_bankswitch(INT32 data) { RomBank = (data & 0x0f) * 0x4000; - M6809MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, MAP_ROM); // bank + M6809MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, M6809_ROM); // bank } @@ -2144,24 +2144,24 @@ static INT32 CobraInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvMainRAM, 0x0000, 0x07ff, MAP_RAM); - M6809MapMemory(DrvPf0RAM, 0x0800, 0x0fff, MAP_RAM); - M6809MapMemory(DrvPf1RAM, 0x1000, 0x1fff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x2000, 0x27ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x2800, 0x2fff, MAP_RAM); - M6809MapMemory(DrvPalRAM, 0x3000, 0x37ff, MAP_RAM); - M6809MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, MAP_ROM); - M6809MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvMainRAM, 0x0000, 0x07ff, M6809_RAM); + M6809MapMemory(DrvPf0RAM, 0x0800, 0x0fff, M6809_RAM); + M6809MapMemory(DrvPf1RAM, 0x1000, 0x1fff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x2000, 0x27ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x2800, 0x2fff, M6809_RAM); + M6809MapMemory(DrvPalRAM, 0x3000, 0x37ff, M6809_RAM); + M6809MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, M6809_ROM); + M6809MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(cobra_main_write); M6809SetReadHandler(cobra_main_read); M6809Close(); M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, MAP_RAM); -// m6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, MAP_READ); -// m6502MapMemory(DrvM6502OPS + 0x8000, 0x8000, 0xffff, MAP_FETCH); - M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, MAP_ROM); + M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, M6502_RAM); +// m6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, M6502_READ); +// m6502MapMemory(DrvM6502OPS + 0x8000, 0x8000, 0xffff, M6502_FETCH); + M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, M6502_ROM); M6502SetReadHandler(ghostb_sound_read); M6502SetWriteHandler(ghostb_sound_write); M6502Close(); @@ -2415,7 +2415,7 @@ static INT32 CobraScan(INT32 nAction, INT32 *pnMin) if (nAction & ACB_WRITE) { M6809Open(0); - M6809MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, MAP_ROM); + M6809MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, M6809_ROM); M6809Close(); } } @@ -2779,24 +2779,24 @@ static INT32 SrdarwinInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvMainRAM, 0x0000, 0x05ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x0600, 0x07ff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x0800, 0x0fff, MAP_RAM); - M6809MapMemory(DrvMainRAM + 0x1000, 0x1000, 0x13ff, MAP_RAM); - M6809MapMemory(DrvPf0RAM, 0x1400, 0x17ff, MAP_RAM); - M6809MapMemory(DrvPalRAM, 0x2800, 0x28ff, MAP_RAM); - M6809MapMemory(DrvPalRAM + 0x100, 0x3000, 0x30ff, MAP_RAM); - M6809MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, MAP_ROM); - M6809MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvMainRAM, 0x0000, 0x05ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x0600, 0x07ff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x0800, 0x0fff, M6809_RAM); + M6809MapMemory(DrvMainRAM + 0x1000, 0x1000, 0x13ff, M6809_RAM); + M6809MapMemory(DrvPf0RAM, 0x1400, 0x17ff, M6809_RAM); + M6809MapMemory(DrvPalRAM, 0x2800, 0x28ff, M6809_RAM); + M6809MapMemory(DrvPalRAM + 0x100, 0x3000, 0x30ff, M6809_RAM); + M6809MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, M6809_ROM); + M6809MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(srdarwin_main_write); M6809SetReadHandler(srdarwin_main_read); M6809Close(); M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, MAP_RAM); - M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, MAP_READ); - M6502MapMemory(DrvM6502OPS + 0x8000, 0x8000, 0xffff, MAP_FETCH); + M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, M6502_RAM); + M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, M6502_READ); + M6502MapMemory(DrvM6502OPS + 0x8000, 0x8000, 0xffff, M6502_FETCH); M6502SetReadHandler(ghostb_sound_read); M6502SetWriteHandler(ghostb_sound_write); M6502Close(); @@ -3465,13 +3465,13 @@ static INT32 GondoInit() HD6309Init(0); HD6309Open(0); - HD6309MapMemory(DrvMainRAM, 0x0000, 0x17ff, MAP_RAM); - HD6309MapMemory(DrvVidRAM, 0x1800, 0x1fff, MAP_RAM); - HD6309MapMemory(DrvPf0RAM, 0x2000, 0x27ff, MAP_RAM); - HD6309MapMemory(DrvPalRAM, 0x2800, 0x2fff, MAP_RAM);//xxxxBBBBGGGGRRRR_split - HD6309MapMemory(DrvSprRAM, 0x3000, 0x37ff, MAP_RAM); - HD6309MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, MAP_ROM); // bank - HD6309MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(DrvMainRAM, 0x0000, 0x17ff, HD6309_RAM); + HD6309MapMemory(DrvVidRAM, 0x1800, 0x1fff, HD6309_RAM); + HD6309MapMemory(DrvPf0RAM, 0x2000, 0x27ff, HD6309_RAM); + HD6309MapMemory(DrvPalRAM, 0x2800, 0x2fff, HD6309_RAM);//xxxxBBBBGGGGRRRR_split + HD6309MapMemory(DrvSprRAM, 0x3000, 0x37ff, HD6309_RAM); + HD6309MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, HD6309_ROM); // bank + HD6309MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, HD6309_ROM); HD6309SetWriteHandler(gondo_main_write); if (!strcmp(BurnDrvGetTextA(DRV_NAME), "garyoret")) { HD6309SetReadHandler(garyoret_main_read); @@ -3482,8 +3482,8 @@ static INT32 GondoInit() M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, MAP_RAM); - M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, MAP_ROM); + M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, M6502_RAM); + M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, M6502_ROM); M6502SetReadHandler(ghostb_sound_read); M6502SetWriteHandler(gondo_sound_write); M6502Close(); @@ -3709,7 +3709,7 @@ static INT32 GondoScan(INT32 nAction, INT32 *pnMin) if (nAction & ACB_WRITE) { HD6309Open(0); - HD6309MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, MAP_ROM); + HD6309MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, HD6309_ROM); HD6309Close(); } } @@ -4070,31 +4070,31 @@ static INT32 OscarInit() HD6309Init(0); HD6309Open(0); - HD6309MapMemory(DrvMainRAM, 0x0000, 0x1fff, MAP_RAM); // all shared? - HD6309MapMemory(DrvVidRAM, 0x2000, 0x28ff, MAP_RAM); - HD6309MapMemory(DrvPf0RAM, 0x2800, 0x2fff, MAP_RAM); - HD6309MapMemory(DrvSprRAM, 0x3000, 0x37ff, MAP_RAM); - HD6309MapMemory(DrvPalRAM, 0x3800, 0x3bff, MAP_RAM); // xxxxBBBBGGGGRRRR_be_w - HD6309MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, MAP_ROM); // bank - HD6309MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(DrvMainRAM, 0x0000, 0x1fff, HD6309_RAM); // all shared? + HD6309MapMemory(DrvVidRAM, 0x2000, 0x28ff, HD6309_RAM); + HD6309MapMemory(DrvPf0RAM, 0x2800, 0x2fff, HD6309_RAM); + HD6309MapMemory(DrvSprRAM, 0x3000, 0x37ff, HD6309_RAM); + HD6309MapMemory(DrvPalRAM, 0x3800, 0x3bff, HD6309_RAM); // xxxxBBBBGGGGRRRR_be_w + HD6309MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, HD6309_ROM); // bank + HD6309MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, HD6309_ROM); HD6309SetWriteHandler(oscar_main_write); HD6309SetReadHandler(oscar_main_read); HD6309Close(); HD6309Init(1); HD6309Open(1); - HD6309MapMemory(DrvMainRAM, 0x0000, 0x0eff, MAP_RAM); // all shared? AM_RANGE(0x0f00, 0x0fff) AM_RAM not? - HD6309MapMemory(DrvPalRAM + 0x400, 0x0f00, 0x0fff, MAP_RAM); // not really pal... - HD6309MapMemory(DrvMainRAM + 0x1000, 0x1000, 0x1fff, MAP_RAM); // all shared? AM_RANGE(0x0f00, 0x0fff) AM_RAM not? - HD6309MapMemory(DrvSubROM + 0x04000, 0x4000, 0xffff, MAP_ROM); + HD6309MapMemory(DrvMainRAM, 0x0000, 0x0eff, HD6309_RAM); // all shared? AM_RANGE(0x0f00, 0x0fff) AM_RAM not? + HD6309MapMemory(DrvPalRAM + 0x400, 0x0f00, 0x0fff, HD6309_RAM); // not really pal... + HD6309MapMemory(DrvMainRAM + 0x1000, 0x1000, 0x1fff, HD6309_RAM); // all shared? AM_RANGE(0x0f00, 0x0fff) AM_RAM not? + HD6309MapMemory(DrvSubROM + 0x04000, 0x4000, 0xffff, HD6309_ROM); HD6309SetWriteHandler(oscar_sub_write); // 0x3e80, 0x3e83 used... HD6309Close(); M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, MAP_RAM); - M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, MAP_READ); - M6502MapMemory(DrvM6502OPS + 0x8000, 0x8000, 0xffff, MAP_FETCH); + M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, M6502_RAM); + M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, M6502_READ); + M6502MapMemory(DrvM6502OPS + 0x8000, 0x8000, 0xffff, M6502_FETCH); M6502SetReadHandler(ghostb_sound_read); M6502SetWriteHandler(gondo_sound_write); M6502Close(); @@ -4720,34 +4720,34 @@ static INT32 LastmissInit() M6809Init(2); M6809Open(0); - M6809MapMemory(DrvMainRAM, 0x0000, 0x0fff, MAP_RAM); - M6809MapMemory(DrvPalRAM, 0x1000, 0x17ff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x2000, 0x27ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x2800, 0x2fff, MAP_RAM); - M6809MapMemory(DrvMainRAM + 0x1000, 0x3000, 0x37ff, MAP_RAM); - M6809MapMemory(DrvPf0RAM, 0x3800, 0x3fff, MAP_RAM); - M6809MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, MAP_ROM); - M6809MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvMainRAM, 0x0000, 0x0fff, M6809_RAM); + M6809MapMemory(DrvPalRAM, 0x1000, 0x17ff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x2000, 0x27ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x2800, 0x2fff, M6809_RAM); + M6809MapMemory(DrvMainRAM + 0x1000, 0x3000, 0x37ff, M6809_RAM); + M6809MapMemory(DrvPf0RAM, 0x3800, 0x3fff, M6809_RAM); + M6809MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, M6809_ROM); + M6809MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(lastmiss_main_write); M6809SetReadHandler(lastmiss_main_read); M6809Close(); M6809Open(1); - M6809MapMemory(DrvMainRAM, 0x0000, 0x0fff, MAP_RAM); - M6809MapMemory(DrvPalRAM, 0x1000, 0x17ff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x2000, 0x27ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x2800, 0x2fff, MAP_RAM); - M6809MapMemory(DrvMainRAM + 0x1000, 0x3000, 0x37ff, MAP_RAM); - M6809MapMemory(DrvPf0RAM, 0x3800, 0x3fff, MAP_RAM); - M6809MapMemory(DrvSubROM + 0x04000, 0x4000, 0xffff, MAP_ROM); + M6809MapMemory(DrvMainRAM, 0x0000, 0x0fff, M6809_RAM); + M6809MapMemory(DrvPalRAM, 0x1000, 0x17ff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x2000, 0x27ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x2800, 0x2fff, M6809_RAM); + M6809MapMemory(DrvMainRAM + 0x1000, 0x3000, 0x37ff, M6809_RAM); + M6809MapMemory(DrvPf0RAM, 0x3800, 0x3fff, M6809_RAM); + M6809MapMemory(DrvSubROM + 0x04000, 0x4000, 0xffff, M6809_ROM); M6809SetWriteHandler(lastmiss_main_write); M6809SetReadHandler(lastmiss_main_read); M6809Close(); M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, MAP_RAM); - M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, MAP_ROM); + M6502MapMemory(DrvM6502RAM, 0x0000, 0x05ff, M6502_RAM); + M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, M6502_ROM); M6502SetReadHandler(ghostb_sound_read); M6502SetWriteHandler(gondo_sound_write); M6502Close(); @@ -4978,7 +4978,7 @@ static INT32 LastmissScan(INT32 nAction, INT32 *pnMin) if (nAction & ACB_WRITE) { M6809Open(0); - M6809MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, MAP_ROM); + M6809MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, M6809_ROM); M6809Close(); } } @@ -5337,7 +5337,7 @@ static void csilver_sound_bank(INT32 data) { SndRomBank = (data & 8) >> 3; - M6502MapMemory(DrvM6502ROM + 0x10000 + SndRomBank * 0x4000, 0x4000, 0x7fff, MAP_ROM); + M6502MapMemory(DrvM6502ROM + 0x10000 + SndRomBank * 0x4000, 0x4000, 0x7fff, M6502_ROM); } void csilver_sound_write(UINT16 address, UINT8 data) @@ -5434,35 +5434,35 @@ static INT32 CsilverInit() M6809Init(2); M6809Open(0); - M6809MapMemory(DrvMainRAM + 0x00000, 0x0000, 0x0fff, MAP_RAM); - M6809MapMemory(DrvPalRAM, 0x1000, 0x17ff, MAP_RAM); // xxxxbbbbggggrrrr - M6809MapMemory(DrvVidRAM, 0x2000, 0x27ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x2800, 0x2fff, MAP_RAM); - M6809MapMemory(DrvMainRAM + 0x01000, 0x3000, 0x37ff, MAP_RAM); - M6809MapMemory(DrvPf0RAM, 0x3800, 0x3fff, MAP_RAM); - M6809MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, MAP_RAM); - M6809MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, MAP_RAM); + M6809MapMemory(DrvMainRAM + 0x00000, 0x0000, 0x0fff, M6809_RAM); + M6809MapMemory(DrvPalRAM, 0x1000, 0x17ff, M6809_RAM); // xxxxbbbbggggrrrr + M6809MapMemory(DrvVidRAM, 0x2000, 0x27ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x2800, 0x2fff, M6809_RAM); + M6809MapMemory(DrvMainRAM + 0x01000, 0x3000, 0x37ff, M6809_RAM); + M6809MapMemory(DrvPf0RAM, 0x3800, 0x3fff, M6809_RAM); + M6809MapMemory(DrvMainROM + 0x10000, 0x4000, 0x7fff, M6809_RAM); + M6809MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, M6809_RAM); M6809SetWriteHandler(csilver_main_write); M6809SetReadHandler(csilver_main_read); M6809Close(); M6809Open(1); - M6809MapMemory(DrvMainRAM + 0x00000, 0x0000, 0x0fff, MAP_RAM); - M6809MapMemory(DrvPalRAM, 0x1000, 0x17ff, MAP_RAM); // xxxxbbbbggggrrrr - M6809MapMemory(DrvVidRAM, 0x2000, 0x27ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x2800, 0x2fff, MAP_RAM); - M6809MapMemory(DrvMainRAM + 0x01000, 0x3000, 0x37ff, MAP_RAM); - M6809MapMemory(DrvPf0RAM, 0x3800, 0x3fff, MAP_RAM); - M6809MapMemory(DrvSubROM + 0x04000, 0x4000, 0xffff, MAP_RAM); + M6809MapMemory(DrvMainRAM + 0x00000, 0x0000, 0x0fff, M6809_RAM); + M6809MapMemory(DrvPalRAM, 0x1000, 0x17ff, M6809_RAM); // xxxxbbbbggggrrrr + M6809MapMemory(DrvVidRAM, 0x2000, 0x27ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x2800, 0x2fff, M6809_RAM); + M6809MapMemory(DrvMainRAM + 0x01000, 0x3000, 0x37ff, M6809_RAM); + M6809MapMemory(DrvPf0RAM, 0x3800, 0x3fff, M6809_RAM); + M6809MapMemory(DrvSubROM + 0x04000, 0x4000, 0xffff, M6809_RAM); M6809SetWriteHandler(csilver_main_write); M6809SetReadHandler(csilver_main_read); M6809Close(); M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502RAM, 0x0000, 0x07ff, MAP_RAM); - M6502MapMemory(DrvM6502ROM + 0x4000, 0x4000, 0x7fff, MAP_ROM); - M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, MAP_ROM); + M6502MapMemory(DrvM6502RAM, 0x0000, 0x07ff, M6502_RAM); + M6502MapMemory(DrvM6502ROM + 0x4000, 0x4000, 0x7fff, M6502_ROM); + M6502MapMemory(DrvM6502ROM + 0x8000, 0x8000, 0xffff, M6502_ROM); M6502SetReadHandler(csilver_sound_read); M6502SetWriteHandler(csilver_sound_write); M6502Close(); @@ -5580,11 +5580,11 @@ static INT32 CsilverScan(INT32 nAction, INT32 *pnMin) if (nAction & ACB_WRITE) { M6809Open(0); - M6809MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, MAP_ROM); + M6809MapMemory(DrvMainROM + 0x10000 + RomBank, 0x4000, 0x7fff, M6809_ROM); M6809Close(); M6502Open(0); - M6502MapMemory(DrvM6502ROM + 0x10000 + SndRomBank * 0x4000, 0x4000, 0x7fff, MAP_ROM); + M6502MapMemory(DrvM6502ROM + 0x10000 + SndRomBank * 0x4000, 0x4000, 0x7fff, M6502_ROM); M6502Close(); } } diff --git a/src/burn/drv/dataeast/d_dietgogo.cpp b/src/burn/drv/dataeast/d_dietgogo.cpp index b378b1228..6e1586d55 100644 --- a/src/burn/drv/dataeast/d_dietgogo.cpp +++ b/src/burn/drv/dataeast/d_dietgogo.cpp @@ -275,15 +275,15 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_READ); - SekMapMemory(Drv68KCode, 0x000000, 0x07ffff, MAP_FETCH); - SekMapMemory(deco16_pf_ram[0], 0x210000, 0x211fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x212000, 0x213fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x220000, 0x2207ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x222000, 0x2227ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x280000, 0x2807ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x300000, 0x300bff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x380000, 0x38ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_READ); + SekMapMemory(Drv68KCode, 0x000000, 0x07ffff, SM_FETCH); + SekMapMemory(deco16_pf_ram[0], 0x210000, 0x211fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x212000, 0x213fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x220000, 0x2207ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x222000, 0x2227ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x280000, 0x2807ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x300000, 0x300bff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x380000, 0x38ffff, SM_RAM); SekSetWriteWordHandler(0, dietgogo_main_write_word); SekSetWriteByteHandler(0, dietgogo_main_write_byte); SekSetReadWordHandler(0, dietgogo_main_read_word); diff --git a/src/burn/drv/dataeast/d_funkyjet.cpp b/src/burn/drv/dataeast/d_funkyjet.cpp index 334da095f..f09dac449 100644 --- a/src/burn/drv/dataeast/d_funkyjet.cpp +++ b/src/burn/drv/dataeast/d_funkyjet.cpp @@ -392,14 +392,14 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x140000, 0x143fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x160000, 0x1607ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[0], 0x320000, 0x321fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x322000, 0x323fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x340000, 0x340bff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x342000, 0x342bff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x140000, 0x143fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x160000, 0x1607ff, SM_RAM); + SekMapMemory(deco16_pf_ram[0], 0x320000, 0x321fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x322000, 0x323fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x340000, 0x340bff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x342000, 0x342bff, SM_RAM); SekSetWriteWordHandler(0, funkyjet_main_write_word); SekSetWriteByteHandler(0, funkyjet_main_write_byte); SekSetReadWordHandler(0, funkyjet_main_read_word); diff --git a/src/burn/drv/dataeast/d_karnov.cpp b/src/burn/drv/dataeast/d_karnov.cpp index 1428bd2a3..1b6f4aa3c 100644 --- a/src/burn/drv/dataeast/d_karnov.cpp +++ b/src/burn/drv/dataeast/d_karnov.cpp @@ -882,12 +882,12 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x060000, 0x063fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(DrvVidRAM, 0x0a0000, 0x0a07ff, MAP_RAM); - SekMapMemory(DrvVidRAM, 0x0a0800, 0x0a0fff, MAP_RAM); - SekMapMemory(DrvPfRAM, 0x0a1000, 0x0a17ff, MAP_WRITE); + SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x060000, 0x063fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x080000, 0x080fff, SM_RAM); + SekMapMemory(DrvVidRAM, 0x0a0000, 0x0a07ff, SM_RAM); + SekMapMemory(DrvVidRAM, 0x0a0800, 0x0a0fff, SM_RAM); + SekMapMemory(DrvPfRAM, 0x0a1000, 0x0a17ff, SM_WRITE); SekSetWriteWordHandler(0, karnov_main_write_word); SekSetWriteByteHandler(0, karnov_main_write_byte); SekSetReadWordHandler(0, karnov_main_read_word); @@ -896,8 +896,8 @@ static INT32 DrvInit() M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(Drv6502RAM, 0x0000, 0x05ff, MAP_RAM); - M6502MapMemory(Drv6502ROM + 0x8000, 0x8000, 0xffff, MAP_ROM); + M6502MapMemory(Drv6502RAM, 0x0000, 0x05ff, M6502_RAM); + M6502MapMemory(Drv6502ROM + 0x8000, 0x8000, 0xffff, M6502_ROM); M6502SetReadHandler(karnov_sound_read); M6502SetWriteHandler(karnov_sound_write); M6502Close(); diff --git a/src/burn/drv/dataeast/d_lemmings.cpp b/src/burn/drv/dataeast/d_lemmings.cpp index ea6def9a8..6f6345c3a 100644 --- a/src/burn/drv/dataeast/d_lemmings.cpp +++ b/src/burn/drv/dataeast/d_lemmings.cpp @@ -433,14 +433,14 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0x140000, 0x1407ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x160000, 0x160fff, MAP_ROM); - SekMapMemory(DrvVidRAM, 0x200000, 0x202fff, MAP_RAM); - SekMapMemory(DrvPxlRAM0, 0x300000, 0x37ffff, MAP_ROM); - SekMapMemory(DrvPxlRAM1, 0x380000, 0x39ffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0x140000, 0x1407ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x160000, 0x160fff, SM_ROM); + SekMapMemory(DrvVidRAM, 0x200000, 0x202fff, SM_RAM); + SekMapMemory(DrvPxlRAM0, 0x300000, 0x37ffff, SM_ROM); + SekMapMemory(DrvPxlRAM1, 0x380000, 0x39ffff, SM_ROM); SekSetWriteWordHandler(0, lemmings_main_write_word); SekSetWriteByteHandler(0, lemmings_main_write_byte); SekSetReadWordHandler(0, lemmings_main_read_word); @@ -449,8 +449,8 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x0000, 0x07ff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x8000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM, 0x0000, 0x07ff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x8000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(lemmings_sound_write); M6809SetReadHandler(lemmings_sound_read); M6809Close(); diff --git a/src/burn/drv/dataeast/d_pktgaldx.cpp b/src/burn/drv/dataeast/d_pktgaldx.cpp index 0aa78e2c5..c1ca8047a 100644 --- a/src/burn/drv/dataeast/d_pktgaldx.cpp +++ b/src/burn/drv/dataeast/d_pktgaldx.cpp @@ -335,16 +335,16 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_READ); - SekMapMemory(Drv68KCode, 0x000000, 0x07ffff, MAP_FETCH); - SekMapMemory(deco16_pf_ram[0], 0x100000, 0x100fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x102000, 0x102fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x110000, 0x1107ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x112000, 0x1127ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x130000, 0x130fff, MAP_RAM); - SekMapMemory(DrvProtRAM, 0x167800, 0x167fff, MAP_WRITE); - SekMapMemory(Drv68KRAM, 0x170000, 0x17ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_READ); + SekMapMemory(Drv68KCode, 0x000000, 0x07ffff, SM_FETCH); + SekMapMemory(deco16_pf_ram[0], 0x100000, 0x100fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x102000, 0x102fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x110000, 0x1107ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x112000, 0x1127ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x130000, 0x130fff, SM_RAM); + SekMapMemory(DrvProtRAM, 0x167800, 0x167fff, SM_WRITE); + SekMapMemory(Drv68KRAM, 0x170000, 0x17ffff, SM_RAM); SekSetWriteWordHandler(0, pktgaldx_write_word); SekSetWriteByteHandler(0, pktgaldx_write_byte); SekSetReadWordHandler(0, pktgaldx_read_word); diff --git a/src/burn/drv/dataeast/d_rohga.cpp b/src/burn/drv/dataeast/d_rohga.cpp index 280f144b3..82c751eb4 100644 --- a/src/burn/drv/dataeast/d_rohga.cpp +++ b/src/burn/drv/dataeast/d_rohga.cpp @@ -791,22 +791,22 @@ static INT32 RohgaInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(deco16_pf_ram[0], 0x3c0000, 0x3c1fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x3c2000, 0x3c2fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x3c4000, 0x3c4fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x3c6000, 0x3c6fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x3c8000, 0x3c8fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x3c9000, 0x3c9fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x3ca000, 0x3cafff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x3cb000, 0x3cbfff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x3cc000, 0x3ccfff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x3cd000, 0x3cdfff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x3ce000, 0x3cefff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x3cf000, 0x3cffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x3d0000, 0x3d07ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x3e0000, 0x3e1fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x3f0000, 0x3f3fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(deco16_pf_ram[0], 0x3c0000, 0x3c1fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x3c2000, 0x3c2fff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x3c4000, 0x3c4fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x3c6000, 0x3c6fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x3c8000, 0x3c8fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x3c9000, 0x3c9fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x3ca000, 0x3cafff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x3cb000, 0x3cbfff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x3cc000, 0x3ccfff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x3cd000, 0x3cdfff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x3ce000, 0x3cefff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x3cf000, 0x3cffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x3d0000, 0x3d07ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x3e0000, 0x3e1fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x3f0000, 0x3f3fff, SM_RAM); SekSetWriteWordHandler(0, rohga_main_write_word); SekSetWriteByteHandler(0, rohga_main_write_byte); SekSetReadWordHandler(0, rohga_main_read_word); @@ -889,18 +889,18 @@ static INT32 WizdfireInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(deco16_pf_ram[0], 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x202000, 0x202fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x208000, 0x208fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x20a000, 0x20afff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x20c000, 0x20c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x20e000, 0x20e7ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x340000, 0x3407ff, MAP_RAM); - SekMapMemory(DrvSprRAM2, 0x360000, 0x3607ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x380000, 0x381fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xfdc000, 0xfe3fff, MAP_RAM); - SekMapMemory(Drv68KRAM + 0x8000, 0xfe4800, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(deco16_pf_ram[0], 0x200000, 0x200fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x202000, 0x202fff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x208000, 0x208fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x20a000, 0x20afff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x20c000, 0x20c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x20e000, 0x20e7ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x340000, 0x3407ff, SM_RAM); + SekMapMemory(DrvSprRAM2, 0x360000, 0x3607ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x380000, 0x381fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xfdc000, 0xfe3fff, SM_RAM); + SekMapMemory(Drv68KRAM + 0x8000, 0xfe4800, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, wizdfire_main_write_word); SekSetWriteByteHandler(0, wizdfire_main_write_byte); SekSetReadWordHandler(0, wizdfire_main_read_word); @@ -973,23 +973,23 @@ static INT32 SchmeisrInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(deco16_pf_ram[0], 0x3c0000, 0x3c1fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x3c2000, 0x3c2fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x3c4000, 0x3c4fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x3c6000, 0x3c6fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x3c8000, 0x3c8fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x3c9000, 0x3c9fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x3ca000, 0x3cafff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x3cb000, 0x3cbfff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x3cc000, 0x3ccfff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x3cd000, 0x3cdfff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x3ce000, 0x3cefff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x3cf000, 0x3cffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x3d0000, 0x3d07ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x3e0000, 0x3e1fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x3e2000, 0x3e3fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xff0000, 0xff7fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(deco16_pf_ram[0], 0x3c0000, 0x3c1fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x3c2000, 0x3c2fff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x3c4000, 0x3c4fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x3c6000, 0x3c6fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x3c8000, 0x3c8fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x3c9000, 0x3c9fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x3ca000, 0x3cafff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x3cb000, 0x3cbfff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x3cc000, 0x3ccfff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x3cd000, 0x3cdfff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x3ce000, 0x3cefff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x3cf000, 0x3cffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x3d0000, 0x3d07ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x3e0000, 0x3e1fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x3e2000, 0x3e3fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xff0000, 0xff7fff, SM_RAM); SekSetWriteWordHandler(0, rohga_main_write_word); SekSetWriteByteHandler(0, rohga_main_write_byte); SekSetReadWordHandler(0, rohga_main_read_word); @@ -1076,24 +1076,24 @@ static INT32 NitrobalInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(deco16_pf_ram[0], 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[0], 0x201000, 0x201fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x202000, 0x2027ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x202800, 0x202fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x208000, 0x2087ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[2], 0x208800, 0x208fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x20a000, 0x20a7ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x20a800, 0x20afff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x204000, 0x2047ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x206000, 0x2067ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[2], 0x20c000, 0x20c7ff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[3], 0x20e000, 0x20e7ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x340000, 0x3407ff, MAP_RAM); - SekMapMemory(DrvSprRAM2, 0x360000, 0x3607ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x380000, 0x381fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xfec000, 0xff3fff, MAP_RAM); - SekMapMemory(Drv68KRAM + 0x8000, 0xff8000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(deco16_pf_ram[0], 0x200000, 0x200fff, SM_RAM); + SekMapMemory(deco16_pf_ram[0], 0x201000, 0x201fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x202000, 0x2027ff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x202800, 0x202fff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x208000, 0x2087ff, SM_RAM); + SekMapMemory(deco16_pf_ram[2], 0x208800, 0x208fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x20a000, 0x20a7ff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x20a800, 0x20afff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x204000, 0x2047ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x206000, 0x2067ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[2], 0x20c000, 0x20c7ff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[3], 0x20e000, 0x20e7ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x340000, 0x3407ff, SM_RAM); + SekMapMemory(DrvSprRAM2, 0x360000, 0x3607ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x380000, 0x381fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xfec000, 0xff3fff, SM_RAM); + SekMapMemory(Drv68KRAM + 0x8000, 0xff8000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, wizdfire_main_write_word); SekSetWriteByteHandler(0, wizdfire_main_write_byte); SekSetReadWordHandler(0, wizdfire_main_read_word); diff --git a/src/burn/drv/dataeast/d_sidepckt.cpp b/src/burn/drv/dataeast/d_sidepckt.cpp index bc001980d..753effc6d 100644 --- a/src/burn/drv/dataeast/d_sidepckt.cpp +++ b/src/burn/drv/dataeast/d_sidepckt.cpp @@ -663,22 +663,22 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809Ram + 0x0000, 0x0000, 0x0fff, MAP_RAM); - M6809MapMemory(DrvVideoRam , 0x1000, 0x13ff, MAP_RAM); - M6809MapMemory(DrvM6809Ram + 0x1000, 0x1400, 0x17ff, MAP_RAM); - M6809MapMemory(DrvColourRam , 0x1800, 0x1bff, MAP_RAM); - M6809MapMemory(DrvM6809Ram + 0x1400, 0x1c00, 0x1fff, MAP_RAM); - M6809MapMemory(DrvSpriteRam , 0x2000, 0x20ff, MAP_RAM); - M6809MapMemory(DrvM6809Ram + 0x1800, 0x2100, 0x24ff, MAP_RAM); - M6809MapMemory(DrvM6809Rom + 0x4000, 0x4000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809Ram + 0x0000, 0x0000, 0x0fff, M6809_RAM); + M6809MapMemory(DrvVideoRam , 0x1000, 0x13ff, M6809_RAM); + M6809MapMemory(DrvM6809Ram + 0x1000, 0x1400, 0x17ff, M6809_RAM); + M6809MapMemory(DrvColourRam , 0x1800, 0x1bff, M6809_RAM); + M6809MapMemory(DrvM6809Ram + 0x1400, 0x1c00, 0x1fff, M6809_RAM); + M6809MapMemory(DrvSpriteRam , 0x2000, 0x20ff, M6809_RAM); + M6809MapMemory(DrvM6809Ram + 0x1800, 0x2100, 0x24ff, M6809_RAM); + M6809MapMemory(DrvM6809Rom + 0x4000, 0x4000, 0xffff, M6809_ROM); M6809SetReadHandler(SidepcktM6809ReadByte); M6809SetWriteHandler(SidepcktM6809WriteByte); M6809Close(); M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502Ram , 0x0000, 0x0fff, MAP_RAM); - M6502MapMemory(DrvM6502Rom , 0x8000, 0xffff, MAP_ROM); + M6502MapMemory(DrvM6502Ram , 0x0000, 0x0fff, M6502_RAM); + M6502MapMemory(DrvM6502Rom , 0x8000, 0xffff, M6502_ROM); M6502SetReadHandler(SidepcktSoundReadByte); M6502SetWriteHandler(SidepcktSoundWriteByte); M6502Close(); diff --git a/src/burn/drv/dataeast/d_supbtime.cpp b/src/burn/drv/dataeast/d_supbtime.cpp index 6085385ba..816576e14 100644 --- a/src/burn/drv/dataeast/d_supbtime.cpp +++ b/src/burn/drv/dataeast/d_supbtime.cpp @@ -313,18 +313,18 @@ static INT32 DrvInit(INT32 game) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); if (game) { - SekMapMemory(Drv68KRAM, 0x100000, 0x103fff, MAP_RAM); // super burger time + SekMapMemory(Drv68KRAM, 0x100000, 0x103fff, SM_RAM); // super burger time } else { - SekMapMemory(Drv68KRAM, 0x1a0000, 0x1a3fff, MAP_RAM); // china town + SekMapMemory(Drv68KRAM, 0x1a0000, 0x1a3fff, SM_RAM); // china town } - SekMapMemory(DrvSprRAM, 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x140000, 0x1407ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[0], 0x320000, 0x321fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x322000, 0x323fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x340000, 0x340bff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x342000, 0x342bff, MAP_RAM); + SekMapMemory(DrvSprRAM, 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x140000, 0x1407ff, SM_RAM); + SekMapMemory(deco16_pf_ram[0], 0x320000, 0x321fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x322000, 0x323fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x340000, 0x340bff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x342000, 0x342bff, SM_RAM); SekSetWriteWordHandler(0, supbtime_main_write_word); SekSetWriteByteHandler(0, supbtime_main_write_byte); SekSetReadWordHandler(0, supbtime_main_read_word); diff --git a/src/burn/drv/dataeast/d_tumblep.cpp b/src/burn/drv/dataeast/d_tumblep.cpp index 6842081e6..1c6476cfa 100644 --- a/src/burn/drv/dataeast/d_tumblep.cpp +++ b/src/burn/drv/dataeast/d_tumblep.cpp @@ -267,14 +267,14 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x120000, 0x123fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x140000, 0x1407ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x1a0000, 0x1a07ff, MAP_RAM); - SekMapMemory(deco16_pf_ram[0], 0x320000, 0x321fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x322000, 0x323fff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[0], 0x340000, 0x340bff, MAP_RAM); - SekMapMemory(deco16_pf_rowscroll[1], 0x342000, 0x342bff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x120000, 0x123fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x140000, 0x1407ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x1a0000, 0x1a07ff, SM_RAM); + SekMapMemory(deco16_pf_ram[0], 0x320000, 0x321fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x322000, 0x323fff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[0], 0x340000, 0x340bff, SM_RAM); + SekMapMemory(deco16_pf_rowscroll[1], 0x342000, 0x342bff, SM_RAM); SekSetWriteWordHandler(0, tumblep_main_write_word); SekSetWriteByteHandler(0, tumblep_main_write_byte); SekSetReadWordHandler(0, tumblep_main_read_word); diff --git a/src/burn/drv/dataeast/d_vaportra.cpp b/src/burn/drv/dataeast/d_vaportra.cpp index d45dc4087..affecee73 100644 --- a/src/burn/drv/dataeast/d_vaportra.cpp +++ b/src/burn/drv/dataeast/d_vaportra.cpp @@ -373,15 +373,15 @@ static INT32 DrvInit(INT32 type) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(deco16_pf_ram[2], 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[3], 0x202000, 0x203fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[0], 0x280000, 0x281fff, MAP_RAM); - SekMapMemory(deco16_pf_ram[1], 0x282000, 0x283fff, MAP_RAM); - SekMapMemory(DrvPalRAM0, 0x300000, 0x3009ff, MAP_RAM); - SekMapMemory(DrvPalRAM1, 0x304000, 0x3049ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0xff8000, 0xff87ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(deco16_pf_ram[2], 0x200000, 0x201fff, SM_RAM); + SekMapMemory(deco16_pf_ram[3], 0x202000, 0x203fff, SM_RAM); + SekMapMemory(deco16_pf_ram[0], 0x280000, 0x281fff, SM_RAM); + SekMapMemory(deco16_pf_ram[1], 0x282000, 0x283fff, SM_RAM); + SekMapMemory(DrvPalRAM0, 0x300000, 0x3009ff, SM_RAM); + SekMapMemory(DrvPalRAM1, 0x304000, 0x3049ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0xff8000, 0xff87ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, vaportra_main_write_word); SekSetWriteByteHandler(0, vaportra_main_write_byte); SekSetReadWordHandler(0, vaportra_main_read_word); diff --git a/src/burn/drv/dataeast/deco16ic.cpp b/src/burn/drv/dataeast/deco16ic.cpp index 747ad6581..9bb4c2d21 100644 --- a/src/burn/drv/dataeast/deco16ic.cpp +++ b/src/burn/drv/dataeast/deco16ic.cpp @@ -869,8 +869,8 @@ void deco16SoundInit(UINT8 *rom, UINT8 *ram, INT32 huc_clock, INT32 ym2203, void #ifdef ENABLE_HUC6280 h6280Init(0); h6280Open(0); - h6280MapMemory(rom, 0x000000, 0x00ffff, MAP_ROM); - h6280MapMemory(ram, 0x1f0000, 0x1f1fff, MAP_RAM); + h6280MapMemory(rom, 0x000000, 0x00ffff, H6280_ROM); + h6280MapMemory(ram, 0x1f0000, 0x1f1fff, H6280_RAM); h6280SetWriteHandler(deco16_sound_write); h6280SetReadHandler(deco16_sound_read); h6280Close(); diff --git a/src/burn/drv/galaxian/d_galaxian.cpp b/src/burn/drv/galaxian/d_galaxian.cpp index 51faeceac..0bbdc831b 100644 --- a/src/burn/drv/galaxian/d_galaxian.cpp +++ b/src/burn/drv/galaxian/d_galaxian.cpp @@ -22456,22 +22456,22 @@ static void S2650PostLoad() { s2650Init(1); s2650Open(0); - s2650MapMemory(GalS2650Rom1 + 0x0000, 0x0000, 0x0fff, MAP_ROM); - s2650MapMemory(GalSpriteRam, 0x1480, 0x14ff, MAP_READ); - s2650MapMemory(GalVideoRam, 0x1800, 0x1bff, MAP_RAM); - s2650MapMemory(GalZ80Ram1, 0x1c00, 0x1fff, MAP_RAM); - s2650MapMemory(GalS2650Rom1 + 0x1000, 0x2000, 0x2fff, MAP_ROM); - s2650MapMemory(GalSpriteRam, 0x3480, 0x34ff, MAP_READ); - s2650MapMemory(GalVideoRam, 0x3800, 0x3bff, MAP_RAM); - s2650MapMemory(GalZ80Ram1, 0x3c00, 0x3fff, MAP_RAM); - s2650MapMemory(GalS2650Rom1 + 0x2000, 0x4000, 0x4fff, MAP_ROM); - s2650MapMemory(GalSpriteRam, 0x5480, 0x54ff, MAP_READ); - s2650MapMemory(GalVideoRam, 0x5800, 0x5bff, MAP_RAM); - s2650MapMemory(GalZ80Ram1, 0x5c00, 0x5fff, MAP_RAM); - s2650MapMemory(GalS2650Rom1 + 0x3000, 0x6000, 0x6fff, MAP_ROM); - s2650MapMemory(GalSpriteRam, 0x7480, 0x74ff, MAP_READ); - s2650MapMemory(GalVideoRam, 0x7800, 0x7bff, MAP_RAM); - s2650MapMemory(GalZ80Ram1, 0x7c00, 0x7fff, MAP_RAM); + s2650MapMemory(GalS2650Rom1 + 0x0000, 0x0000, 0x0fff, S2650_ROM); + s2650MapMemory(GalSpriteRam, 0x1480, 0x14ff, S2650_READ); + s2650MapMemory(GalVideoRam, 0x1800, 0x1bff, S2650_RAM); + s2650MapMemory(GalZ80Ram1, 0x1c00, 0x1fff, S2650_RAM); + s2650MapMemory(GalS2650Rom1 + 0x1000, 0x2000, 0x2fff, S2650_ROM); + s2650MapMemory(GalSpriteRam, 0x3480, 0x34ff, S2650_READ); + s2650MapMemory(GalVideoRam, 0x3800, 0x3bff, S2650_RAM); + s2650MapMemory(GalZ80Ram1, 0x3c00, 0x3fff, S2650_RAM); + s2650MapMemory(GalS2650Rom1 + 0x2000, 0x4000, 0x4fff, S2650_ROM); + s2650MapMemory(GalSpriteRam, 0x5480, 0x54ff, S2650_READ); + s2650MapMemory(GalVideoRam, 0x5800, 0x5bff, S2650_RAM); + s2650MapMemory(GalZ80Ram1, 0x5c00, 0x5fff, S2650_RAM); + s2650MapMemory(GalS2650Rom1 + 0x3000, 0x6000, 0x6fff, S2650_ROM); + s2650MapMemory(GalSpriteRam, 0x7480, 0x74ff, S2650_READ); + s2650MapMemory(GalVideoRam, 0x7800, 0x7bff, S2650_RAM); + s2650MapMemory(GalZ80Ram1, 0x7c00, 0x7fff, S2650_RAM); s2650SetReadHandler(HunchbkgS2650Read); s2650SetWriteHandler(HunchbkgS2650Write); s2650SetInHandler(HunchbkgS2650PortRead); @@ -22569,22 +22569,22 @@ static void RacknrolPostLoad() { s2650Init(1); s2650Open(0); - s2650MapMemory(GalS2650Rom1 + 0x0000, 0x0000, 0x0fff, MAP_ROM); - s2650MapMemory(GalSpriteRam, 0x1400, 0x14ff, MAP_READ); - s2650MapMemory(GalVideoRam, 0x1800, 0x1bff, MAP_RAM); - s2650MapMemory(GalZ80Ram1, 0x1c00, 0x1fff, MAP_RAM); - s2650MapMemory(GalS2650Rom1 + 0x1000, 0x2000, 0x2fff, MAP_ROM); - s2650MapMemory(GalSpriteRam, 0x3400, 0x34ff, MAP_READ); - s2650MapMemory(GalVideoRam, 0x3800, 0x3bff, MAP_RAM); - s2650MapMemory(GalZ80Ram1, 0x3c00, 0x3fff, MAP_RAM); - s2650MapMemory(GalS2650Rom1 + 0x2000, 0x4000, 0x4fff, MAP_ROM); - s2650MapMemory(GalSpriteRam, 0x5400, 0x54ff, MAP_READ); - s2650MapMemory(GalVideoRam, 0x5800, 0x5bff, MAP_RAM); - s2650MapMemory(GalZ80Ram1, 0x5c00, 0x5fff, MAP_RAM); - s2650MapMemory(GalS2650Rom1 + 0x3000, 0x6000, 0x6fff, MAP_ROM); - s2650MapMemory(GalSpriteRam, 0x7400, 0x74ff, MAP_READ); - s2650MapMemory(GalVideoRam, 0x7800, 0x7bff, MAP_RAM); - s2650MapMemory(GalZ80Ram1, 0x7c00, 0x7fff, MAP_RAM); + s2650MapMemory(GalS2650Rom1 + 0x0000, 0x0000, 0x0fff, S2650_ROM); + s2650MapMemory(GalSpriteRam, 0x1400, 0x14ff, S2650_READ); + s2650MapMemory(GalVideoRam, 0x1800, 0x1bff, S2650_RAM); + s2650MapMemory(GalZ80Ram1, 0x1c00, 0x1fff, S2650_RAM); + s2650MapMemory(GalS2650Rom1 + 0x1000, 0x2000, 0x2fff, S2650_ROM); + s2650MapMemory(GalSpriteRam, 0x3400, 0x34ff, S2650_READ); + s2650MapMemory(GalVideoRam, 0x3800, 0x3bff, S2650_RAM); + s2650MapMemory(GalZ80Ram1, 0x3c00, 0x3fff, S2650_RAM); + s2650MapMemory(GalS2650Rom1 + 0x2000, 0x4000, 0x4fff, S2650_ROM); + s2650MapMemory(GalSpriteRam, 0x5400, 0x54ff, S2650_READ); + s2650MapMemory(GalVideoRam, 0x5800, 0x5bff, S2650_RAM); + s2650MapMemory(GalZ80Ram1, 0x5c00, 0x5fff, S2650_RAM); + s2650MapMemory(GalS2650Rom1 + 0x3000, 0x6000, 0x6fff, S2650_ROM); + s2650MapMemory(GalSpriteRam, 0x7400, 0x74ff, S2650_READ); + s2650MapMemory(GalVideoRam, 0x7800, 0x7bff, S2650_RAM); + s2650MapMemory(GalZ80Ram1, 0x7c00, 0x7fff, S2650_RAM); s2650SetReadHandler(RacknrolS2650Read); s2650SetWriteHandler(RacknrolS2650Write); s2650SetInHandler(RacknrolS2650PortRead); diff --git a/src/burn/drv/galaxian/gal_run.cpp b/src/burn/drv/galaxian/gal_run.cpp index 5eefbb78c..f63531b29 100644 --- a/src/burn/drv/galaxian/gal_run.cpp +++ b/src/burn/drv/galaxian/gal_run.cpp @@ -1650,7 +1650,7 @@ INT32 GalFrame() nGalCyclesDone[nCurrentCPU] += ZetRun(nGalCyclesSegment); if (i == nIrqInterleaveFire && GalIrqFire) { if (GalIrqType == GAL_IRQ_TYPE_NMI) ZetNmi(); - if (GalIrqType == GAL_IRQ_TYPE_IRQ0) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (GalIrqType == GAL_IRQ_TYPE_IRQ0) ZetRaiseIrq(0); GalIrqFire = 0; } ZetClose(); @@ -1663,7 +1663,7 @@ INT32 GalFrame() nNext = (i + 1) * nGalCyclesTotal[nCurrentCPU] / nInterleave; nGalCyclesSegment = nNext - nGalCyclesDone[nCurrentCPU]; nGalCyclesDone[nCurrentCPU] += ZetRun(nGalCyclesSegment); - if (GalSoundType == GAL_SOUND_HARDWARE_TYPE_CHECKMANAY8910) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (GalSoundType == GAL_SOUND_HARDWARE_TYPE_CHECKMANAY8910) ZetRaiseIrq(0); ZetClose(); } @@ -1716,7 +1716,7 @@ INT32 GalFrame() nNext = (i + 1) * nGalCyclesTotal[nCurrentCPU] / nInterleave; nGalCyclesSegment = nNext - nGalCyclesDone[nCurrentCPU]; nGalCyclesDone[nCurrentCPU] += ZetRun(nGalCyclesSegment); - if (HunchbksSoundIrqFire) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (HunchbksSoundIrqFire) ZetRaiseIrq(0); ZetClose(); } diff --git a/src/burn/drv/irem/d_m62.cpp b/src/burn/drv/irem/d_m62.cpp index a2dfb0dec..78b237911 100644 --- a/src/burn/drv/irem/d_m62.cpp +++ b/src/burn/drv/irem/d_m62.cpp @@ -3383,7 +3383,7 @@ static void M62MachineInit() ZetClose(); M6803Init(1); - M6803MapMemory(M62M6803Rom, 0x4000, 0xffff, MAP_ROM); + M6803MapMemory(M62M6803Rom, 0x4000, 0xffff, M6803_ROM); M6803SetReadHandler(M62M6803ReadByte); M6803SetWriteHandler(M62M6803WriteByte); M6803SetReadPortHandler(M62M6803ReadPort); diff --git a/src/burn/drv/irem/d_vigilant.cpp b/src/burn/drv/irem/d_vigilant.cpp index 54d005360..398d6e7f4 100644 --- a/src/burn/drv/irem/d_vigilant.cpp +++ b/src/burn/drv/irem/d_vigilant.cpp @@ -2098,7 +2098,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetRaiseIrq(0); ZetClose(); nCurrentCPU = 1; diff --git a/src/burn/drv/konami/d_88games.cpp b/src/burn/drv/konami/d_88games.cpp index dccfb47d4..9bd2e550e 100644 --- a/src/burn/drv/konami/d_88games.cpp +++ b/src/burn/drv/konami/d_88games.cpp @@ -280,13 +280,13 @@ static void games88_set_lines(INT32 lines) INT32 nBank = 0x10000 + (lines & 0x07) * 0x2000; - konamiMapMemory(DrvKonROM + nBank, 0x0000, 0x0fff, MAP_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x0000, 0x0fff, KON_ROM); if (lines & 8) { - konamiMapMemory(DrvPalRAM, 0x1000, 0x1fff, MAP_RAM); + konamiMapMemory(DrvPalRAM, 0x1000, 0x1fff, KON_RAM); } else { - konamiMapMemory(DrvKonROM + nBank + 0x1000, 0x1000, 0x1fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x0000, 0x1000, 0x1fff, MAP_WRITE); // unmap writes + konamiMapMemory(DrvKonROM + nBank + 0x1000, 0x1000, 0x1fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x0000, 0x1000, 0x1fff, KON_WRITE); // unmap writes } videobank = lines & 0x10; @@ -440,10 +440,10 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvPalRAM + 0x0000, 0x1000, 0x1fff, MAP_RAM); - konamiMapMemory(DrvKonRAM, 0x2000, 0x2fff, MAP_RAM); - konamiMapMemory(DrvNVRAM, 0x3000, 0x37ff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x8000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvPalRAM + 0x0000, 0x1000, 0x1fff, KON_RAM); + konamiMapMemory(DrvKonRAM, 0x2000, 0x2fff, KON_RAM); + konamiMapMemory(DrvNVRAM, 0x3000, 0x37ff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x8000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(games88_main_write); konamiSetReadHandler(games88_main_read); konamiSetlinesCallback(games88_set_lines); diff --git a/src/burn/drv/konami/d_ajax.cpp b/src/burn/drv/konami/d_ajax.cpp index 5dd02895c..c2ea984d4 100644 --- a/src/burn/drv/konami/d_ajax.cpp +++ b/src/burn/drv/konami/d_ajax.cpp @@ -167,7 +167,7 @@ static void ajax_main_bankswitch(INT32 data) ajax_priority = data & 0x08; - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); } void ajax_main_write(UINT16 address, UINT8 data) @@ -261,7 +261,7 @@ static void ajax_sub_bankswitch(UINT8 data) firq_enable = data & 0x10; INT32 nBank = ((data & 0x0f) << 13) + 0x10000; - M6809MapMemory(DrvM6809ROM + nBank, 0x8000, 0x9fff, MAP_ROM); + M6809MapMemory(DrvM6809ROM + nBank, 0x8000, 0x9fff, M6809_ROM); } void ajax_sub_write(UINT16 address, UINT8 data) @@ -547,20 +547,20 @@ static INT32 DrvInit(INT32 type) konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvPalRAM, 0x1000, 0x1fff, MAP_RAM); - konamiMapMemory(DrvShareRAM, 0x2000, 0x3fff, MAP_RAM); - konamiMapMemory(DrvKonRAM, 0x4000, 0x5fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvPalRAM, 0x1000, 0x1fff, KON_RAM); + konamiMapMemory(DrvShareRAM, 0x2000, 0x3fff, KON_RAM); + konamiMapMemory(DrvKonRAM, 0x4000, 0x5fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(ajax_main_write); konamiSetReadHandler(ajax_main_read); konamiClose(); M6809Init(1); M6809Open(0); - M6809MapMemory(DrvShareRAM, 0x2000, 0x3fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x10000, 0x8000, 0x9fff, MAP_ROM); - M6809MapMemory(DrvM6809ROM + 0x0a000, 0xa000, 0xffff, MAP_ROM); + M6809MapMemory(DrvShareRAM, 0x2000, 0x3fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x10000, 0x8000, 0x9fff, M6809_ROM); + M6809MapMemory(DrvM6809ROM + 0x0a000, 0xa000, 0xffff, M6809_ROM); M6809SetWriteHandler(ajax_sub_write); M6809SetReadHandler(ajax_sub_read); M6809Close(); diff --git a/src/burn/drv/konami/d_aliens.cpp b/src/burn/drv/konami/d_aliens.cpp index 339574e40..7c69f509c 100644 --- a/src/burn/drv/konami/d_aliens.cpp +++ b/src/burn/drv/konami/d_aliens.cpp @@ -139,9 +139,9 @@ static void set_ram_bank(INT32 data) nDrvRamBank[0] = data; if (data & 0x20) { - konamiMapMemory(DrvPalRAM, 0x0000, 0x03ff, MAP_RAM); + konamiMapMemory(DrvPalRAM, 0x0000, 0x03ff, KON_RAM); } else { - konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, MAP_RAM); + konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, KON_RAM); } } @@ -158,6 +158,8 @@ void aliens_main_write(UINT16 address, UINT8 data) *soundlatch = data; ZetSetVector(0xff); ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + + //ZetRaiseIrq(0xff); return; } @@ -257,7 +259,7 @@ static void aliens_set_lines(INT32 lines) INT32 nBank = (lines & 0x1f) * 0x2000; - konamiMapMemory(DrvKonROM + 0x10000 + nBank, 0x2000, 0x3fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + nBank, 0x2000, 0x3fff, KON_ROM); } static void K052109Callback(INT32 layer, INT32 bank, INT32 *code, INT32 *color, INT32 *, INT32 *) @@ -379,10 +381,10 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, MAP_RAM); - konamiMapMemory(DrvKonRAM, 0x0400, 0x1fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x2000, 0x3fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, KON_RAM); + konamiMapMemory(DrvKonRAM, 0x0400, 0x1fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x2000, 0x3fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(aliens_main_write); konamiSetReadHandler(aliens_main_read); konamiSetlinesCallback(aliens_set_lines); diff --git a/src/burn/drv/konami/d_asterix.cpp b/src/burn/drv/konami/d_asterix.cpp index b5991ca7b..50005e682 100644 --- a/src/burn/drv/konami/d_asterix.cpp +++ b/src/burn/drv/konami/d_asterix.cpp @@ -494,11 +494,11 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x100000, 0x107fff, MAP_RAM); - SekMapMemory(K053245Ram[0], 0x180000, 0x1807ff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x180800, 0x180fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x280000, 0x280fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x100000, 0x107fff, SM_RAM); + SekMapMemory(K053245Ram[0], 0x180000, 0x1807ff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x180800, 0x180fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x280000, 0x280fff, SM_RAM); SekSetWriteWordHandler(0, asterix_main_write_word); SekSetWriteByteHandler(0, asterix_main_write_byte); SekSetReadWordHandler(0, asterix_main_read_word); @@ -507,8 +507,8 @@ static INT32 DrvInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0xefff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xf000, 0xf7ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0xefff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xf000, 0xf7ff, ZET_RAM); ZetSetWriteHandler(asterix_sound_write); ZetSetReadHandler(asterix_sound_read); ZetClose(); diff --git a/src/burn/drv/konami/d_battlnts.cpp b/src/burn/drv/konami/d_battlnts.cpp index 52caf5562..64a3f37f5 100644 --- a/src/burn/drv/konami/d_battlnts.cpp +++ b/src/burn/drv/konami/d_battlnts.cpp @@ -242,7 +242,7 @@ STDDIPINFO(Rackemup) static void bankswitch(INT32 bank) { HD6309Bank = bank; - HD6309MapMemory(DrvHD6309ROM + 0x10000 + ((bank >> 6) * 0x4000), 0x4000, 0x7fff, MAP_ROM); + HD6309MapMemory(DrvHD6309ROM + 0x10000 + ((bank >> 6) * 0x4000), 0x4000, 0x7fff, HD6309_ROM); } static void battlnts_main_write(UINT16 address, UINT8 data) @@ -438,19 +438,19 @@ static INT32 DrvInit() HD6309Init(0); HD6309Open(0); - HD6309MapMemory(K007342VidRAM[0], 0x0000, 0x1fff, MAP_RAM); - HD6309MapMemory(K007420RAM[0], 0x2000, 0x21ff, MAP_RAM); - HD6309MapMemory(K007342ScrRAM[0], 0x2200, 0x23ff, MAP_RAM); - HD6309MapMemory(DrvPalRAM, 0x2400, 0x24ff, MAP_RAM); - HD6309MapMemory(DrvHD6309ROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(K007342VidRAM[0], 0x0000, 0x1fff, HD6309_RAM); + HD6309MapMemory(K007420RAM[0], 0x2000, 0x21ff, HD6309_RAM); + HD6309MapMemory(K007342ScrRAM[0], 0x2200, 0x23ff, HD6309_RAM); + HD6309MapMemory(DrvPalRAM, 0x2400, 0x24ff, HD6309_RAM); + HD6309MapMemory(DrvHD6309ROM + 0x08000, 0x8000, 0xffff, HD6309_ROM); HD6309SetWriteHandler(battlnts_main_write); HD6309SetReadHandler(battlnts_main_read); HD6309Close(); ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0x8000, 0x87ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0x8000, 0x87ff, ZET_RAM); ZetSetWriteHandler(battlnts_sound_write); ZetSetReadHandler(battlnts_sound_read); ZetClose(); diff --git a/src/burn/drv/konami/d_bishi.cpp b/src/burn/drv/konami/d_bishi.cpp index e231231d6..abd3af2a4 100644 --- a/src/burn/drv/konami/d_bishi.cpp +++ b/src/burn/drv/konami/d_bishi.cpp @@ -480,10 +480,10 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x400000, 0x407fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xb00000, 0xb03fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xb04000, 0xb047ff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x400000, 0x407fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xb00000, 0xb03fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xb04000, 0xb047ff, SM_ROM); SekSetWriteWordHandler(0, bishi_write_word); SekSetWriteByteHandler(0, bishi_write_byte); SekSetReadWordHandler(0, bishi_read_word); diff --git a/src/burn/drv/konami/d_bladestl.cpp b/src/burn/drv/konami/d_bladestl.cpp index d78258e3c..8804b84c9 100644 --- a/src/burn/drv/konami/d_bladestl.cpp +++ b/src/burn/drv/konami/d_bladestl.cpp @@ -166,7 +166,7 @@ STDDIPINFO(Bladestl) static void bankswitch(INT32 bank) { HD6309Bank = bank; - HD6309MapMemory(DrvHD6309ROM + (((bank & 0x60) >> 5) * 0x2000), 0x6000, 0x7fff, MAP_ROM); + HD6309MapMemory(DrvHD6309ROM + (((bank & 0x60) >> 5) * 0x2000), 0x6000, 0x7fff, HD6309_ROM); } static void bladestl_main_write(UINT16 address, UINT8 data) @@ -419,20 +419,20 @@ static INT32 DrvInit() HD6309Init(0); HD6309Open(0); - HD6309MapMemory(K007342VidRAM[0], 0x0000, 0x1fff, MAP_RAM); - HD6309MapMemory(K007420RAM[0], 0x2000, 0x21ff, MAP_RAM); - HD6309MapMemory(K007342ScrRAM[0], 0x2200, 0x23ff, MAP_RAM); - HD6309MapMemory(DrvPalRAM, 0x2400, 0x24ff, MAP_RAM); - HD6309MapMemory(DrvHD6309RAM, 0x4000, 0x5fff, MAP_RAM); - HD6309MapMemory(DrvHD6309ROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(K007342VidRAM[0], 0x0000, 0x1fff, HD6309_RAM); + HD6309MapMemory(K007420RAM[0], 0x2000, 0x21ff, HD6309_RAM); + HD6309MapMemory(K007342ScrRAM[0], 0x2200, 0x23ff, HD6309_RAM); + HD6309MapMemory(DrvPalRAM, 0x2400, 0x24ff, HD6309_RAM); + HD6309MapMemory(DrvHD6309RAM, 0x4000, 0x5fff, HD6309_RAM); + HD6309MapMemory(DrvHD6309ROM + 0x08000, 0x8000, 0xffff, HD6309_ROM); HD6309SetWriteHandler(bladestl_main_write); HD6309SetReadHandler(bladestl_main_read); HD6309Close(); M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x0000, 0x07ff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM, 0x0000, 0x07ff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(bladestl_sound_write); M6809SetReadHandler(bladestl_sound_read); M6809Close(); diff --git a/src/burn/drv/konami/d_blockhl.cpp b/src/burn/drv/konami/d_blockhl.cpp index 011417d20..bcdc8f7ea 100644 --- a/src/burn/drv/konami/d_blockhl.cpp +++ b/src/burn/drv/konami/d_blockhl.cpp @@ -214,12 +214,12 @@ static void blockhl_set_lines(INT32 lines) { INT32 nBank = (lines & 0x03) * 0x2000; - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); if (~lines & 0x20) { - konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, KON_RAM); } else { - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); } K052109RMRDLine = lines & 0x40; @@ -327,10 +327,10 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, MAP_RAM); - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x00000, 0x6000, 0x7fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, KON_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x00000, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(blockhl_main_write); konamiSetReadHandler(blockhl_main_read); konamiSetlinesCallback(blockhl_set_lines); diff --git a/src/burn/drv/konami/d_bottom9.cpp b/src/burn/drv/konami/d_bottom9.cpp index 12b0b2e8d..4d90a0b93 100644 --- a/src/burn/drv/konami/d_bottom9.cpp +++ b/src/burn/drv/konami/d_bottom9.cpp @@ -239,7 +239,7 @@ static void bankswitch(INT32 data) INT32 offs = 0x10000 + (data & 0x1e) * 0x1000; - M6809MapMemory(DrvM6809ROM + offs, 0x6000, 0x7fff, MAP_ROM); + M6809MapMemory(DrvM6809ROM + offs, 0x6000, 0x7fff, M6809_ROM); } void bottom9_main_write(UINT16 address, UINT8 data) @@ -542,9 +542,9 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x4000, 0x5fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); - M6809MapMemory(DrvM6809ROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM, 0x4000, 0x5fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x10000, 0x6000, 0x7fff, M6809_ROM); + M6809MapMemory(DrvM6809ROM + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(bottom9_main_write); M6809SetReadHandler(bottom9_main_read); M6809Close(); diff --git a/src/burn/drv/konami/d_circusc.cpp b/src/burn/drv/konami/d_circusc.cpp index 075983321..9661cf41e 100644 --- a/src/burn/drv/konami/d_circusc.cpp +++ b/src/burn/drv/konami/d_circusc.cpp @@ -358,22 +358,22 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x2000, 0x2fff, MAP_RAM); - M6809MapMemory(DrvColRAM, 0x3000, 0x33ff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x3400, 0x37ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x3800, 0x39ff, MAP_RAM); - M6809MapMemory(DrvM6809RAM + 0x1a00, 0x3a00, 0x3fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM, 0x6000, 0xffff, MAP_READ); - M6809MapMemory(DrvM6809ROMDec, 0x6000, 0xffff, MAP_FETCH); + M6809MapMemory(DrvM6809RAM, 0x2000, 0x2fff, M6809_RAM); + M6809MapMemory(DrvColRAM, 0x3000, 0x33ff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x3400, 0x37ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x3800, 0x39ff, M6809_RAM); + M6809MapMemory(DrvM6809RAM + 0x1a00, 0x3a00, 0x3fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM, 0x6000, 0xffff, M6809_READ); + M6809MapMemory(DrvM6809ROMDec, 0x6000, 0xffff, M6809_FETCH); M6809SetWriteHandler(circusc_main_write); M6809SetReadHandler(circusc_main_read); M6809Close(); ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x3fff, MAP_ROM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x3fff, ZET_ROM); for (INT32 i = 0; i < 0x2000; i+=0x400) { - ZetMapMemory(DrvZ80RAM, 0x4000+i, 0x43ff+i, MAP_RAM); + ZetMapMemory(DrvZ80RAM, 0x4000+i, 0x43ff+i, ZET_RAM); } ZetSetWriteHandler(circusc_sound_write); ZetSetReadHandler(circusc_sound_read); diff --git a/src/burn/drv/konami/d_contra.cpp b/src/burn/drv/konami/d_contra.cpp index b4cd6842a..7b0650153 100644 --- a/src/burn/drv/konami/d_contra.cpp +++ b/src/burn/drv/konami/d_contra.cpp @@ -210,7 +210,7 @@ void contra_bankswitch_w(INT32 data) INT32 bankaddress = 0x10000 + nBankData * 0x2000; if (bankaddress < 0x28000) - M6809MapMemory(DrvM6809ROM0 + bankaddress, 0x6000, 0x7fff, MAP_ROM); + M6809MapMemory(DrvM6809ROM0 + bankaddress, 0x6000, 0x7fff, M6809_ROM); } UINT8 DrvContraM6809ReadByte(UINT16 address) @@ -485,25 +485,25 @@ static INT32 DrvInit() M6809Init(2); M6809Open(0); - M6809MapMemory(DrvPalRAM, 0x0c00, 0x0cff, MAP_ROM); - M6809MapMemory(DrvM6809RAM0, 0x1000, 0x1fff, MAP_RAM); - M6809MapMemory(DrvFgCRAM, 0x2000, 0x23ff, MAP_RAM); - M6809MapMemory(DrvFgVRAM, 0x2400, 0x27ff, MAP_RAM); - M6809MapMemory(DrvTxCRAM, 0x2800, 0x2bff, MAP_RAM); - M6809MapMemory(DrvTxVRAM, 0x2c00, 0x2fff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x3000, 0x3fff, MAP_RAM); - M6809MapMemory(DrvBgCRAM, 0x4000, 0x43ff, MAP_RAM); - M6809MapMemory(DrvBgVRAM, 0x4400, 0x47ff, MAP_RAM); - M6809MapMemory(DrvM6809RAM1, 0x4800, 0x5fff, MAP_RAM); -// M6809MapMemory(DrvM6809ROM0 + 0x10000, 0x6000, 0x7fff, MAP_ROM); - M6809MapMemory(DrvM6809ROM0 + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvPalRAM, 0x0c00, 0x0cff, M6809_ROM); + M6809MapMemory(DrvM6809RAM0, 0x1000, 0x1fff, M6809_RAM); + M6809MapMemory(DrvFgCRAM, 0x2000, 0x23ff, M6809_RAM); + M6809MapMemory(DrvFgVRAM, 0x2400, 0x27ff, M6809_RAM); + M6809MapMemory(DrvTxCRAM, 0x2800, 0x2bff, M6809_RAM); + M6809MapMemory(DrvTxVRAM, 0x2c00, 0x2fff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x3000, 0x3fff, M6809_RAM); + M6809MapMemory(DrvBgCRAM, 0x4000, 0x43ff, M6809_RAM); + M6809MapMemory(DrvBgVRAM, 0x4400, 0x47ff, M6809_RAM); + M6809MapMemory(DrvM6809RAM1, 0x4800, 0x5fff, M6809_RAM); +// M6809MapMemory(DrvM6809ROM0 + 0x10000, 0x6000, 0x7fff, M6809_ROM); + M6809MapMemory(DrvM6809ROM0 + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetReadHandler(DrvContraM6809ReadByte); M6809SetWriteHandler(DrvContraM6809WriteByte); M6809Close(); M6809Open(1); - M6809MapMemory(DrvM6809RAM2, 0x6000, 0x67ff, MAP_RAM); - M6809MapMemory(DrvM6809ROM1 + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM2, 0x6000, 0x67ff, M6809_RAM); + M6809MapMemory(DrvM6809ROM1 + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetReadHandler(DrvContraM6809SoundReadByte); M6809SetWriteHandler(DrvContraM6809SoundWriteByte); M6809Close(); diff --git a/src/burn/drv/konami/d_crimfght.cpp b/src/burn/drv/konami/d_crimfght.cpp index 2bbeb6903..550e0ece5 100644 --- a/src/burn/drv/konami/d_crimfght.cpp +++ b/src/burn/drv/konami/d_crimfght.cpp @@ -252,9 +252,9 @@ static void set_ram_bank(INT32 data) nDrvRamBank[0] = data; if (data & 0x20) { - konamiMapMemory(DrvPalRAM, 0x0000, 0x03ff, MAP_RAM); + konamiMapMemory(DrvPalRAM, 0x0000, 0x03ff, KON_RAM); } else { - konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, MAP_RAM); + konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, KON_RAM); } } @@ -377,7 +377,7 @@ static void crimfght_set_lines(INT32 lines) INT32 nBank = 0x10000 + ((lines & 0x0f) * 0x2000); - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); } static void K052109Callback(INT32 layer, INT32 bank, INT32 *code, INT32 *color, INT32 *flipx, INT32 *) @@ -492,10 +492,10 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, MAP_RAM); - konamiMapMemory(DrvKonRAM, 0x0400, 0x1fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvBankRAM, 0x0000, 0x03ff, KON_RAM); + konamiMapMemory(DrvKonRAM, 0x0400, 0x1fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(crimfght_main_write); konamiSetReadHandler(crimfght_main_read); konamiSetlinesCallback(crimfght_set_lines); diff --git a/src/burn/drv/konami/d_dbz.cpp b/src/burn/drv/konami/d_dbz.cpp index e9a52536e..75fd549e4 100644 --- a/src/burn/drv/konami/d_dbz.cpp +++ b/src/burn/drv/konami/d_dbz.cpp @@ -731,17 +731,17 @@ static INT32 DrvInit(INT32 nGame) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x480000, 0x48ffff, MAP_RAM); - SekMapMemory(K053247Ram, 0x4a0000, 0x4a0fff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x4a1000, 0x4a3fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x4a8000, 0x4abfff, MAP_RAM); - SekMapMemory(DrvK053936Ctrl1, 0x4d0000, 0x4d03ff, MAP_RAM); - SekMapMemory(DrvK053936Ctrl2, 0x4d4000, 0x4d43ff, MAP_RAM); - SekMapMemory(DrvBg2RAM, 0x500000, 0x501fff, MAP_RAM); - SekMapMemory(DrvBg1RAM, 0x508000, 0x509fff, MAP_RAM); - SekMapMemory(Drvk053936RAM1, 0x510000, 0x513fff, MAP_RAM); - SekMapMemory(Drvk053936RAM2, 0x518000, 0x51bfff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x480000, 0x48ffff, SM_RAM); + SekMapMemory(K053247Ram, 0x4a0000, 0x4a0fff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x4a1000, 0x4a3fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x4a8000, 0x4abfff, SM_RAM); + SekMapMemory(DrvK053936Ctrl1, 0x4d0000, 0x4d03ff, SM_RAM); + SekMapMemory(DrvK053936Ctrl2, 0x4d4000, 0x4d43ff, SM_RAM); + SekMapMemory(DrvBg2RAM, 0x500000, 0x501fff, SM_RAM); + SekMapMemory(DrvBg1RAM, 0x508000, 0x509fff, SM_RAM); + SekMapMemory(Drvk053936RAM1, 0x510000, 0x513fff, SM_RAM); + SekMapMemory(Drvk053936RAM2, 0x518000, 0x51bfff, SM_RAM); SekSetWriteWordHandler(0, dbz_main_write_word); SekSetWriteByteHandler(0, dbz_main_write_byte); SekSetReadWordHandler(0, dbz_main_read_word); @@ -750,8 +750,8 @@ static INT32 DrvInit(INT32 nGame) ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0x8000, 0xbfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0x8000, 0xbfff, ZET_RAM); ZetSetWriteHandler(dbz_sound_write); ZetSetReadHandler(dbz_sound_read); ZetClose(); diff --git a/src/burn/drv/konami/d_finalzr.cpp b/src/burn/drv/konami/d_finalzr.cpp index 9c41542ec..8124557bc 100644 --- a/src/burn/drv/konami/d_finalzr.cpp +++ b/src/burn/drv/konami/d_finalzr.cpp @@ -438,14 +438,14 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvColRAM0, 0x2000, 0x23ff, MAP_RAM); - M6809MapMemory(DrvVidRAM0, 0x2400, 0x27ff, MAP_RAM); - M6809MapMemory(DrvColRAM1, 0x2800, 0x2bff, MAP_RAM); - M6809MapMemory(DrvVidRAM1, 0x2c00, 0x2fff, MAP_RAM); - M6809MapMemory(DrvSprRAM0, 0x3000, 0x37ff, MAP_RAM); - M6809MapMemory(DrvSprRAM1, 0x3800, 0x3fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM, 0x4000, 0xffff, MAP_READ); - M6809MapMemory(DrvM6809DecROM, 0x4000, 0xffff, MAP_FETCH); + M6809MapMemory(DrvColRAM0, 0x2000, 0x23ff, M6809_RAM); + M6809MapMemory(DrvVidRAM0, 0x2400, 0x27ff, M6809_RAM); + M6809MapMemory(DrvColRAM1, 0x2800, 0x2bff, M6809_RAM); + M6809MapMemory(DrvVidRAM1, 0x2c00, 0x2fff, M6809_RAM); + M6809MapMemory(DrvSprRAM0, 0x3000, 0x37ff, M6809_RAM); + M6809MapMemory(DrvSprRAM1, 0x3800, 0x3fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM, 0x4000, 0xffff, M6809_READ); + M6809MapMemory(DrvM6809DecROM, 0x4000, 0xffff, M6809_FETCH); M6809SetWriteHandler(finalizr_main_write); M6809SetReadHandler(finalizr_main_read); M6809Close(); diff --git a/src/burn/drv/konami/d_gberet.cpp b/src/burn/drv/konami/d_gberet.cpp index 19b0eae8c..f7cad3157 100644 --- a/src/burn/drv/konami/d_gberet.cpp +++ b/src/burn/drv/konami/d_gberet.cpp @@ -15,7 +15,7 @@ static UINT8 nmi_enable, irq_enable; static UINT16 gberetb_scroll; static UINT8 flipscreen; static UINT8 gberet_spritebank; -static INT32 mrgoemon_bank; +static INT32 mrgoemon_bank; static UINT8 soundlatch; static INT32 game_type = 0; // 0 gberet / rushatck, 1 gberetb, 2 mrgoemon @@ -916,7 +916,7 @@ static INT32 DrvFrame() nCyclesDone = ZetRun(nCyclesSegment); if (irq_enable && i == (nInterleave - 1)) { - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); } if (nmi_enable && (i & 1)) { diff --git a/src/burn/drv/konami/d_gbusters.cpp b/src/burn/drv/konami/d_gbusters.cpp index 880c2beef..f663a3e64 100644 --- a/src/burn/drv/konami/d_gbusters.cpp +++ b/src/burn/drv/konami/d_gbusters.cpp @@ -148,9 +148,9 @@ static void set_ram_bank(INT32 data) nDrvRamBank[0] = data; if (~data & 0x01) { - konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, KON_RAM); } else { - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); } } @@ -272,7 +272,7 @@ static void gbusters_set_lines(INT32 lines) nDrvKonamiBank[1] = lines; - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); } static void DrvK007232VolCallback(INT32 v) @@ -386,10 +386,10 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, MAP_RAM); - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, KON_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(gbusters_main_write); konamiSetReadHandler(gbusters_main_read); konamiSetlinesCallback(gbusters_set_lines); diff --git a/src/burn/drv/konami/d_gijoe.cpp b/src/burn/drv/konami/d_gijoe.cpp index a4732f45e..6ed77c878 100644 --- a/src/burn/drv/konami/d_gijoe.cpp +++ b/src/burn/drv/konami/d_gijoe.cpp @@ -518,10 +518,10 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x100000, 0x100fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x180000, 0x18ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x190000, 0x190fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x100000, 0x100fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x180000, 0x18ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x190000, 0x190fff, SM_RAM); SekSetWriteWordHandler(0, gijoe_main_write_word); SekSetWriteByteHandler(0, gijoe_main_write_byte); SekSetReadWordHandler(0, gijoe_main_read_word); @@ -530,8 +530,8 @@ static INT32 DrvInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0xefff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xf000, 0xf7ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0xefff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xf000, 0xf7ff, ZET_RAM); ZetSetWriteHandler(gijoe_sound_write); ZetSetReadHandler(gijoe_sound_read); ZetClose(); diff --git a/src/burn/drv/konami/d_gradius3.cpp b/src/burn/drv/konami/d_gradius3.cpp index 73aa8328b..eba9d4c96 100644 --- a/src/burn/drv/konami/d_gradius3.cpp +++ b/src/burn/drv/konami/d_gradius3.cpp @@ -596,11 +596,11 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM0, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x040000, 0x043fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(DrvShareRAM2, 0x180000, 0x19ffff, MAP_ROM); + SekMapMemory(Drv68KROM0, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x040000, 0x043fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x080000, 0x080fff, SM_RAM); + SekMapMemory(DrvShareRAM, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(DrvShareRAM2, 0x180000, 0x19ffff, SM_ROM); SekSetWriteWordHandler(0, gradius3_main_write_word); SekSetWriteByteHandler(0, gradius3_main_write_byte); SekSetReadWordHandler(0, gradius3_main_read_word); @@ -609,11 +609,11 @@ static INT32 DrvInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Drv68KROM1, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM1, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0x200000, 0x203fff, MAP_RAM); - SekMapMemory(DrvShareRAM2, 0x280000, 0x29ffff, MAP_ROM); - SekMapMemory(DrvGfxROM1, 0x400000, 0x5fffff, MAP_ROM); + SekMapMemory(Drv68KROM1, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM1, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(DrvShareRAM, 0x200000, 0x203fff, SM_RAM); + SekMapMemory(DrvShareRAM2, 0x280000, 0x29ffff, SM_ROM); + SekMapMemory(DrvGfxROM1, 0x400000, 0x5fffff, SM_ROM); SekSetWriteWordHandler(0, gradius3_sub_write_word); SekSetWriteByteHandler(0, gradius3_sub_write_byte); SekSetReadWordHandler(0, gradius3_sub_read_word); diff --git a/src/burn/drv/konami/d_gyruss.cpp b/src/burn/drv/konami/d_gyruss.cpp index bec17e209..f7d992363 100644 --- a/src/burn/drv/konami/d_gyruss.cpp +++ b/src/burn/drv/konami/d_gyruss.cpp @@ -706,11 +706,11 @@ static INT32 DrvInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvColRAM, 0x8000, 0x83ff, MAP_RAM); - ZetMapMemory(DrvVidRAM, 0x8400, 0x87ff, MAP_RAM); - ZetMapMemory(DrvZ80RAM0, 0x9000, 0x9fff, MAP_RAM); - ZetMapMemory(DrvShareRAM, 0xa000, 0xa7ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvColRAM, 0x8000, 0x83ff, ZET_RAM); + ZetMapMemory(DrvVidRAM, 0x8400, 0x87ff, ZET_RAM); + ZetMapMemory(DrvZ80RAM0, 0x9000, 0x9fff, ZET_RAM); + ZetMapMemory(DrvShareRAM, 0xa000, 0xa7ff, ZET_RAM); ZetSetReadHandler(gyruss_main_read); ZetSetWriteHandler(gyruss_main_write); @@ -718,18 +718,18 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x4000, 0x47ff, MAP_RAM); - M6809MapMemory(DrvShareRAM, 0x6000, 0x67ff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0xe000, 0xe000, 0xffff, MAP_READ); - M6809MapMemory(DrvM6809DecROM + 0xe000, 0xe000, 0xffff, MAP_FETCH); + M6809MapMemory(DrvM6809RAM, 0x4000, 0x47ff, M6809_RAM); + M6809MapMemory(DrvShareRAM, 0x6000, 0x67ff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0xe000, 0xe000, 0xffff, M6809_READ); + M6809MapMemory(DrvM6809DecROM + 0xe000, 0xe000, 0xffff, M6809_FETCH); M6809SetReadHandler(gyruss_sub_read); M6809SetWriteHandler(gyruss_sub_write); M6809Close(); ZetInit(1); ZetOpen(1); - ZetMapMemory(DrvZ80ROM1, 0x0000, 0x5fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM1, 0x6000, 0x63ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM1, 0x0000, 0x5fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM1, 0x6000, 0x63ff, ZET_RAM); ZetSetReadHandler(gyruss_sound0_read); ZetSetOutHandler(gyruss_sound0_out); ZetSetInHandler(gyruss_sound0_in); diff --git a/src/burn/drv/konami/d_hcastle.cpp b/src/burn/drv/konami/d_hcastle.cpp index 0c1ca1d81..83fbe6c78 100644 --- a/src/burn/drv/konami/d_hcastle.cpp +++ b/src/burn/drv/konami/d_hcastle.cpp @@ -160,7 +160,7 @@ static void bankswitch(INT32 data) *nDrvKonBank = data & 0x0f; INT32 bankaddress = *nDrvKonBank * 0x2000; - konamiMapMemory(DrvKonROM + 0x10000 + bankaddress, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + bankaddress, 0x6000, 0x7fff, KON_ROM); } static void playfield_write(INT32 address, INT32 data, UINT8 *ctrl, UINT8 *spr, UINT8 *buf) @@ -473,15 +473,15 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM0, 0x0000, 0x00ff, MAP_ROM); //020-03f - konamiMapMemory(DrvKonRAM1, 0x0200, 0x02ff, MAP_ROM); //220-23f - konamiMapMemory(DrvPalRAM, 0x0600, 0x1fff, MAP_RAM); - konamiMapMemory(DrvPf1RAM, 0x2000, 0x2fff, MAP_RAM); - konamiMapMemory(DrvSprRAM1, 0x3000, 0x3fff, MAP_RAM); - konamiMapMemory(DrvPf2RAM, 0x4000, 0x4fff, MAP_RAM); - konamiMapMemory(DrvSprRAM2, 0x5000, 0x5fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); - konamiMapMemory(DrvKonROM, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvKonRAM0, 0x0000, 0x00ff, KON_ROM); //020-03f + konamiMapMemory(DrvKonRAM1, 0x0200, 0x02ff, KON_ROM); //220-23f + konamiMapMemory(DrvPalRAM, 0x0600, 0x1fff, KON_RAM); + konamiMapMemory(DrvPf1RAM, 0x2000, 0x2fff, KON_RAM); + konamiMapMemory(DrvSprRAM1, 0x3000, 0x3fff, KON_RAM); + konamiMapMemory(DrvPf2RAM, 0x4000, 0x4fff, KON_RAM); + konamiMapMemory(DrvSprRAM2, 0x5000, 0x5fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(hcastle_write); konamiSetReadHandler(hcastle_read); konamiClose(); diff --git a/src/burn/drv/konami/d_hexion.cpp b/src/burn/drv/konami/d_hexion.cpp index 19968ad0f..57fb79dac 100644 --- a/src/burn/drv/konami/d_hexion.cpp +++ b/src/burn/drv/konami/d_hexion.cpp @@ -522,7 +522,7 @@ static INT32 DrvFrame() nCyclesSegment = ZetRun(nCyclesSegment); if (i == (nInterleave / 3)) ZetNmi(); if (i == ((nInterleave / 3) * 2)) ZetNmi(); - if (i == nInterleave - 1) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == nInterleave - 1) ZetRaiseIrq(0); nCyclesDone[0] += nCyclesSegment; if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/d_ironhors.cpp b/src/burn/drv/konami/d_ironhors.cpp index b953ac6b8..5254e952f 100644 --- a/src/burn/drv/konami/d_ironhors.cpp +++ b/src/burn/drv/konami/d_ironhors.cpp @@ -415,21 +415,21 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM0, 0x0000, 0x00ff, MAP_RAM); - M6809MapMemory(DrvColRAM, 0x2000, 0x23ff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x2400, 0x27ff, MAP_RAM); - M6809MapMemory(DrvM6809RAM1, 0x2800, 0x2fff, MAP_RAM); - M6809MapMemory(DrvSprRAM1, 0x3000, 0x37ff, MAP_RAM); - M6809MapMemory(DrvSprRAM0, 0x3800, 0x3fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM, 0x4000, 0xffff, MAP_RAM); + M6809MapMemory(DrvM6809RAM0, 0x0000, 0x00ff, M6809_RAM); + M6809MapMemory(DrvColRAM, 0x2000, 0x23ff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x2400, 0x27ff, M6809_RAM); + M6809MapMemory(DrvM6809RAM1, 0x2800, 0x2fff, M6809_RAM); + M6809MapMemory(DrvSprRAM1, 0x3000, 0x37ff, M6809_RAM); + M6809MapMemory(DrvSprRAM0, 0x3800, 0x3fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM, 0x4000, 0xffff, M6809_RAM); M6809SetWriteHandler(ironhors_main_write); M6809SetReadHandler(ironhors_main_read); M6809Close(); ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x3fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0x4000, 0x43ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x3fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0x4000, 0x43ff, ZET_RAM); ZetSetReadHandler(ironhors_sound_read); ZetSetOutHandler(ironhors_sound_write_port); ZetSetInHandler(ironhors_sound_read_port); diff --git a/src/burn/drv/konami/d_jailbrek.cpp b/src/burn/drv/konami/d_jailbrek.cpp index a9ad72d65..10261ae02 100644 --- a/src/burn/drv/konami/d_jailbrek.cpp +++ b/src/burn/drv/konami/d_jailbrek.cpp @@ -375,13 +375,13 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvColRAM, 0x0000, 0x07ff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x0800, 0x0fff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x1000, 0x10ff, MAP_RAM); - M6809MapMemory(DrvM6809RAM0, 0x1100, 0x1fff, MAP_RAM); - M6809MapMemory(DrvM6809RAM1, 0x3000, 0x30ff, MAP_RAM); - M6809MapMemory(DrvM6809ROM, 0x8000, 0xffff, MAP_READ); - M6809MapMemory(DrvM6809DecROM, 0x8000, 0xffff, MAP_FETCH); + M6809MapMemory(DrvColRAM, 0x0000, 0x07ff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x0800, 0x0fff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x1000, 0x10ff, M6809_RAM); + M6809MapMemory(DrvM6809RAM0, 0x1100, 0x1fff, M6809_RAM); + M6809MapMemory(DrvM6809RAM1, 0x3000, 0x30ff, M6809_RAM); + M6809MapMemory(DrvM6809ROM, 0x8000, 0xffff, M6809_READ); + M6809MapMemory(DrvM6809DecROM, 0x8000, 0xffff, M6809_FETCH); M6809SetWriteHandler(jailbrek_write); M6809SetReadHandler(jailbrek_read); M6809Close(); diff --git a/src/burn/drv/konami/d_labyrunr.cpp b/src/burn/drv/konami/d_labyrunr.cpp index 4f0962772..bc8d7b909 100644 --- a/src/burn/drv/konami/d_labyrunr.cpp +++ b/src/burn/drv/konami/d_labyrunr.cpp @@ -165,7 +165,7 @@ static void bankswitch(INT32 data) { if (data != HD6309Bank) { HD6309Bank = data; - HD6309MapMemory(DrvHD6309ROM + 0x10000 + ((HD6309Bank & 7) * 0x4000), 0x4000, 0x7fff, MAP_ROM); + HD6309MapMemory(DrvHD6309ROM + 0x10000 + ((HD6309Bank & 7) * 0x4000), 0x4000, 0x7fff, HD6309_ROM); } } @@ -413,12 +413,12 @@ static INT32 CommonInit(INT32 nLoadType) HD6309Init(0); HD6309Open(0); - HD6309MapMemory(DrvPalRAM, 0x1000, 0x10ff, MAP_ROM); - HD6309MapMemory(DrvHD6309RAM, 0x1800, 0x1fff, MAP_RAM); - HD6309MapMemory(DrvSprRAM, 0x2000, 0x2fff, MAP_RAM); - HD6309MapMemory(DrvVidRAM0, 0x3000, 0x37ff, MAP_RAM); - HD6309MapMemory(DrvVidRAM1, 0x3800, 0x3fff, MAP_RAM); - HD6309MapMemory(DrvHD6309ROM, 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(DrvPalRAM, 0x1000, 0x10ff, HD6309_ROM); + HD6309MapMemory(DrvHD6309RAM, 0x1800, 0x1fff, HD6309_RAM); + HD6309MapMemory(DrvSprRAM, 0x2000, 0x2fff, HD6309_RAM); + HD6309MapMemory(DrvVidRAM0, 0x3000, 0x37ff, HD6309_RAM); + HD6309MapMemory(DrvVidRAM1, 0x3800, 0x3fff, HD6309_RAM); + HD6309MapMemory(DrvHD6309ROM, 0x8000, 0xffff, HD6309_ROM); HD6309SetWriteHandler(labyrunr_write); HD6309SetReadHandler(labyrunr_read); HD6309Close(); diff --git a/src/burn/drv/konami/d_lethal.cpp b/src/burn/drv/konami/d_lethal.cpp index e9379e69a..f22b43018 100644 --- a/src/burn/drv/konami/d_lethal.cpp +++ b/src/burn/drv/konami/d_lethal.cpp @@ -147,7 +147,7 @@ static void bankswitch(INT32 bank) { bank = (bank & 0x1f) * 0x2000; - HD6309MapMemory(DrvMainROM + bank, 0x0000, 0x1fff, MAP_ROM); + HD6309MapMemory(DrvMainROM + bank, 0x0000, 0x1fff, HD6309_ROM); } static void lethal_main_write(UINT16 address, UINT8 data) @@ -502,17 +502,17 @@ static INT32 DrvInit(INT32 flipy) HD6309Init(0); HD6309Open(0); - HD6309MapMemory(DrvMainROM + 0x00000, 0x0000, 0x1fff, MAP_ROM); - HD6309MapMemory(DrvMainRAM, 0x2000, 0x3fff, MAP_RAM); - HD6309MapMemory(DrvMainROM + 0x38000, 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(DrvMainROM + 0x00000, 0x0000, 0x1fff, HD6309_ROM); + HD6309MapMemory(DrvMainRAM, 0x2000, 0x3fff, HD6309_RAM); + HD6309MapMemory(DrvMainROM + 0x38000, 0x8000, 0xffff, HD6309_ROM); HD6309SetReadHandler(lethal_main_read); HD6309SetWriteHandler(lethal_main_write); HD6309Close(); ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0xefff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xf000, 0xf7ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0xefff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xf000, 0xf7ff, ZET_RAM); ZetSetWriteHandler(lethal_sound_write); ZetSetReadHandler(lethal_sound_read); ZetClose(); diff --git a/src/burn/drv/konami/d_mainevt.cpp b/src/burn/drv/konami/d_mainevt.cpp index 1813b50c1..64620ea5b 100644 --- a/src/burn/drv/konami/d_mainevt.cpp +++ b/src/burn/drv/konami/d_mainevt.cpp @@ -427,7 +427,7 @@ static void bankswitch(INT32 data) INT32 nBank = 0x10000 + nDrvBank[0] * 0x2000; - HD6309MapMemory(DrvHD6309ROM + nBank, 0x6000, 0x7fff, MAP_ROM); + HD6309MapMemory(DrvHD6309ROM + nBank, 0x6000, 0x7fff, HD6309_ROM); K052109RMRDLine = data & 0x40; } @@ -713,9 +713,9 @@ static INT32 DrvInit(INT32 type) HD6309Init(0); HD6309Open(0); - HD6309MapMemory(DrvHD6309RAM, 0x4000, 0x5fff, MAP_RAM); - HD6309MapMemory(DrvHD6309ROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); - HD6309MapMemory(DrvHD6309ROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(DrvHD6309RAM, 0x4000, 0x5fff, HD6309_RAM); + HD6309MapMemory(DrvHD6309ROM + 0x10000, 0x6000, 0x7fff, HD6309_ROM); + HD6309MapMemory(DrvHD6309ROM + 0x08000, 0x8000, 0xffff, HD6309_ROM); HD6309SetWriteHandler(mainevt_main_write); HD6309SetReadHandler(mainevt_main_read); HD6309Close(); diff --git a/src/burn/drv/konami/d_megazone.cpp b/src/burn/drv/konami/d_megazone.cpp index 27e02dc16..3007a85b4 100644 --- a/src/burn/drv/konami/d_megazone.cpp +++ b/src/burn/drv/konami/d_megazone.cpp @@ -523,22 +523,22 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvVidRAM0, 0x2000, 0x23ff, MAP_RAM); - M6809MapMemory(DrvVidRAM1, 0x2400, 0x27ff, MAP_RAM); - M6809MapMemory(DrvColRAM0, 0x2800, 0x2bff, MAP_RAM); - M6809MapMemory(DrvColRAM1, 0x2c00, 0x2fff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x3000, 0x37ff, MAP_RAM); - M6809MapMemory(DrvShareRAM, 0x3800, 0x3fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x4000, 0x4000, 0xffff, MAP_READ); - M6809MapMemory(DrvM6809DecROM + 0x4000, 0x4000, 0xffff, MAP_FETCH); + M6809MapMemory(DrvVidRAM0, 0x2000, 0x23ff, M6809_RAM); + M6809MapMemory(DrvVidRAM1, 0x2400, 0x27ff, M6809_RAM); + M6809MapMemory(DrvColRAM0, 0x2800, 0x2bff, M6809_RAM); + M6809MapMemory(DrvColRAM1, 0x2c00, 0x2fff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x3000, 0x37ff, M6809_RAM); + M6809MapMemory(DrvShareRAM, 0x3800, 0x3fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x4000, 0x4000, 0xffff, M6809_READ); + M6809MapMemory(DrvM6809DecROM + 0x4000, 0x4000, 0xffff, M6809_FETCH); M6809SetWriteHandler(megazone_main_write); // M6809SetReadHandler(megazone_main_read); M6809Close(); ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x1fff, MAP_ROM); - ZetMapMemory(DrvShareRAM, 0xe000, 0xe7ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x1fff, ZET_ROM); + ZetMapMemory(DrvShareRAM, 0xe000, 0xe7ff, ZET_RAM); ZetSetWriteHandler(megazone_sound_write); ZetSetReadHandler(megazone_sound_read); ZetSetOutHandler(megazone_sound_write_port); diff --git a/src/burn/drv/konami/d_mikie.cpp b/src/burn/drv/konami/d_mikie.cpp index 867abd469..a3333d169 100644 --- a/src/burn/drv/konami/d_mikie.cpp +++ b/src/burn/drv/konami/d_mikie.cpp @@ -398,19 +398,19 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x0000, 0x00ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x2800, 0x37ff, MAP_RAM); - M6809MapMemory(DrvColRAM, 0x3800, 0x3bff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x3c00, 0x3fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM, 0x6000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM, 0x0000, 0x00ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x2800, 0x37ff, M6809_RAM); + M6809MapMemory(DrvColRAM, 0x3800, 0x3bff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x3c00, 0x3fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM, 0x6000, 0xffff, M6809_ROM); M6809SetWriteHandler(mikie_main_write); M6809SetReadHandler(mikie_main_read); M6809Close(); ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x3fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0x4000, 0x43ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x3fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0x4000, 0x43ff, ZET_RAM); ZetSetWriteHandler(mikie_sound_write); ZetSetReadHandler(mikie_sound_read); ZetClose(); diff --git a/src/burn/drv/konami/d_mogura.cpp b/src/burn/drv/konami/d_mogura.cpp index 223939f75..6c1fdc0a5 100644 --- a/src/burn/drv/konami/d_mogura.cpp +++ b/src/burn/drv/konami/d_mogura.cpp @@ -335,7 +335,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(3000000 / 60); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); if (pBurnSoundOut) { DACUpdate(pBurnSoundOut, nBurnSoundLen); diff --git a/src/burn/drv/konami/d_moo.cpp b/src/burn/drv/konami/d_moo.cpp index 9a04663d9..08a430b7f 100644 --- a/src/burn/drv/konami/d_moo.cpp +++ b/src/burn/drv/konami/d_moo.cpp @@ -679,7 +679,7 @@ static UINT8 __fastcall bucky_main_read_byte(UINT32 address) static void bankswitch(INT32 data) { z80_bank = data; - ZetMapMemory(DrvZ80ROM + ((data & 0x0f) * 0x4000), 0x8000, 0xbfff, MAP_ROM); + ZetMapMemory(DrvZ80ROM + ((data & 0x0f) * 0x4000), 0x8000, 0xbfff, ZET_ROM); } static void __fastcall moo_sound_write(UINT16 address, UINT8 data) @@ -892,11 +892,11 @@ static INT32 MooInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KROM + 0x080000, 0x100000, 0x17ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x180000, 0x18ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x190000, 0x19ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x1c0000, 0x1c1fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KROM + 0x080000, 0x100000, 0x17ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x180000, 0x18ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x190000, 0x19ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x1c0000, 0x1c1fff, SM_RAM); SekSetWriteWordHandler(0, moo_main_write_word); SekSetWriteByteHandler(0, moo_main_write_byte); SekSetReadWordHandler(0, moo_main_read_word); @@ -905,8 +905,8 @@ static INT32 MooInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, ZET_RAM); ZetSetWriteHandler(moo_sound_write); ZetSetReadHandler(moo_sound_read); ZetClose(); @@ -982,13 +982,13 @@ static INT32 BuckyInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KROM + 0x080000, 0x200000, 0x23ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x08ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x090000, 0x09ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x0a0000, 0x0affff, MAP_RAM); - SekMapMemory(Drv68KRAM3, 0x184000, 0x187fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x1b0000, 0x1b3fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KROM + 0x080000, 0x200000, 0x23ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x08ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x090000, 0x09ffff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x0a0000, 0x0affff, SM_RAM); + SekMapMemory(Drv68KRAM3, 0x184000, 0x187fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x1b0000, 0x1b3fff, SM_RAM); SekSetWriteWordHandler(0, bucky_main_write_word); SekSetWriteByteHandler(0, bucky_main_write_byte); SekSetReadWordHandler(0, bucky_main_read_word); @@ -997,8 +997,8 @@ static INT32 BuckyInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, ZET_RAM); ZetSetWriteHandler(moo_sound_write); ZetSetReadHandler(moo_sound_read); ZetClose(); diff --git a/src/burn/drv/konami/d_mystwarr.cpp b/src/burn/drv/konami/d_mystwarr.cpp index 97912ef8e..459ec5553 100644 --- a/src/burn/drv/konami/d_mystwarr.cpp +++ b/src/burn/drv/konami/d_mystwarr.cpp @@ -1616,7 +1616,7 @@ static UINT8 __fastcall dadandrn_main_read_byte(UINT32 address) static void bankswitch(INT32 data) { z80_bank = data; - ZetMapMemory(DrvZ80ROM + ((data & 0x0f) * 0x4000), 0x8000, 0xbfff, MAP_ROM); + ZetMapMemory(DrvZ80ROM + ((data & 0x0f) * 0x4000), 0x8000, 0xbfff, ZET_ROM); } static void __fastcall mystwarr_sound_write(UINT16 address, UINT8 data) @@ -1986,10 +1986,10 @@ static INT32 MystwarrInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvSpriteRam, 0x400000, 0x40ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x700000, 0x701fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvSpriteRam, 0x400000, 0x40ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x700000, 0x701fff, SM_RAM); SekSetWriteWordHandler(0, mystwarr_main_write_word); SekSetWriteByteHandler(0, mystwarr_main_write_byte); SekSetReadWordHandler(0, mystwarr_main_read_word); @@ -1998,8 +1998,8 @@ static INT32 MystwarrInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, ZET_RAM); ZetSetWriteHandler(mystwarr_sound_write); ZetSetReadHandler(mystwarr_sound_read); ZetClose(); @@ -2096,11 +2096,11 @@ static INT32 MetamrphInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvSpriteRam, 0x211000, 0x21ffff, MAP_RAM); - SekMapMemory((UINT8*)K053250Ram, 0x24c000, 0x24ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x330000, 0x331fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvSpriteRam, 0x211000, 0x21ffff, SM_RAM); + SekMapMemory((UINT8*)K053250Ram, 0x24c000, 0x24ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x330000, 0x331fff, SM_RAM); SekSetWriteWordHandler(0, metamrph_main_write_word); SekSetWriteByteHandler(0, metamrph_main_write_byte); SekSetReadWordHandler(0, metamrph_main_read_word); @@ -2109,8 +2109,8 @@ static INT32 MetamrphInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, ZET_RAM); ZetSetWriteHandler(mystwarr_sound_write); ZetSetReadHandler(mystwarr_sound_read); ZetClose(); @@ -2202,11 +2202,11 @@ static INT32 ViostormInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvSpriteRam, 0x211000, 0x21ffff, MAP_RAM); - SekMapMemory((UINT8*)K053250Ram, 0x24c000, 0x24ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x330000, 0x331fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvSpriteRam, 0x211000, 0x21ffff, SM_RAM); + SekMapMemory((UINT8*)K053250Ram, 0x24c000, 0x24ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x330000, 0x331fff, SM_RAM); SekSetWriteWordHandler(0, metamrph_main_write_word); SekSetWriteByteHandler(0, metamrph_main_write_byte); SekSetReadWordHandler(0, metamrph_main_read_word); @@ -2215,8 +2215,8 @@ static INT32 ViostormInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, ZET_RAM); ZetSetWriteHandler(mystwarr_sound_write); ZetSetReadHandler(mystwarr_sound_read); ZetClose(); @@ -2304,11 +2304,11 @@ static INT32 MartchmpInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM + 0x000000, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(Drv68KROM + 0x100000, 0x300000, 0x3fffff, MAP_ROM); - SekMapMemory(DrvSpriteRam, 0x480000, 0x483fff, MAP_ROM); // should be written through handler - SekMapMemory(DrvPalRAM, 0x600000, 0x601fff, MAP_RAM); + SekMapMemory(Drv68KROM + 0x000000, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(Drv68KROM + 0x100000, 0x300000, 0x3fffff, SM_ROM); + SekMapMemory(DrvSpriteRam, 0x480000, 0x483fff, SM_ROM); // should be written through handler + SekMapMemory(DrvPalRAM, 0x600000, 0x601fff, SM_RAM); SekSetWriteWordHandler(0, martchmp_main_write_word); SekSetWriteByteHandler(0, martchmp_main_write_byte); SekSetReadWordHandler(0, martchmp_main_read_word); @@ -2317,8 +2317,8 @@ static INT32 MartchmpInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, ZET_RAM); ZetSetWriteHandler(mystwarr_sound_write); ZetSetReadHandler(mystwarr_sound_read); ZetClose(); @@ -2458,12 +2458,12 @@ static INT32 GaiapolisInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x2fffff, MAP_ROM); - SekMapMemory(DrvSpriteRam, 0x400000, 0x40ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x420000, 0x421fff, MAP_RAM); - SekMapMemory(DrvK053936Ctrl, 0x460000, 0x46001f, MAP_RAM); - SekMapMemory(DrvK053936RAM, 0x470000, 0x470fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x600000, 0x60ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x2fffff, SM_ROM); + SekMapMemory(DrvSpriteRam, 0x400000, 0x40ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x420000, 0x421fff, SM_RAM); + SekMapMemory(DrvK053936Ctrl, 0x460000, 0x46001f, SM_RAM); + SekMapMemory(DrvK053936RAM, 0x470000, 0x470fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x600000, 0x60ffff, SM_RAM); SekSetWriteWordHandler(0, dadandrn_main_write_word); SekSetWriteByteHandler(0, dadandrn_main_write_byte); SekSetReadWordHandler(0, dadandrn_main_read_word); @@ -2472,8 +2472,8 @@ static INT32 GaiapolisInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, ZET_RAM); ZetSetWriteHandler(mystwarr_sound_write); ZetSetReadHandler(mystwarr_sound_read); ZetClose(); @@ -2616,12 +2616,12 @@ static INT32 DadandrnInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(DrvSpriteRam, 0x400000, 0x40ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x420000, 0x421fff, MAP_RAM); - SekMapMemory(DrvK053936Ctrl, 0x460000, 0x46001f, MAP_RAM); - SekMapMemory(DrvK053936RAM, 0x470000, 0x470fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x600000, 0x60ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(DrvSpriteRam, 0x400000, 0x40ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x420000, 0x421fff, SM_RAM); + SekMapMemory(DrvK053936Ctrl, 0x460000, 0x46001f, SM_RAM); + SekMapMemory(DrvK053936RAM, 0x470000, 0x470fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x600000, 0x60ffff, SM_RAM); SekSetWriteWordHandler(0, dadandrn_main_write_word); SekSetWriteByteHandler(0, dadandrn_main_write_byte); SekSetReadWordHandler(0, dadandrn_main_read_word); @@ -2630,8 +2630,8 @@ static INT32 DadandrnInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, ZET_RAM); ZetSetWriteHandler(mystwarr_sound_write); ZetSetReadHandler(mystwarr_sound_read); ZetClose(); diff --git a/src/burn/drv/konami/d_nemesis.cpp b/src/burn/drv/konami/d_nemesis.cpp index f574a2d3a..65bf1e178 100644 --- a/src/burn/drv/konami/d_nemesis.cpp +++ b/src/burn/drv/konami/d_nemesis.cpp @@ -2142,8 +2142,8 @@ static void NemesisSoundInit(INT32 konamigtmode) { ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x3fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0x4000, 0x47ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x3fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0x4000, 0x47ff, ZET_RAM); ZetSetWriteHandler(nemesis_sound_write); ZetSetReadHandler(nemesis_sound_read); ZetClose(); @@ -2164,9 +2164,9 @@ static void Gx400SoundInit(INT32 rf2mode) { ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x1fff, MAP_ROM); - ZetMapMemory(DrvShareRAM, 0x4000, 0x7fff, MAP_RAM); - ZetMapMemory(DrvVLMROM, 0x8000, 0x87ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x1fff, ZET_ROM); + ZetMapMemory(DrvShareRAM, 0x4000, 0x7fff, ZET_RAM); + ZetMapMemory(DrvVLMROM, 0x8000, 0x87ff, ZET_RAM); ZetSetWriteHandler(nemesis_sound_write); ZetSetReadHandler(nemesis_sound_read); ZetClose(); @@ -2191,9 +2191,9 @@ static void TwinbeeGx400SoundInit() { ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x1fff, MAP_ROM); - ZetMapMemory(DrvShareRAM, 0x4000, 0x7fff, MAP_RAM); - ZetMapMemory(DrvVLMROM, 0x8000, 0x87ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x1fff, ZET_ROM); + ZetMapMemory(DrvShareRAM, 0x4000, 0x7fff, ZET_RAM); + ZetMapMemory(DrvVLMROM, 0x8000, 0x87ff, ZET_RAM); ZetSetWriteHandler(nemesis_sound_write); ZetSetReadHandler(nemesis_sound_read); ZetClose(); @@ -2218,8 +2218,8 @@ static void SalamandSoundInit() { ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0x8000, 0x87ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0x8000, 0x87ff, ZET_RAM); ZetSetWriteHandler(salamand_sound_write); ZetSetReadHandler(salamand_sound_read); ZetClose(); @@ -2244,8 +2244,8 @@ static void CitybombSoundInit() { ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0x8000, 0x87ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0x8000, 0x87ff, ZET_RAM); ZetSetWriteHandler(citybomb_sound_write); ZetSetReadHandler(citybomb_sound_read); ZetClose(); @@ -2293,28 +2293,28 @@ static INT32 NemesisInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvCharRAM, 0x040000, 0x04ffff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x050000, 0x051fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvCharRAM, 0x040000, 0x04ffff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x050000, 0x051fff, SM_RAM); xscroll1 = (UINT16*)(DrvScrollRAM + 0x00000); xscroll2 = (UINT16*)(DrvScrollRAM + 0x00400); yscroll2 = (UINT16*)(DrvScrollRAM + 0x00f00); yscroll1 = (UINT16*)(DrvScrollRAM + 0x00f80); - SekMapMemory(DrvVidRAM0, 0x052000, 0x052fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x053000, 0x053fff, MAP_RAM); - SekMapMemory(DrvColRAM0, 0x054000, 0x054fff, MAP_RAM); - SekMapMemory(DrvColRAM1, 0x055000, 0x055fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x056000, 0x056fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x05a000, 0x05afff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x060000, 0x067fff, MAP_RAM); + SekMapMemory(DrvVidRAM0, 0x052000, 0x052fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x053000, 0x053fff, SM_RAM); + SekMapMemory(DrvColRAM0, 0x054000, 0x054fff, SM_RAM); + SekMapMemory(DrvColRAM1, 0x055000, 0x055fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x056000, 0x056fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x05a000, 0x05afff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x060000, 0x067fff, SM_RAM); SekSetWriteWordHandler(0, nemesis_main_write_word); SekSetWriteByteHandler(0, nemesis_main_write_byte); SekSetReadWordHandler(0, nemesis_main_read_word); SekSetReadByteHandler(0, nemesis_main_read_byte); - SekMapHandler(1, 0x040000, 0x04ffff, MAP_WRITE); + SekMapHandler(1, 0x040000, 0x04ffff, SM_WRITE); SekSetWriteWordHandler(1, nemesis_charram_write_word); SekSetWriteByteHandler(1, nemesis_charram_write_byte); - SekMapHandler(2, 0x05a000, 0x05afff, MAP_WRITE); + SekMapHandler(2, 0x05a000, 0x05afff, SM_WRITE); SekSetWriteWordHandler(2, nemesis_palette_write_word); SekSetWriteByteHandler(2, nemesis_palette_write_byte); SekClose(); @@ -2357,28 +2357,28 @@ static INT32 KonamigtInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvCharRAM, 0x040000, 0x04ffff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x050000, 0x051fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvCharRAM, 0x040000, 0x04ffff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x050000, 0x051fff, SM_RAM); xscroll1 = (UINT16*)(DrvScrollRAM + 0x00000); xscroll2 = (UINT16*)(DrvScrollRAM + 0x00400); yscroll2 = (UINT16*)(DrvScrollRAM + 0x00f00); yscroll1 = (UINT16*)(DrvScrollRAM + 0x00f80); - SekMapMemory(DrvVidRAM0, 0x052000, 0x052fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x053000, 0x053fff, MAP_RAM); - SekMapMemory(DrvColRAM0, 0x054000, 0x054fff, MAP_RAM); - SekMapMemory(DrvColRAM1, 0x055000, 0x055fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x056000, 0x056fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x05a000, 0x05afff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x060000, 0x067fff, MAP_RAM); + SekMapMemory(DrvVidRAM0, 0x052000, 0x052fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x053000, 0x053fff, SM_RAM); + SekMapMemory(DrvColRAM0, 0x054000, 0x054fff, SM_RAM); + SekMapMemory(DrvColRAM1, 0x055000, 0x055fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x056000, 0x056fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x05a000, 0x05afff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x060000, 0x067fff, SM_RAM); SekSetWriteWordHandler(0, nemesis_main_write_word); SekSetWriteByteHandler(0, konamigt_main_write_byte); SekSetReadWordHandler(0, nemesis_main_read_word); SekSetReadByteHandler(0, nemesis_main_read_byte); - SekMapHandler(1, 0x040000, 0x04ffff, MAP_WRITE); + SekMapHandler(1, 0x040000, 0x04ffff, SM_WRITE); SekSetWriteWordHandler(1, nemesis_charram_write_word); SekSetWriteByteHandler(1, nemesis_charram_write_byte); - SekMapHandler(2, 0x05a000, 0x05afff, MAP_WRITE); + SekMapHandler(2, 0x05a000, 0x05afff, SM_WRITE); SekSetWriteWordHandler(2, nemesis_palette_write_word); SekSetWriteByteHandler(2, nemesis_palette_write_byte); SekClose(); @@ -2418,16 +2418,16 @@ static INT32 SalamandInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x080000, 0x087fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x090000, 0x091fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x100000, 0x100fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x101000, 0x101fff, MAP_RAM); - SekMapMemory(DrvColRAM1, 0x102000, 0x102fff, MAP_RAM); - SekMapMemory(DrvColRAM0, 0x103000, 0x103fff, MAP_RAM); - SekMapMemory(DrvCharRAM, 0x120000, 0x12ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x180000, 0x180fff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x190000, 0x191fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x080000, 0x087fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x090000, 0x091fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x100000, 0x100fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x101000, 0x101fff, SM_RAM); + SekMapMemory(DrvColRAM1, 0x102000, 0x102fff, SM_RAM); + SekMapMemory(DrvColRAM0, 0x103000, 0x103fff, SM_RAM); + SekMapMemory(DrvCharRAM, 0x120000, 0x12ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x180000, 0x180fff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x190000, 0x191fff, SM_RAM); xscroll2 = (UINT16*)(DrvScrollRAM + 0x00000); xscroll1 = (UINT16*)(DrvScrollRAM + 0x00400); yscroll1 = (UINT16*)(DrvScrollRAM + 0x00f00); @@ -2436,10 +2436,10 @@ static INT32 SalamandInit() SekSetWriteByteHandler(0, salamand_main_write_byte); SekSetReadWordHandler(0, nemesis_main_read_word); SekSetReadByteHandler(0, salamand_main_read_byte); - SekMapHandler(1, 0x120000, 0x12ffff, MAP_WRITE); + SekMapHandler(1, 0x120000, 0x12ffff, SM_WRITE); SekSetWriteWordHandler(1, nemesis_charram_write_word); SekSetWriteByteHandler(1, nemesis_charram_write_byte); - SekMapHandler(2, 0x090000, 0x091fff, MAP_WRITE); + SekMapHandler(2, 0x090000, 0x091fff, SM_WRITE); SekSetWriteWordHandler(2, nemesis_palette_write_word); SekSetWriteByteHandler(2, nemesis_palette_write_byte); SekClose(); @@ -2477,28 +2477,28 @@ static INT32 BlkpnthrInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x080000, 0x081fff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x090000, 0x097fff, MAP_RAM); - SekMapMemory(DrvColRAM0, 0x100000, 0x100fff, MAP_RAM); - SekMapMemory(DrvColRAM1, 0x101000, 0x101fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x102000, 0x102fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x103000, 0x103fff, MAP_RAM); - SekMapMemory(DrvCharRAM, 0x120000, 0x12ffff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x180000, 0x181fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x080000, 0x081fff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x090000, 0x097fff, SM_RAM); + SekMapMemory(DrvColRAM0, 0x100000, 0x100fff, SM_RAM); + SekMapMemory(DrvColRAM1, 0x101000, 0x101fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x102000, 0x102fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x103000, 0x103fff, SM_RAM); + SekMapMemory(DrvCharRAM, 0x120000, 0x12ffff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x180000, 0x181fff, SM_RAM); xscroll1 = (UINT16*)(DrvScrollRAM + 0x00000); xscroll2 = (UINT16*)(DrvScrollRAM + 0x00400); yscroll2 = (UINT16*)(DrvScrollRAM + 0x00f00); yscroll1 = (UINT16*)(DrvScrollRAM + 0x00f80); - SekMapMemory(DrvSprRAM, 0x190000, 0x190fff, MAP_RAM); + SekMapMemory(DrvSprRAM, 0x190000, 0x190fff, SM_RAM); SekSetWriteWordHandler(0, salamand_main_write_word); SekSetWriteByteHandler(0, salamand_main_write_byte); SekSetReadWordHandler(0, nemesis_main_read_word); SekSetReadByteHandler(0, salamand_main_read_byte); - SekMapHandler(1, 0x120000, 0x12ffff, MAP_WRITE); + SekMapHandler(1, 0x120000, 0x12ffff, SM_WRITE); SekSetWriteWordHandler(1, nemesis_charram_write_word); SekSetWriteByteHandler(1, nemesis_charram_write_byte); - SekMapHandler(2, 0x080000, 0x081fff, MAP_WRITE); + SekMapHandler(2, 0x080000, 0x081fff, SM_WRITE); SekSetWriteWordHandler(2, nemesis_palette_write_word); SekSetWriteByteHandler(2, nemesis_palette_write_byte); SekClose(); @@ -2539,16 +2539,16 @@ static INT32 HcrashInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x080000, 0x087fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x090000, 0x091fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x100000, 0x100fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x101000, 0x101fff, MAP_RAM); - SekMapMemory(DrvColRAM1, 0x102000, 0x102fff, MAP_RAM); - SekMapMemory(DrvColRAM0, 0x103000, 0x103fff, MAP_RAM); - SekMapMemory(DrvCharRAM, 0x120000, 0x12ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x180000, 0x180fff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x190000, 0x191fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x080000, 0x087fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x090000, 0x091fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x100000, 0x100fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x101000, 0x101fff, SM_RAM); + SekMapMemory(DrvColRAM1, 0x102000, 0x102fff, SM_RAM); + SekMapMemory(DrvColRAM0, 0x103000, 0x103fff, SM_RAM); + SekMapMemory(DrvCharRAM, 0x120000, 0x12ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x180000, 0x180fff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x190000, 0x191fff, SM_RAM); xscroll2 = (UINT16*)(DrvScrollRAM + 0x00000); xscroll1 = (UINT16*)(DrvScrollRAM + 0x00400); yscroll1 = (UINT16*)(DrvScrollRAM + 0x00f00); @@ -2557,10 +2557,10 @@ static INT32 HcrashInit() SekSetWriteByteHandler(0, hcrash_main_write_byte); SekSetReadWordHandler(0, nemesis_main_read_word); SekSetReadByteHandler(0, hcrash_main_read_byte); - SekMapHandler(1, 0x120000, 0x12ffff, MAP_WRITE); + SekMapHandler(1, 0x120000, 0x12ffff, SM_WRITE); SekSetWriteWordHandler(1, nemesis_charram_write_word); SekSetWriteByteHandler(1, nemesis_charram_write_byte); - SekMapHandler(2, 0x090000, 0x091fff, MAP_WRITE); + SekMapHandler(2, 0x090000, 0x091fff, SM_WRITE); SekSetWriteWordHandler(2, nemesis_palette_write_word); SekSetWriteByteHandler(2, nemesis_palette_write_byte); SekClose(); @@ -2600,31 +2600,31 @@ static INT32 Gx400Init() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x00ffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x010000, 0x01ffff, MAP_RAM); - SekMapMemory(DrvCharRAM, 0x030000, 0x03ffff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x050000, 0x051fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x00ffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x010000, 0x01ffff, SM_RAM); + SekMapMemory(DrvCharRAM, 0x030000, 0x03ffff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x050000, 0x051fff, SM_RAM); xscroll1 = (UINT16*)(DrvScrollRAM + 0x00000); xscroll2 = (UINT16*)(DrvScrollRAM + 0x00400); yscroll2 = (UINT16*)(DrvScrollRAM + 0x00f00); yscroll1 = (UINT16*)(DrvScrollRAM + 0x00f80); - SekMapMemory(DrvVidRAM0, 0x052000, 0x052fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x053000, 0x053fff, MAP_RAM); - SekMapMemory(DrvColRAM0, 0x054000, 0x054fff, MAP_RAM); - SekMapMemory(DrvColRAM1, 0x055000, 0x055fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x056000, 0x056fff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x057000, 0x057fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x05a000, 0x05afff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x060000, 0x07ffff, MAP_RAM); - SekMapMemory(Drv68KROM + 0x10000, 0x080000, 0x0bffff, MAP_ROM); + SekMapMemory(DrvVidRAM0, 0x052000, 0x052fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x053000, 0x053fff, SM_RAM); + SekMapMemory(DrvColRAM0, 0x054000, 0x054fff, SM_RAM); + SekMapMemory(DrvColRAM1, 0x055000, 0x055fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x056000, 0x056fff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x057000, 0x057fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x05a000, 0x05afff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x060000, 0x07ffff, SM_RAM); + SekMapMemory(Drv68KROM + 0x10000, 0x080000, 0x0bffff, SM_ROM); SekSetWriteWordHandler(0, nemesis_main_write_word); SekSetWriteByteHandler(0, gx400_main_write_byte); SekSetReadWordHandler(0, nemesis_main_read_word); SekSetReadByteHandler(0, gx400_main_read_byte); - SekMapHandler(1, 0x030000, 0x03ffff, MAP_WRITE); + SekMapHandler(1, 0x030000, 0x03ffff, SM_WRITE); SekSetWriteWordHandler(1, nemesis_charram_write_word); SekSetWriteByteHandler(1, nemesis_charram_write_byte); - SekMapHandler(2, 0x05a000, 0x05afff, MAP_WRITE); + SekMapHandler(2, 0x05a000, 0x05afff, SM_WRITE); SekSetWriteWordHandler(2, nemesis_palette_write_word); SekSetWriteByteHandler(2, nemesis_palette_write_byte); SekClose(); @@ -2670,30 +2670,30 @@ static INT32 Rf2_gx400Init() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x00ffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x010000, 0x01ffff, MAP_RAM); - SekMapMemory(DrvCharRAM, 0x030000, 0x03ffff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x050000, 0x051fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x00ffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x010000, 0x01ffff, SM_RAM); + SekMapMemory(DrvCharRAM, 0x030000, 0x03ffff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x050000, 0x051fff, SM_RAM); xscroll1 = (UINT16*)(DrvScrollRAM + 0x00000); xscroll2 = (UINT16*)(DrvScrollRAM + 0x00400); yscroll2 = (UINT16*)(DrvScrollRAM + 0x00f00); yscroll1 = (UINT16*)(DrvScrollRAM + 0x00f80); - SekMapMemory(DrvVidRAM0, 0x052000, 0x052fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x053000, 0x053fff, MAP_RAM); - SekMapMemory(DrvColRAM0, 0x054000, 0x054fff, MAP_RAM); - SekMapMemory(DrvColRAM1, 0x055000, 0x055fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x056000, 0x056fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x05a000, 0x05afff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x060000, 0x067fff, MAP_RAM); - SekMapMemory(Drv68KROM + 0x10000, 0x080000, 0x0bffff, MAP_ROM); + SekMapMemory(DrvVidRAM0, 0x052000, 0x052fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x053000, 0x053fff, SM_RAM); + SekMapMemory(DrvColRAM0, 0x054000, 0x054fff, SM_RAM); + SekMapMemory(DrvColRAM1, 0x055000, 0x055fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x056000, 0x056fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x05a000, 0x05afff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x060000, 0x067fff, SM_RAM); + SekMapMemory(Drv68KROM + 0x10000, 0x080000, 0x0bffff, SM_ROM); SekSetWriteWordHandler(0, nemesis_main_write_word); SekSetWriteByteHandler(0, gx400_main_write_byte); SekSetReadWordHandler(0, nemesis_main_read_word); SekSetReadByteHandler(0, gx400_main_read_byte); - SekMapHandler(1, 0x030000, 0x03ffff, MAP_WRITE); + SekMapHandler(1, 0x030000, 0x03ffff, SM_WRITE); SekSetWriteWordHandler(1, nemesis_charram_write_word); SekSetWriteByteHandler(1, nemesis_charram_write_byte); - SekMapHandler(2, 0x05a000, 0x05afff, MAP_WRITE); + SekMapHandler(2, 0x05a000, 0x05afff, SM_WRITE); SekSetWriteWordHandler(2, nemesis_palette_write_word); SekSetWriteByteHandler(2, nemesis_palette_write_byte); SekClose(); @@ -2735,29 +2735,29 @@ static INT32 CitybombInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x080000, 0x087fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x0e0000, 0x0e1fff, MAP_RAM); - SekMapMemory(Drv68KROM + 0x40000, 0x100000, 0x1bffff, MAP_ROM); - SekMapMemory(DrvCharRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x210000, 0x210fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x211000, 0x211fff, MAP_RAM); - SekMapMemory(DrvColRAM0, 0x212000, 0x212fff, MAP_RAM); - SekMapMemory(DrvColRAM1, 0x213000, 0x213fff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x300000, 0x301fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x080000, 0x087fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x0e0000, 0x0e1fff, SM_RAM); + SekMapMemory(Drv68KROM + 0x40000, 0x100000, 0x1bffff, SM_ROM); + SekMapMemory(DrvCharRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x210000, 0x210fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x211000, 0x211fff, SM_RAM); + SekMapMemory(DrvColRAM0, 0x212000, 0x212fff, SM_RAM); + SekMapMemory(DrvColRAM1, 0x213000, 0x213fff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x300000, 0x301fff, SM_RAM); xscroll1 = (UINT16*)(DrvScrollRAM + 0x00000); xscroll2 = (UINT16*)(DrvScrollRAM + 0x00400); yscroll2 = (UINT16*)(DrvScrollRAM + 0x00f00); yscroll1 = (UINT16*)(DrvScrollRAM + 0x00f80); - SekMapMemory(DrvSprRAM, 0x310000, 0x310fff, MAP_RAM); + SekMapMemory(DrvSprRAM, 0x310000, 0x310fff, SM_RAM); SekSetWriteWordHandler(0, citybomb_main_write_word); SekSetWriteByteHandler(0, citybomb_main_write_byte); SekSetReadWordHandler(0, nemesis_main_read_word); SekSetReadByteHandler(0, citybomb_main_read_byte); - SekMapHandler(2, 0x0e0000, 0x0e1fff, MAP_WRITE); + SekMapHandler(2, 0x0e0000, 0x0e1fff, SM_WRITE); SekSetWriteWordHandler(2, nemesis_palette_write_word); SekSetWriteByteHandler(2, nemesis_palette_write_byte); - SekMapHandler(1, 0x200000, 0x20ffff, MAP_WRITE); + SekMapHandler(1, 0x200000, 0x20ffff, SM_WRITE); SekSetWriteWordHandler(1, nemesis_charram_write_word); SekSetWriteByteHandler(1, nemesis_charram_write_byte); SekClose(); @@ -2795,17 +2795,17 @@ static INT32 NyanpaniInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x040000, 0x047fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x060000, 0x061fff, MAP_RAM); - SekMapMemory(Drv68KROM + 0x40000, 0x100000, 0x13ffff, MAP_ROM); - SekMapMemory(DrvVidRAM0, 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x201000, 0x201fff, MAP_RAM); - SekMapMemory(DrvColRAM0, 0x202000, 0x202fff, MAP_RAM); - SekMapMemory(DrvColRAM1, 0x203000, 0x203fff, MAP_RAM); - SekMapMemory(DrvCharRAM, 0x210000, 0x21ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x300000, 0x300fff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x310000, 0x311fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x040000, 0x047fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x060000, 0x061fff, SM_RAM); + SekMapMemory(Drv68KROM + 0x40000, 0x100000, 0x13ffff, SM_ROM); + SekMapMemory(DrvVidRAM0, 0x200000, 0x200fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x201000, 0x201fff, SM_RAM); + SekMapMemory(DrvColRAM0, 0x202000, 0x202fff, SM_RAM); + SekMapMemory(DrvColRAM1, 0x203000, 0x203fff, SM_RAM); + SekMapMemory(DrvCharRAM, 0x210000, 0x21ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x300000, 0x300fff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x310000, 0x311fff, SM_RAM); xscroll1 = (UINT16*)(DrvScrollRAM + 0x00000); xscroll2 = (UINT16*)(DrvScrollRAM + 0x00400); yscroll2 = (UINT16*)(DrvScrollRAM + 0x00f00); @@ -2814,10 +2814,10 @@ static INT32 NyanpaniInit() SekSetWriteByteHandler(0, citybomb_main_write_byte); SekSetReadWordHandler(0, nemesis_main_read_word); SekSetReadByteHandler(0, citybomb_main_read_byte); - SekMapHandler(2, 0x060000, 0x061fff, MAP_WRITE); + SekMapHandler(2, 0x060000, 0x061fff, SM_WRITE); SekSetWriteWordHandler(2, nemesis_palette_write_word); SekSetWriteByteHandler(2, nemesis_palette_write_byte); - SekMapHandler(1, 0x210000, 0x21ffff, MAP_WRITE); + SekMapHandler(1, 0x210000, 0x21ffff, SM_WRITE); SekSetWriteWordHandler(1, nemesis_charram_write_word); SekSetWriteByteHandler(1, nemesis_charram_write_byte); SekClose(); diff --git a/src/burn/drv/konami/d_parodius.cpp b/src/burn/drv/konami/d_parodius.cpp index c27207625..55f747875 100644 --- a/src/burn/drv/konami/d_parodius.cpp +++ b/src/burn/drv/konami/d_parodius.cpp @@ -326,7 +326,7 @@ static void parodius_set_lines(INT32 lines) { nDrvRomBank[0] = lines; - konamiMapMemory(DrvKonROM + 0x10000 + ((~lines & 0x0f) * 0x4000), 0x6000, 0x9fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + ((~lines & 0x0f) * 0x4000), 0x6000, 0x9fff, KON_ROM); } static INT32 DrvDoReset() @@ -416,9 +416,9 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x0800, 0x1fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x9fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x0a000, 0xa000, 0xffff, MAP_ROM); + konamiMapMemory(DrvKonRAM, 0x0800, 0x1fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x9fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x0a000, 0xa000, 0xffff, KON_ROM); konamiSetWriteHandler(parodius_main_write); konamiSetReadHandler(parodius_main_read); konamiSetlinesCallback(parodius_set_lines); diff --git a/src/burn/drv/konami/d_rockrage.cpp b/src/burn/drv/konami/d_rockrage.cpp index cbd86c645..76adc4877 100644 --- a/src/burn/drv/konami/d_rockrage.cpp +++ b/src/burn/drv/konami/d_rockrage.cpp @@ -147,7 +147,7 @@ STDDIPINFO(Rockrage) static void bankswitch(INT32 bank) { HD6309Bank = bank; - HD6309MapMemory(DrvHD6309ROM + 0x10000 + (((bank & 0x70) >> 4) * 0x2000), 0x6000, 0x7fff, MAP_ROM); + HD6309MapMemory(DrvHD6309ROM + 0x10000 + (((bank & 0x70) >> 4) * 0x2000), 0x6000, 0x7fff, HD6309_ROM); } static void rockrage_main_write(UINT16 address, UINT8 data) @@ -381,20 +381,20 @@ static INT32 DrvInit() HD6309Init(0); HD6309Open(0); - HD6309MapMemory(K007342VidRAM[0], 0x0000, 0x1fff, MAP_RAM); - HD6309MapMemory(K007420RAM[0], 0x2000, 0x21ff, MAP_RAM); - HD6309MapMemory(K007342ScrRAM[0], 0x2200, 0x23ff, MAP_RAM); - HD6309MapMemory(DrvPalRAM, 0x2400, 0x24ff, MAP_RAM); - HD6309MapMemory(DrvHD6309RAM, 0x4000, 0x5fff, MAP_RAM); - HD6309MapMemory(DrvHD6309ROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(K007342VidRAM[0], 0x0000, 0x1fff, HD6309_RAM); + HD6309MapMemory(K007420RAM[0], 0x2000, 0x21ff, HD6309_RAM); + HD6309MapMemory(K007342ScrRAM[0], 0x2200, 0x23ff, HD6309_RAM); + HD6309MapMemory(DrvPalRAM, 0x2400, 0x24ff, HD6309_RAM); + HD6309MapMemory(DrvHD6309RAM, 0x4000, 0x5fff, HD6309_RAM); + HD6309MapMemory(DrvHD6309ROM + 0x08000, 0x8000, 0xffff, HD6309_ROM); HD6309SetWriteHandler(rockrage_main_write); HD6309SetReadHandler(rockrage_main_read); HD6309Close(); M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x7000, 0x77ff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM, 0x7000, 0x77ff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(rockrage_sound_write); M6809SetReadHandler(rockrage_sound_read); M6809Close(); diff --git a/src/burn/drv/konami/d_rocnrope.cpp b/src/burn/drv/konami/d_rocnrope.cpp index e876dc5d9..5f7e12241 100644 --- a/src/burn/drv/konami/d_rocnrope.cpp +++ b/src/burn/drv/konami/d_rocnrope.cpp @@ -369,12 +369,12 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvSprRAM, 0x4000, 0x47ff, MAP_RAM); - M6809MapMemory(DrvColRAM, 0x4800, 0x4bff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x4c00, 0x4fff, MAP_RAM); - M6809MapMemory(DrvM6809RAM, 0x5000, 0x5fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x6000, 0x6000, 0xffff, MAP_READ); - M6809MapMemory(DrvM6809ROMDec + 0x6000, 0x6000, 0xffff, MAP_FETCH); + M6809MapMemory(DrvSprRAM, 0x4000, 0x47ff, M6809_RAM); + M6809MapMemory(DrvColRAM, 0x4800, 0x4bff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x4c00, 0x4fff, M6809_RAM); + M6809MapMemory(DrvM6809RAM, 0x5000, 0x5fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x6000, 0x6000, 0xffff, M6809_READ); + M6809MapMemory(DrvM6809ROMDec + 0x6000, 0x6000, 0xffff, M6809_FETCH); M6809SetWriteHandler(rocnrope_write); M6809SetReadHandler(rocnrope_read); M6809Close(); diff --git a/src/burn/drv/konami/d_rollerg.cpp b/src/burn/drv/konami/d_rollerg.cpp index 1c7e625bf..102bf9aa4 100644 --- a/src/burn/drv/konami/d_rollerg.cpp +++ b/src/burn/drv/konami/d_rollerg.cpp @@ -159,6 +159,7 @@ void rollerg_main_write(UINT16 address, UINT8 data) case 0x0040: ZetSetVector(0xff); + // ZetRaiseIrq(0); ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -278,7 +279,7 @@ static void rollerg_set_lines(INT32 lines) INT32 offs = 0x10000 + ((lines & 0x07) * 0x4000); - konamiMapMemory(DrvKonROM + offs, 0x4000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + offs, 0x4000, 0x7fff, KON_ROM); } static void K053245Callback(INT32 *, INT32 *color, INT32 *priority) @@ -384,10 +385,10 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvPalRAM, 0x1800, 0x1fff, MAP_RAM); - konamiMapMemory(DrvKonRAM, 0x2000, 0x3aff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x4000, 0x4000, 0x7fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x8000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvPalRAM, 0x1800, 0x1fff, KON_RAM); + konamiMapMemory(DrvKonRAM, 0x2000, 0x3aff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x4000, 0x4000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x8000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(rollerg_main_write); konamiSetReadHandler(rollerg_main_read); konamiSetlinesCallback(rollerg_set_lines); diff --git a/src/burn/drv/konami/d_scotrsht.cpp b/src/burn/drv/konami/d_scotrsht.cpp index 7e7e0e4b2..4636b6797 100644 --- a/src/burn/drv/konami/d_scotrsht.cpp +++ b/src/burn/drv/konami/d_scotrsht.cpp @@ -373,10 +373,10 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvColRAM, 0x0000, 0x07ff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x0800, 0x0fff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x1000, 0x1fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x04000, 0x4000, 0xffff, MAP_ROM); + M6809MapMemory(DrvColRAM, 0x0000, 0x07ff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x0800, 0x0fff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x1000, 0x1fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x04000, 0x4000, 0xffff, M6809_ROM); M6809SetWriteHandler(scotrsht_main_write); M6809SetReadHandler(scotrsht_main_read); M6809Close(); diff --git a/src/burn/drv/konami/d_shaolins.cpp b/src/burn/drv/konami/d_shaolins.cpp index 55d50fca9..1d36541a0 100644 --- a/src/burn/drv/konami/d_shaolins.cpp +++ b/src/burn/drv/konami/d_shaolins.cpp @@ -350,12 +350,12 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x2800, 0x30ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x3100, 0x33ff, MAP_RAM); - M6809MapMemory(DrvColRAM, 0x3800, 0x3bff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x3c00, 0x3fff, MAP_RAM); + M6809MapMemory(DrvM6809RAM, 0x2800, 0x30ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x3100, 0x33ff, M6809_RAM); + M6809MapMemory(DrvColRAM, 0x3800, 0x3bff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x3c00, 0x3fff, M6809_RAM); - M6809MapMemory(DrvM6809ROM, 0x4000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809ROM, 0x4000, 0xffff, M6809_ROM); M6809SetWriteHandler(shaolins_write); M6809SetReadHandler(shaolins_read); M6809Close(); diff --git a/src/burn/drv/konami/d_simpsons.cpp b/src/burn/drv/konami/d_simpsons.cpp index dd974db3d..6dc06942a 100644 --- a/src/burn/drv/konami/d_simpsons.cpp +++ b/src/burn/drv/konami/d_simpsons.cpp @@ -316,7 +316,7 @@ static void simpsons_set_lines(INT32 lines) INT32 nBank = (lines & 0x3f) * 0x2000; - konamiMapMemory(DrvKonROM + 0x10000 + nBank, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + nBank, 0x6000, 0x7fff, KON_ROM); } static void K052109Callback(INT32 layer, INT32 bank, INT32 *code, INT32 *color, INT32 *, INT32 *) @@ -457,9 +457,9 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x4000, 0x5fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvKonRAM, 0x4000, 0x5fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(simpsons_main_write); konamiSetReadHandler(simpsons_main_read); konamiSetlinesCallback(simpsons_set_lines); diff --git a/src/burn/drv/konami/d_spy.cpp b/src/burn/drv/konami/d_spy.cpp index 5193f65f5..332f9b1d7 100644 --- a/src/burn/drv/konami/d_spy.cpp +++ b/src/burn/drv/konami/d_spy.cpp @@ -160,17 +160,17 @@ static void DrvSetRAMBank(UINT8 bank, UINT8 data) nDrvRomBank[2] = data; if (data & 0x10) { - M6809MapMemory(DrvPalRAM, 0x0000, 0x07ff, MAP_RAM); + M6809MapMemory(DrvPalRAM, 0x0000, 0x07ff, M6809_RAM); } else if (data & 0x20) { if (bank & 0x80) { - M6809MapMemory(DrvPMCRAM, 0x0000, 0x07ff, MAP_RAM); + M6809MapMemory(DrvPMCRAM, 0x0000, 0x07ff, M6809_RAM); } else { // unmap - M6809MapMemory(DrvM6809ROM + 0x800, 0x0000, 0x07ff, MAP_ROM); - M6809MapMemory(DrvM6809ROM + 0x000, 0x0000, 0x07ff, MAP_WRITE); + M6809MapMemory(DrvM6809ROM + 0x800, 0x0000, 0x07ff, M6809_ROM); + M6809MapMemory(DrvM6809ROM + 0x000, 0x0000, 0x07ff, M6809_WRITE); } } else { - M6809MapMemory(DrvBankRAM, 0x0000, 0x07ff, MAP_RAM); + M6809MapMemory(DrvBankRAM, 0x0000, 0x07ff, M6809_RAM); } } @@ -276,7 +276,7 @@ static void bankswitch(INT32 data) nBank = 0x10000 + (data & 0x0e) * 0x1000; } - M6809MapMemory(DrvM6809ROM + nBank, 0x6000, 0x7fff, MAP_ROM); + M6809MapMemory(DrvM6809ROM + nBank, 0x6000, 0x7fff, M6809_ROM); } void spy_main_write(UINT16 address, UINT8 data) @@ -536,9 +536,9 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x0800, 0x1aff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); - M6809MapMemory(DrvM6809ROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM, 0x0800, 0x1aff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x10000, 0x6000, 0x7fff, M6809_ROM); + M6809MapMemory(DrvM6809ROM + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(spy_main_write); M6809SetReadHandler(spy_main_read); M6809Close(); diff --git a/src/burn/drv/konami/d_surpratk.cpp b/src/burn/drv/konami/d_surpratk.cpp index fcb4bd4e6..f1a89b654 100644 --- a/src/burn/drv/konami/d_surpratk.cpp +++ b/src/burn/drv/konami/d_surpratk.cpp @@ -264,7 +264,7 @@ static void K053245Callback(INT32 *code, INT32 *color, INT32 *priority) static void supratk_set_lines(INT32 lines) { nDrvRomBank[0] = lines; - konamiMapMemory(DrvKonROM + 0x10000 + ((lines & 0x1f) * 0x2000), 0x2000, 0x3fff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + ((lines & 0x1f) * 0x2000), 0x2000, 0x3fff, KON_ROM); } static void DrvYM2151IRQHandler(INT32 nStatus) @@ -346,9 +346,9 @@ static INT32 DrvInit() konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x0800, 0x1fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x2000, 0x3fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvKonRAM, 0x0800, 0x1fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x2000, 0x3fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(supratk_write); konamiSetReadHandler(supratk_read); konamiSetlinesCallback(supratk_set_lines); diff --git a/src/burn/drv/konami/d_thunderx.cpp b/src/burn/drv/konami/d_thunderx.cpp index 2cea64b5b..85e31308f 100644 --- a/src/burn/drv/konami/d_thunderx.cpp +++ b/src/burn/drv/konami/d_thunderx.cpp @@ -326,14 +326,14 @@ static void scontra_bankswitch(INT32 data) layer_priority = data & 0x80; if (~data & 0x10) { - konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, KON_RAM); } else { - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); } INT32 nBank = 0x10000 + (data & 0x0f) * 0x2000; - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); } static void thunderx_videobank(INT32 data) @@ -342,15 +342,15 @@ static void thunderx_videobank(INT32 data) layer_priority = data & 0x08; if (data & 0x01) { - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); } else if (data & 0x10) { if (thunderx_1f98_data & 2) { - konamiMapMemory(pmcram + 0x800, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(pmcram + 0x800, 0x5800, 0x5fff, KON_RAM); } else { - konamiMapMemory(pmcram, 0x5800, 0x5fff, MAP_RAM); // junk? + konamiMapMemory(pmcram, 0x5800, 0x5fff, KON_RAM); // junk? } } else { - konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, MAP_RAM); + konamiMapMemory(DrvPalRAM, 0x5800, 0x5fff, KON_RAM); } } @@ -505,7 +505,7 @@ static void thunderx_set_lines(INT32 lines) INT32 nBank = 0x10000 + (((lines & 0x0f) ^ 0x08) * 0x2000); if (nBank >= 0x28000) nBank -= 0x20000; - konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, MAP_ROM); + konamiMapMemory(DrvKonROM + nBank, 0x6000, 0x7fff, KON_ROM); } static INT32 DrvDoReset() @@ -658,10 +658,10 @@ static INT32 DrvInit(INT32 type) konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, MAP_RAM); - konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvKonRAM, 0x4000, 0x57ff, KON_RAM); + konamiMapMemory(DrvBankRAM, 0x5800, 0x5fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(scontra_main_write); konamiSetReadHandler(scontra_main_read); konamiSetlinesCallback(thunderx_set_lines); diff --git a/src/burn/drv/konami/d_timeplt.cpp b/src/burn/drv/konami/d_timeplt.cpp index 8efd4239b..544c07892 100644 --- a/src/burn/drv/konami/d_timeplt.cpp +++ b/src/burn/drv/konami/d_timeplt.cpp @@ -515,29 +515,29 @@ static INT32 DrvInit(INT32 game) ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM0, 0x0000, 0x5fff, MAP_ROM); + ZetMapMemory(DrvZ80ROM0, 0x0000, 0x5fff, ZET_ROM); if (game_select >= 3) { - ZetMapMemory(DrvZ80RAM0 + 0x0800,0x6000, 0x67ff, MAP_RAM); + ZetMapMemory(DrvZ80RAM0 + 0x0800,0x6000, 0x67ff, ZET_RAM); } - ZetMapMemory(DrvColRAM, 0xa000, 0xa3ff, MAP_RAM); - ZetMapMemory(DrvVidRAM, 0xa400, 0xa7ff, MAP_RAM); - ZetMapMemory(DrvZ80RAM0, 0xa800, 0xafff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb000, 0xb0ff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb100, 0xb1ff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb200, 0xb2ff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb300, 0xb3ff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xb400, 0xb4ff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xb500, 0xb5ff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xb600, 0xb6ff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xb700, 0xb7ff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb800, 0xb8ff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xb900, 0xb9ff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xba00, 0xbaff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0000,0xbb00, 0xbbff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xbc00, 0xbcff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xbd00, 0xbdff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xbe00, 0xbeff, MAP_RAM); - ZetMapMemory(DrvSprRAM + 0x0100,0xbf00, 0xbfff, MAP_RAM); + ZetMapMemory(DrvColRAM, 0xa000, 0xa3ff, ZET_RAM); + ZetMapMemory(DrvVidRAM, 0xa400, 0xa7ff, ZET_RAM); + ZetMapMemory(DrvZ80RAM0, 0xa800, 0xafff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb000, 0xb0ff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb100, 0xb1ff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb200, 0xb2ff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb300, 0xb3ff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xb400, 0xb4ff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xb500, 0xb5ff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xb600, 0xb6ff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xb700, 0xb7ff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb800, 0xb8ff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xb900, 0xb9ff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xba00, 0xbaff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0000,0xbb00, 0xbbff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xbc00, 0xbcff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xbd00, 0xbdff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xbe00, 0xbeff, ZET_RAM); + ZetMapMemory(DrvSprRAM + 0x0100,0xbf00, 0xbfff, ZET_RAM); ZetSetWriteHandler(timeplt_main_write); ZetSetReadHandler(timeplt_main_read); ZetClose(); diff --git a/src/burn/drv/konami/d_tmnt.cpp b/src/burn/drv/konami/d_tmnt.cpp index 2c90a731e..e9d8cff9b 100644 --- a/src/burn/drv/konami/d_tmnt.cpp +++ b/src/burn/drv/konami/d_tmnt.cpp @@ -4471,9 +4471,9 @@ static INT32 TmntInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x060000, 0x063fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x080000, 0x080fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x060000, 0x063fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x080000, 0x080fff, SM_RAM); SekSetReadWordHandler(0, Tmnt68KReadWord); SekSetWriteWordHandler(0, Tmnt68KWriteWord); SekSetReadByteHandler(0, Tmnt68KReadByte); @@ -4570,10 +4570,10 @@ static INT32 MiaInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRam + 0x0000 , 0x040000, 0x043fff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x4000 , 0x060000, 0x063fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x080000, 0x080fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRam + 0x0000 , 0x040000, 0x043fff, SM_RAM); + SekMapMemory(Drv68KRam + 0x4000 , 0x060000, 0x063fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x080000, 0x080fff, SM_RAM); SekSetReadWordHandler(0, Mia68KReadWord); SekSetWriteWordHandler(0, Mia68KWriteWord); SekSetReadByteHandler(0, Mia68KReadByte); @@ -4654,9 +4654,9 @@ static INT32 CuebrickInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(Drv68KRam + 0x0000 , 0x040000, 0x043fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x080000, 0x080fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(Drv68KRam + 0x0000 , 0x040000, 0x043fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x080000, 0x080fff, SM_RAM); SekSetReadWordHandler(0, Cuebrick68KReadWord); SekSetWriteWordHandler(0, Cuebrick68KWriteWord); SekSetReadByteHandler(0, Cuebrick68KReadByte); @@ -4729,9 +4729,9 @@ static INT32 BlswhstlInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x204000, 0x207fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x400000, 0x400fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x204000, 0x207fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x400000, 0x400fff, SM_RAM); SekSetReadWordHandler(0, Blswhstl68KReadWord); SekSetWriteWordHandler(0, Blswhstl68KWriteWord); SekSetReadByteHandler(0, Blswhstl68KReadByte); @@ -4816,9 +4816,9 @@ static INT32 SsridersInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x0bffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x104000, 0x107fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x140fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x0bffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x104000, 0x107fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x140fff, SM_RAM); SekSetReadWordHandler(0, Ssriders68KReadWord); SekSetWriteWordHandler(0, Ssriders68KWriteWord); SekSetReadByteHandler(0, Ssriders68KReadByte); @@ -4901,9 +4901,9 @@ static INT32 Thndrx2Init() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x200000, 0x200fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x200000, 0x200fff, SM_RAM); SekSetWriteWordHandler(0, Thndrx268KWriteWord); SekSetReadByteHandler(0, Thndrx268KReadByte); SekSetWriteByteHandler(0, Thndrx268KWriteByte); @@ -4985,9 +4985,9 @@ static INT32 LgtnfghtInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPaletteRam , 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(Drv68KRam , 0x090000, 0x093fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPaletteRam , 0x080000, 0x080fff, SM_RAM); + SekMapMemory(Drv68KRam , 0x090000, 0x093fff, SM_RAM); SekSetReadWordHandler(0, Lgtnfght68KReadWord); SekSetWriteWordHandler(0, Lgtnfght68KWriteWord); SekSetReadByteHandler(0, Lgtnfght68KReadByte); @@ -5074,15 +5074,15 @@ static INT32 Tmnt2Init() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x104000, 0x107fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x140fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x104000, 0x107fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x140fff, SM_RAM); SekSetReadWordHandler(0, Ssriders68KReadWord); SekSetWriteWordHandler(0, Ssriders68KWriteWord); SekSetReadByteHandler(0, Ssriders68KReadByte); SekSetWriteByteHandler(0, Ssriders68KWriteByte); - SekMapHandler(1, 0x1c0800, 0x1c081f, MAP_WRITE); + SekMapHandler(1, 0x1c0800, 0x1c081f, SM_WRITE); SekSetWriteWordHandler(1, Tmnt268KProtWord); SekSetWriteByteHandler(1, Tmnt268KProtByte); SekClose(); @@ -5165,15 +5165,15 @@ static INT32 QgakumonInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x104000, 0x107fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x140fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x104000, 0x107fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x140fff, SM_RAM); SekSetReadWordHandler(0, Ssriders68KReadWord); SekSetWriteWordHandler(0, Ssriders68KWriteWord); SekSetReadByteHandler(0, Ssriders68KReadByte); SekSetWriteByteHandler(0, Ssriders68KWriteByte); - SekMapHandler(1, 0x1c0800, 0x1c081f, MAP_WRITE); + SekMapHandler(1, 0x1c0800, 0x1c081f, SM_WRITE); SekSetWriteWordHandler(1, Tmnt268KProtWord); SekSetWriteByteHandler(1, Tmnt268KProtByte); SekClose(); @@ -5254,9 +5254,9 @@ static INT32 PunkshotInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x080000, 0x083fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x090000, 0x090fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x080000, 0x083fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x090000, 0x090fff, SM_RAM); SekSetReadWordHandler(0, Punkshot68KReadWord); SekSetWriteWordHandler(0, Punkshot68KWriteWord); SekSetReadByteHandler(0, Punkshot68KReadByte); diff --git a/src/burn/drv/konami/d_tutankhm.cpp b/src/burn/drv/konami/d_tutankhm.cpp index 9ca0ddfea..281846f69 100644 --- a/src/burn/drv/konami/d_tutankhm.cpp +++ b/src/burn/drv/konami/d_tutankhm.cpp @@ -145,7 +145,7 @@ static void bankswitch(INT32 data) INT32 bank = 0x10000 + (data & 0x0f) * 0x1000; - M6809MapMemory(DrvM6809ROM + bank, 0x9000, 0x9fff, MAP_ROM); + M6809MapMemory(DrvM6809ROM + bank, 0x9000, 0x9fff, M6809_ROM); } static void tutankhm_write(UINT16 address, UINT8 data) @@ -316,9 +316,9 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvVidRAM, 0x0000, 0x7fff, MAP_RAM); - M6809MapMemory(DrvM6809RAM, 0x8800, 0x8fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0xa000, 0xa000, 0xffff, MAP_ROM); + M6809MapMemory(DrvVidRAM, 0x0000, 0x7fff, M6809_RAM); + M6809MapMemory(DrvM6809RAM, 0x8800, 0x8fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0xa000, 0xa000, 0xffff, M6809_ROM); M6809SetWriteHandler(tutankhm_write); M6809SetReadHandler(tutankhm_read); M6809Close(); diff --git a/src/burn/drv/konami/d_twin16.cpp b/src/burn/drv/konami/d_twin16.cpp index 7bbe843e3..566b60934 100644 --- a/src/burn/drv/konami/d_twin16.cpp +++ b/src/burn/drv/konami/d_twin16.cpp @@ -608,7 +608,7 @@ static void twin16_CPUB_register_w(INT32 data) } INT32 offset = (twin16_CPUB_register & 4) << 17; - SekMapMemory(DrvGfxROM1 + 0x100000 + offset, 0x700000, 0x77ffff, MAP_ROM); + SekMapMemory(DrvGfxROM1 + 0x100000 + offset, 0x700000, 0x77ffff, SM_ROM); } } @@ -659,7 +659,7 @@ void __fastcall twin16_main_write_byte(UINT32 address, UINT8 data) { *DrvNvRAMBank = data & 0x1f; int offset = data & 0x1f; - SekMapMemory(DrvNvRAM + offset * 0x400, 0x0b0000, 0x0b03ff, MAP_RAM); + SekMapMemory(DrvNvRAM + offset * 0x400, 0x0b0000, 0x0b03ff, SM_RAM); } return; @@ -975,15 +975,15 @@ static INT32 DrvInit(INT32 (pLoadCallback)()) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM0, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvShareRAM, 0x040000, 0x04ffff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x060000, 0x063fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(DrvNvRAM, 0x0b0000, 0x0b03ff, MAP_RAM); - SekMapMemory(DrvVidRAM2, 0x100000, 0x105fff, MAP_RAM); - SekMapMemory(DrvVidRAM, 0x120000, 0x123fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x140000, 0x143fff, MAP_RAM); - SekMapMemory(DrvGfxROM1, 0x500000, 0x6fffff, MAP_ROM); + SekMapMemory(Drv68KROM0, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvShareRAM, 0x040000, 0x04ffff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x060000, 0x063fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x080000, 0x080fff, SM_RAM); + SekMapMemory(DrvNvRAM, 0x0b0000, 0x0b03ff, SM_RAM); + SekMapMemory(DrvVidRAM2, 0x100000, 0x105fff, SM_RAM); + SekMapMemory(DrvVidRAM, 0x120000, 0x123fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x140000, 0x143fff, SM_RAM); + SekMapMemory(DrvGfxROM1, 0x500000, 0x6fffff, SM_ROM); SekSetWriteWordHandler(0, twin16_main_write_word); SekSetWriteByteHandler(0, twin16_main_write_byte); SekSetReadWordHandler(0, twin16_main_read_word); @@ -992,16 +992,16 @@ static INT32 DrvInit(INT32 (pLoadCallback)()) SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Drv68KROM1, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvShareRAM, 0x040000, 0x04ffff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x060000, 0x063fff, MAP_RAM); - SekMapMemory(DrvGfxROM2, 0x080000, 0x09ffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(DrvVidRAM, 0x480000, 0x483fff, MAP_RAM); - SekMapMemory(DrvTileRAM, 0x500000, 0x53ffff, MAP_ROM); - SekMapMemory(DrvGfxROM1, 0x600000, 0x6fffff, MAP_ROM); - SekMapMemory(DrvGfxROM1 + 0x100000, 0x700000, 0x77ffff, MAP_ROM); - SekMapMemory(DrvSprGfxRAM, 0x780000, 0x79ffff, MAP_RAM); + SekMapMemory(Drv68KROM1, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvShareRAM, 0x040000, 0x04ffff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x060000, 0x063fff, SM_RAM); + SekMapMemory(DrvGfxROM2, 0x080000, 0x09ffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x400000, 0x403fff, SM_RAM); + SekMapMemory(DrvVidRAM, 0x480000, 0x483fff, SM_RAM); + SekMapMemory(DrvTileRAM, 0x500000, 0x53ffff, SM_ROM); + SekMapMemory(DrvGfxROM1, 0x600000, 0x6fffff, SM_ROM); + SekMapMemory(DrvGfxROM1 + 0x100000, 0x700000, 0x77ffff, SM_ROM); + SekMapMemory(DrvSprGfxRAM, 0x780000, 0x79ffff, SM_RAM); SekSetWriteWordHandler(0, twin16_sub_write_word); SekSetWriteByteHandler(0, twin16_sub_write_byte); SekClose(); @@ -1516,12 +1516,12 @@ static INT32 DrvScan(INT32 nAction,INT32 *pnMin) } SekOpen(0); - SekMapMemory(DrvNvRAM + (*DrvNvRAMBank * 0x400), 0x0b0000, 0x0b03ff, MAP_RAM); + SekMapMemory(DrvNvRAM + (*DrvNvRAMBank * 0x400), 0x0b0000, 0x0b03ff, SM_RAM); SekClose(); SekOpen(1); INT32 offset = (twin16_CPUB_register & 4) << 17; - SekMapMemory(DrvGfxROM1 + 0x100000 + offset, 0x700000, 0x77ffff, MAP_ROM); + SekMapMemory(DrvGfxROM1 + 0x100000 + offset, 0x700000, 0x77ffff, SM_ROM); SekClose(); } diff --git a/src/burn/drv/konami/d_ultraman.cpp b/src/burn/drv/konami/d_ultraman.cpp index eaba18efa..358d5a361 100644 --- a/src/burn/drv/konami/d_ultraman.cpp +++ b/src/burn/drv/konami/d_ultraman.cpp @@ -446,9 +446,9 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x08ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x180000, 0x183fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x08ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x180000, 0x183fff, SM_RAM); SekSetWriteByteHandler(0, ultraman_write_byte); SekSetReadByteHandler(0, ultraman_read_byte); SekClose(); diff --git a/src/burn/drv/konami/d_vendetta.cpp b/src/burn/drv/konami/d_vendetta.cpp index fa25ea27a..e127cee2d 100644 --- a/src/burn/drv/konami/d_vendetta.cpp +++ b/src/burn/drv/konami/d_vendetta.cpp @@ -499,7 +499,7 @@ static void vendetta_set_lines(INT32 lines) nDrvBank[0] = lines; if (lines < 0x1c) { - konamiMapMemory(DrvKonROM + 0x10000 + (lines * 0x2000), 0x0000 | bankoffset, 0x1fff | bankoffset, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x10000 + (lines * 0x2000), 0x0000 | bankoffset, 0x1fff | bankoffset, KON_ROM); } } @@ -644,9 +644,9 @@ static INT32 DrvInit(INT32 nGame) konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonRAM, 0x0000, 0x1fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, MAP_ROM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvKonRAM, 0x0000, 0x1fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x10000, 0x6000, 0x7fff, KON_ROM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(esckids_main_write); konamiSetReadHandler(esckids_main_read); konamiSetlinesCallback(vendetta_set_lines); @@ -665,9 +665,9 @@ static INT32 DrvInit(INT32 nGame) konamiInit(0); konamiOpen(0); - konamiMapMemory(DrvKonROM + 0x10000, 0x0000, 0x1fff, MAP_ROM); - konamiMapMemory(DrvKonRAM, 0x2000, 0x3fff, MAP_RAM); - konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + konamiMapMemory(DrvKonROM + 0x10000, 0x0000, 0x1fff, KON_ROM); + konamiMapMemory(DrvKonRAM, 0x2000, 0x3fff, KON_RAM); + konamiMapMemory(DrvKonROM + 0x08000, 0x8000, 0xffff, KON_ROM); konamiSetWriteHandler(vendetta_main_write); konamiSetReadHandler(vendetta_main_read); konamiSetlinesCallback(vendetta_set_lines); diff --git a/src/burn/drv/konami/d_xexex.cpp b/src/burn/drv/konami/d_xexex.cpp index 59e3f9827..8c59ca51f 100644 --- a/src/burn/drv/konami/d_xexex.cpp +++ b/src/burn/drv/konami/d_xexex.cpp @@ -339,7 +339,7 @@ static UINT8 _fastcall xexex_main_read_byte(UINT32 address) static void bankswitch(INT32 data) { z80_bank = data; - ZetMapMemory(DrvZ80ROM + ((data & 0x07) * 0x4000), 0x8000, 0xbfff, MAP_ROM); + ZetMapMemory(DrvZ80ROM + ((data & 0x07) * 0x4000), 0x8000, 0xbfff, ZET_ROM); } static void __fastcall xexex_sound_write(UINT16 address, UINT8 data) @@ -556,13 +556,13 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x08ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x090000, 0x097fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x098000, 0x09ffff, MAP_RAM); - SekMapMemory((UINT8*)K053250Ram, 0x0c6000, 0x0c7fff, MAP_RAM); - SekMapMemory(Drv68KROM + 0x080000, 0x100000, 0x17ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x1b0000, 0x1b1fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x08ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x090000, 0x097fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x098000, 0x09ffff, SM_RAM); + SekMapMemory((UINT8*)K053250Ram, 0x0c6000, 0x0c7fff, SM_RAM); + SekMapMemory(Drv68KROM + 0x080000, 0x100000, 0x17ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x1b0000, 0x1b1fff, SM_RAM); SekSetWriteWordHandler(0, xexex_main_write_word); SekSetWriteByteHandler(0, xexex_main_write_byte); SekSetReadWordHandler(0, xexex_main_read_word); @@ -571,8 +571,8 @@ static INT32 DrvInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, ZET_RAM); ZetSetWriteHandler(xexex_sound_write); ZetSetReadHandler(xexex_sound_read); ZetClose(); diff --git a/src/burn/drv/konami/d_xmen.cpp b/src/burn/drv/konami/d_xmen.cpp index ad8e054cf..dd09153f9 100644 --- a/src/burn/drv/konami/d_xmen.cpp +++ b/src/burn/drv/konami/d_xmen.cpp @@ -428,10 +428,10 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM + 0x00000, 0x101000, 0x101fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x104000, 0x104fff, MAP_RAM); - SekMapMemory(Drv68KRAM + 0x01000, 0x110000, 0x113fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM + 0x00000, 0x101000, 0x101fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x104000, 0x104fff, SM_RAM); + SekMapMemory(Drv68KRAM + 0x01000, 0x110000, 0x113fff, SM_RAM); SekSetWriteByteHandler(0, xmen_main_write_byte); SekSetWriteWordHandler(0, xmen_main_write_word); SekSetReadByteHandler(0, xmen_main_read_byte); diff --git a/src/burn/drv/konami/d_yiear.cpp b/src/burn/drv/konami/d_yiear.cpp index ab73197ba..4701f98e2 100644 --- a/src/burn/drv/konami/d_yiear.cpp +++ b/src/burn/drv/konami/d_yiear.cpp @@ -333,9 +333,9 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x5000, 0x57ff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x5800, 0x5fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM, 0x5000, 0x57ff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x5800, 0x5fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(yiear_write); M6809SetReadHandler(yiear_read); M6809Close(); diff --git a/src/burn/drv/megadrive/megadrive.cpp b/src/burn/drv/megadrive/megadrive.cpp index c8d97c70d..dbcbb7f47 100644 --- a/src/burn/drv/megadrive/megadrive.cpp +++ b/src/burn/drv/megadrive/megadrive.cpp @@ -2183,7 +2183,7 @@ static void SetupCustomCartridgeMappers() { if (((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_CM_JCART) || ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_CM_JCART_SEPROM)) { SekOpen(0); - SekMapHandler(7, 0x38fffe, 0x38ffff, MAP_READ | MAP_WRITE); + SekMapHandler(7, 0x38fffe, 0x38ffff, SM_READ | SM_WRITE); SekSetReadByteHandler(7, JCartCtrlReadByte); SekSetReadWordHandler(7, JCartCtrlReadWord); SekSetWriteByteHandler(7, JCartCtrlWriteByte); @@ -2200,7 +2200,7 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x000000, OriginalRom + 0x000000, 0x400000); SekOpen(0); - SekMapHandler(7, 0xa130f0, 0xa130ff, MAP_WRITE); + SekMapHandler(7, 0xa130f0, 0xa130ff, SM_WRITE); SekSetWriteByteHandler(7, Ssf2BankWriteByte); SekClose(); } @@ -2219,12 +2219,12 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x200000, OriginalRom + 0x000000, 0x200000); SekOpen(0); - SekMapHandler(7, 0x600000, 0x6fffff, MAP_READ | MAP_WRITE); + SekMapHandler(7, 0x600000, 0x6fffff, SM_READ | SM_WRITE); SekSetReadByteHandler(7, LK3AltProtReadByte); SekSetReadWordHandler(7, LK3AltProtReadWord); SekSetWriteByteHandler(7, LK3AltProtWriteByte); SekSetWriteWordHandler(7, LK3AltProtWriteWord); - SekMapHandler(8, 0x700000, 0x7fffff, MAP_WRITE); + SekMapHandler(8, 0x700000, 0x7fffff, SM_WRITE); SekSetWriteByteHandler(8, LK3AltBankWriteByte); SekSetWriteWordHandler(8, LK3AltBankWriteWord); SekClose(); @@ -2241,12 +2241,12 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x300000, OriginalRom + 0x000000, 0x100000); SekOpen(0); - SekMapHandler(7, 0x600000, 0x6fffff, MAP_READ | MAP_WRITE); + SekMapHandler(7, 0x600000, 0x6fffff, SM_READ | SM_WRITE); SekSetReadByteHandler(7, LK3AltProtReadByte); SekSetReadWordHandler(7, LK3AltProtReadWord); SekSetWriteByteHandler(7, LK3AltProtWriteByte); SekSetWriteWordHandler(7, LK3AltProtWriteWord); - SekMapHandler(8, 0x700000, 0x7fffff, MAP_WRITE); + SekMapHandler(8, 0x700000, 0x7fffff, SM_WRITE); SekSetWriteByteHandler(8, LK3AltBankWriteByte); SekSetWriteWordHandler(8, LK3AltBankWriteWord); SekClose(); @@ -2262,10 +2262,10 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x000000, OriginalRom + 0x000004, 0x200000); SekOpen(0); - SekMapHandler(7, 0x400000, 0x400001, MAP_READ); + SekMapHandler(7, 0x400000, 0x400001, SM_READ); SekSetReadByteHandler(7, RedclifProt2ReadByte); SekSetReadWordHandler(7, RedclifProt2ReadWord); - SekMapHandler(8, 0x400004, 0x400005, MAP_READ); + SekMapHandler(8, 0x400004, 0x400005, SM_READ); SekSetReadByteHandler(8, RedclifProtReadByte); SekSetReadWordHandler(8, RedclifProtReadWord); SekClose(); @@ -2280,7 +2280,7 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x800000, OriginalRom + 0x000000, 0x400000); SekOpen(0); - SekMapHandler(7, 0xa13000, 0xa1307f, MAP_READ); + SekMapHandler(7, 0xa13000, 0xa1307f, SM_READ); SekSetReadByteHandler(7, RadicaBankSelectReadByte); SekSetReadWordHandler(7, RadicaBankSelectReadWord); SekClose(); @@ -2289,7 +2289,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_KOF99 || (BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_POKEMON) { SekOpen(0); - SekMapHandler(7, 0xa13000, 0xa1303f, MAP_READ); + SekMapHandler(7, 0xa13000, 0xa1303f, SM_READ); SekSetReadByteHandler(7, Kof99A13000ReadByte); SekSetReadWordHandler(7, Kof99A13000ReadWord); SekClose(); @@ -2297,7 +2297,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_SOULBLAD) { SekOpen(0); - SekMapHandler(7, 0x400002, 0x400007, MAP_READ); + SekMapHandler(7, 0x400002, 0x400007, SM_READ); SekSetReadByteHandler(7, SoulbladReadByte); SekSetReadWordHandler(7, SoulbladReadWord); SekClose(); @@ -2305,10 +2305,10 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_MJLOVER) { SekOpen(0); - SekMapHandler(7, 0x400000, 0x400001, MAP_READ); + SekMapHandler(7, 0x400000, 0x400001, SM_READ); SekSetReadByteHandler(7, MjloverProt1ReadByte); SekSetReadWordHandler(7, MjloverProt1ReadWord); - SekMapHandler(8, 0x401000, 0x401001, MAP_READ); + SekMapHandler(8, 0x401000, 0x401001, SM_READ); SekSetReadByteHandler(8, MjloverProt2ReadByte); SekSetReadWordHandler(8, MjloverProt2ReadWord); SekClose(); @@ -2316,7 +2316,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_SQUIRRELK) { SekOpen(0); - SekMapHandler(7, 0x400000, 0x400007, MAP_READ | MAP_WRITE); + SekMapHandler(7, 0x400000, 0x400007, SM_READ | SM_WRITE); SekSetReadByteHandler(7, SquirrelKingExtraReadByte); SekSetReadWordHandler(7, SquirrelKingExtraReadWord); SekSetWriteByteHandler(7, SquirrelKingExtraWriteByte); @@ -2326,7 +2326,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_SMOUSE) { SekOpen(0); - SekMapHandler(7, 0x400000, 0x400007, MAP_READ); + SekMapHandler(7, 0x400000, 0x400007, SM_READ); SekSetReadByteHandler(7, SmouseProtReadByte); SekSetReadWordHandler(7, SmouseProtReadWord); SekClose(); @@ -2334,7 +2334,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_SMB) { SekOpen(0); - SekMapHandler(7, 0xa13000, 0xa13001, MAP_READ); + SekMapHandler(7, 0xa13000, 0xa13001, SM_READ); SekSetReadByteHandler(7, SmbProtReadByte); SekSetReadWordHandler(7, SmbProtReadWord); SekClose(); @@ -2342,7 +2342,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_SMB2) { SekOpen(0); - SekMapHandler(7, 0xa13000, 0xa13001, MAP_READ); + SekMapHandler(7, 0xa13000, 0xa13001, SM_READ); SekSetReadByteHandler(7, Smb2ProtReadByte); SekSetReadWordHandler(7, Smb2ProtReadWord); SekClose(); @@ -2357,7 +2357,7 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x000000, OriginalRom, 0x200000); SekOpen(0); - SekMapHandler(7, 0x700000, 0x7fffff, MAP_WRITE); + SekMapHandler(7, 0x700000, 0x7fffff, SM_WRITE); SekSetWriteByteHandler(7, KaijuBankWriteByte); SekSetWriteWordHandler(7, KaijuBankWriteWord); SekClose(); @@ -2372,10 +2372,10 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x000000, OriginalRom + 0x000000, 0x200000); SekOpen(0); - SekMapHandler(7, 0x400000, 0x4fffff, MAP_READ); + SekMapHandler(7, 0x400000, 0x4fffff, SM_READ); SekSetReadByteHandler(7, Chinfi3ProtReadByte); SekSetReadWordHandler(7, Chinfi3ProtReadWord); - SekMapHandler(8, 0x600000, 0x6fffff, MAP_WRITE); + SekMapHandler(8, 0x600000, 0x6fffff, SM_WRITE); SekSetWriteByteHandler(8, Chinfi3BankWriteByte); SekSetWriteWordHandler(8, Chinfi3BankWriteWord); SekClose(); @@ -2386,7 +2386,7 @@ static void SetupCustomCartridgeMappers() RamMisc->Lionk2ProtData2 = 0; SekOpen(0); - SekMapHandler(7, 0x400000, 0x400007, MAP_READ | MAP_WRITE); + SekMapHandler(7, 0x400000, 0x400007, SM_READ | SM_WRITE); SekSetReadByteHandler(7, Lionk2ProtReadByte); SekSetReadWordHandler(7, Lionk2ProtReadWord); SekSetWriteByteHandler(7, Lionk2ProtWriteByte); @@ -2396,7 +2396,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_BUGSLIFE) { SekOpen(0); - SekMapHandler(7, 0xa13000, 0xa13001, MAP_READ); + SekMapHandler(7, 0xa13000, 0xa13001, SM_READ); SekSetReadByteHandler(7, BuglExtraReadByte); SekSetReadWordHandler(7, BuglExtraReadWord); SekClose(); @@ -2404,7 +2404,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_ELFWOR) { SekOpen(0); - SekMapHandler(7, 0x400000, 0x400007, MAP_READ); + SekMapHandler(7, 0x400000, 0x400007, SM_READ); SekSetReadByteHandler(7, Elfwor400000ReadByte); SekSetReadWordHandler(7, Elfwor400000ReadWord); SekClose(); @@ -2412,7 +2412,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_ROCKMANX3) { SekOpen(0); - SekMapHandler(7, 0xa13000, 0xa13001, MAP_READ); + SekMapHandler(7, 0xa13000, 0xa13001, SM_READ); SekSetReadByteHandler(7, RockmanX3ExtraReadByte); SekSetReadWordHandler(7, RockmanX3ExtraReadWord); SekClose(); @@ -2420,7 +2420,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_SBUBBOB) { SekOpen(0); - SekMapHandler(7, 0x400000, 0x400003, MAP_READ); + SekMapHandler(7, 0x400000, 0x400003, SM_READ); SekSetReadByteHandler(7, SbubExtraReadByte); SekSetReadWordHandler(7, SbubExtraReadWord); SekClose(); @@ -2428,7 +2428,7 @@ static void SetupCustomCartridgeMappers() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_KOF98) { SekOpen(0); - SekMapHandler(7, 0x480000, 0x4fffff, MAP_READ); + SekMapHandler(7, 0x480000, 0x4fffff, SM_READ); SekSetReadByteHandler(7, Kof98ReadByte); SekSetReadWordHandler(7, Kof98ReadWord); SekClose(); @@ -2448,7 +2448,7 @@ static void SetupCustomCartridgeMappers() } SekOpen(0); - SekMapHandler(7, 0x400000, 0x40400f, MAP_WRITE); + SekMapHandler(7, 0x400000, 0x40400f, SM_WRITE); SekSetWriteByteHandler(7, RealtecWriteByte); SekSetWriteWordHandler(7, RealtecWriteWord); SekClose(); @@ -2461,7 +2461,7 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x400000, OriginalRom + 0x000000, 0x400000); SekOpen(0); - SekMapHandler(7, 0xa13000, 0xa13039, MAP_WRITE); + SekMapHandler(7, 0xa13000, 0xa13039, SM_WRITE); SekSetWriteByteHandler(7, Sup19in1BankWriteByte); SekSetWriteWordHandler(7, Sup19in1BankWriteWord); SekClose(); @@ -2474,7 +2474,7 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x400000, OriginalRom + 0x000000, 0x200000); SekOpen(0); - SekMapHandler(7, 0xa13000, 0xa13039, MAP_WRITE); + SekMapHandler(7, 0xa13000, 0xa13039, SM_WRITE); SekSetWriteByteHandler(7, Sup19in1BankWriteByte); SekSetWriteWordHandler(7, Sup19in1BankWriteWord); SekClose(); @@ -2487,7 +2487,7 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x000000, OriginalRom + 0x000000, 0x200000); SekOpen(0); - SekMapHandler(7, 0xa13000, 0xa1303f, MAP_WRITE); + SekMapHandler(7, 0xa13000, 0xa1303f, SM_WRITE); SekSetWriteByteHandler(7, Mc12in1BankWriteByte); SekSetWriteWordHandler(7, Mc12in1BankWriteWord); SekClose(); @@ -2503,10 +2503,10 @@ static void SetupCustomCartridgeMappers() memcpy(RomMain + 0x600000, OriginalRom + 0x000000, 0x200000); SekOpen(0); - SekMapHandler(7, 0x600000, 0x6fffff, MAP_READ); + SekMapHandler(7, 0x600000, 0x6fffff, SM_READ); SekSetReadByteHandler(7, TopfigReadByte); SekSetReadWordHandler(7, TopfigReadWord); - SekMapHandler(8, 0x700000, 0x7fffff, MAP_WRITE); + SekMapHandler(8, 0x700000, 0x7fffff, SM_WRITE); SekSetWriteByteHandler(8, TopfigWriteByte); SekSetWriteWordHandler(8, TopfigWriteWord); SekClose(); @@ -2564,7 +2564,7 @@ static void InstallSRAMHandlers(bool MaskAddr) memcpy((UINT8*)MegadriveBackupRam, SRam, RamMisc->SRamEnd - RamMisc->SRamStart + 1); SekOpen(0); - SekMapHandler(6, RamMisc->SRamStart & Mask, RamMisc->SRamEnd & Mask, MAP_READ | MAP_WRITE); + SekMapHandler(6, RamMisc->SRamStart & Mask, RamMisc->SRamEnd & Mask, SM_READ | SM_WRITE); SekSetReadByteHandler(6, MegadriveSRAMReadByte); SekSetReadWordHandler(6, MegadriveSRAMReadWord); SekSetWriteByteHandler(6, MegadriveSRAMWriteByte); @@ -2792,7 +2792,7 @@ static void MegadriveSetupSRAM() MegadriveBackupRam = (UINT16*)RomMain + RamMisc->SRamStart; SekOpen(0); - SekMapHandler(5, 0xa130f0, 0xa130f1, MAP_WRITE); + SekMapHandler(5, 0xa130f0, 0xa130f1, SM_WRITE); SekSetWriteByteHandler(5, MegadriveSRAMToggleWriteByte); SekSetWriteWordHandler(5, MegadriveSRAMToggleWriteWord); SekClose(); @@ -2822,7 +2822,7 @@ static void MegadriveSetupSRAM() MegadriveBackupRam = (UINT16*)RomMain + RamMisc->SRamStart; SekOpen(0); - SekMapHandler(5, 0xa130f0, 0xa130f1, MAP_READ | MAP_WRITE); + SekMapHandler(5, 0xa130f0, 0xa130f1, SM_READ | SM_WRITE); SekSetReadByteHandler(5, Megadrive6658ARegReadByte); SekSetReadWordHandler(5, Megadrive6658ARegReadWord); SekSetWriteByteHandler(5, Megadrive6658ARegWriteByte); @@ -2835,7 +2835,7 @@ static void MegadriveSetupSRAM() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_SEGA_EEPROM) { RamMisc->SRamHasSerialEEPROM = 1; SekOpen(0); - SekMapHandler(5, 0x200000, 0x200001, MAP_READ | MAP_WRITE); + SekMapHandler(5, 0x200000, 0x200001, SM_READ | SM_WRITE); SekSetReadByteHandler(5, WboyVEEPROMReadByte); SekSetReadWordHandler(5, WboyVEEPROMReadWord); SekSetWriteByteHandler(5, WboyVEEPROMWriteByte); @@ -2846,7 +2846,7 @@ static void MegadriveSetupSRAM() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_NBA_JAM) { RamMisc->SRamHasSerialEEPROM = 1; SekOpen(0); - SekMapHandler(5, 0x200000, 0x200001, MAP_READ | MAP_WRITE); + SekMapHandler(5, 0x200000, 0x200001, SM_READ | SM_WRITE); SekSetReadByteHandler(5, NbajamEEPROMReadByte); SekSetReadWordHandler(5, NbajamEEPROMReadWord); SekSetWriteByteHandler(5, NbajamEEPROMWriteByte); @@ -2857,7 +2857,7 @@ static void MegadriveSetupSRAM() if (((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_NBA_JAM_TE) || ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_NFL_QB_96) || ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_C_SLAM)) { RamMisc->SRamHasSerialEEPROM = 1; SekOpen(0); - SekMapHandler(5, 0x200000, 0x200001, MAP_READ | MAP_WRITE); + SekMapHandler(5, 0x200000, 0x200001, SM_READ | SM_WRITE); SekSetReadByteHandler(5, NbajamteEEPROMReadByte); SekSetReadWordHandler(5, NbajamteEEPROMReadWord); SekSetWriteByteHandler(5, NbajamteEEPROMWriteByte); @@ -2868,7 +2868,7 @@ static void MegadriveSetupSRAM() if ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_EA_NHLPA) { RamMisc->SRamHasSerialEEPROM = 1; SekOpen(0); - SekMapHandler(5, 0x200000, 0x200001, MAP_READ | MAP_WRITE); + SekMapHandler(5, 0x200000, 0x200001, SM_READ | SM_WRITE); SekSetReadByteHandler(5, EANhlpaEEPROMReadByte); SekSetReadWordHandler(5, EANhlpaEEPROMReadWord); SekSetWriteByteHandler(5, EANhlpaEEPROMWriteByte); @@ -2879,10 +2879,10 @@ static void MegadriveSetupSRAM() if (((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_CODE_MASTERS) || ((BurnDrvGetHardwareCode() & 0xff) == HARDWARE_SEGA_MEGADRIVE_PCB_CM_JCART_SEPROM)) { RamMisc->SRamHasSerialEEPROM = 1; SekOpen(0); - SekMapHandler(5, 0x300000, 0x300001, MAP_WRITE); + SekMapHandler(5, 0x300000, 0x300001, SM_WRITE); SekSetWriteByteHandler(5, CodemastersEEPROMWriteByte); SekSetWriteWordHandler(5, CodemastersEEPROMWriteWord); - SekMapHandler(6, 0x380000, 0x380001, MAP_READ); + SekMapHandler(6, 0x380000, 0x380001, SM_READ); SekSetReadByteHandler(6, CodemastersEEPROMReadByte); SekSetReadWordHandler(6, CodemastersEEPROMReadWord); SekClose(); @@ -2934,7 +2934,7 @@ static void MegadriveSetupSRAM() } SekOpen(0); - SekMapHandler(5, 0xa130f0, 0xa130f1, MAP_WRITE); + SekMapHandler(5, 0xa130f0, 0xa130f1, SM_WRITE); SekSetWriteByteHandler(5, MegadriveSRAMToggleWriteByte); SekSetWriteWordHandler(5, MegadriveSRAMToggleWriteWord); SekClose(); @@ -2967,13 +2967,13 @@ INT32 MegadriveInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(RomMain, 0x000000, 0x3FFFFF, MAP_ROM); // 68000 ROM - SekMapMemory(Ram68K, 0xFF0000, 0xFFFFFF, MAP_RAM); // 68000 RAM + SekMapMemory(RomMain, 0x000000, 0x3FFFFF, SM_ROM); // 68000 ROM + SekMapMemory(Ram68K, 0xFF0000, 0xFFFFFF, SM_RAM); // 68000 RAM - SekMapHandler(1, 0xC00000, 0xC0001F, MAP_RAM); // Video Port - SekMapHandler(2, 0xA00000, 0xA01FFF, MAP_RAM); // Z80 Ram - SekMapHandler(3, 0xA02000, 0xA03FFF, MAP_RAM); // Z80 Ram - SekMapHandler(4, 0xA10000, 0xA1001F, MAP_RAM); // I/O + SekMapHandler(1, 0xC00000, 0xC0001F, SM_RAM); // Video Port + SekMapHandler(2, 0xA00000, 0xA01FFF, SM_RAM); // Z80 Ram + SekMapHandler(3, 0xA02000, 0xA03FFF, SM_RAM); // Z80 Ram + SekMapHandler(4, 0xA10000, 0xA1001F, SM_RAM); // I/O SekSetReadByteHandler (0, MegadriveReadByte); SekSetReadWordHandler (0, MegadriveReadWord); diff --git a/src/burn/drv/neogeo/d_neogeo.cpp b/src/burn/drv/neogeo/d_neogeo.cpp index 6ef9820f7..86467eb91 100644 --- a/src/burn/drv/neogeo/d_neogeo.cpp +++ b/src/burn/drv/neogeo/d_neogeo.cpp @@ -1201,11 +1201,11 @@ static pSekWriteWordHandler pSMABankswitchHandler[MAX_SLOT] = { NULL, }; // Bank in an area of memory void NeoSMABankswitch() { - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, SM_ROM); if (nNeoSMARNGAddress[0] > 0 || nNeoSMARNGAddress[1] > 0) { - SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFBFF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFBFF, SM_ROM); } else { - SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFFFF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFFFF, SM_ROM); } } @@ -1299,17 +1299,17 @@ static void NeoSMAInstallHanders() { // bprintf(PRINT_NORMAL, _T(" Installing handlers for slot %i\n"), nNeoActiveSlot); - SekMapHandler(8, 0x2FFC00, 0x2FFFFF, MAP_WRITE); // Bankswitch + SekMapHandler(8, 0x2FFC00, 0x2FFFFF, SM_WRITE); // Bankswitch SekSetWriteWordHandler(8, pSMABankswitchHandler[nNeoActiveSlot]); - SekMapHandler(6, 0x2FE400, 0x2FE7FF, MAP_ROM); // Protection + SekMapHandler(6, 0x2FE400, 0x2FE7FF, SM_ROM); // Protection SekSetReadWordHandler(6, neogeoReadWordSMA9A37); SekSetReadByteHandler(6, neogeoReadByteSMA9A37); if (nNeoSMARNGAddress[nNeoActiveSlot][0] > 0 || nNeoSMARNGAddress[nNeoActiveSlot][1] > 0) { - SekMapHandler(7, 0x2FFC00, 0x2FFFFF, MAP_ROM); // Randum number generator + SekMapHandler(7, 0x2FFC00, 0x2FFFFF, SM_ROM); // Randum number generator SekSetReadWordHandler(7, neogeoReadWordSMARNG); SekSetReadByteHandler(7, neogeoReadByteSMARNG); @@ -1450,7 +1450,7 @@ void NeoPVCBankswitch() if (nNeo68KROMBank != nBank) { nNeo68KROMBank = nBank; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, SM_ROM); } PVCRAM[0x1ff0] = 0xa0; @@ -1476,7 +1476,7 @@ void __fastcall PVCWriteWordBankSwitch(UINT32 sekAddress, UINT16 wordValue) static void NeoPVCMapBank() { - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, SM_ROM); } static INT32 NeoPVCScan(INT32 nAction, INT32*) @@ -1497,9 +1497,9 @@ static INT32 NeoPVCScan(INT32 nAction, INT32*) static void NeoPVCInstallHandlers() { // Install cart PVC protections - SekMapMemory(PVCRAM, 0x2fe000, 0x2fffff, MAP_READ); + SekMapMemory(PVCRAM, 0x2fe000, 0x2fffff, SM_READ); - SekMapHandler(6, 0x2fe000, 0x2fffff, MAP_WRITE); + SekMapHandler(6, 0x2fe000, 0x2fffff, SM_WRITE); SekSetWriteWordHandler(6, PVCWriteWordBankSwitch); SekSetWriteByteHandler(6, PVCWriteByteBankSwitch); } @@ -3471,8 +3471,8 @@ INT32 fatfury2Scan(INT32 nAction, INT32* /*pnMin*/) static void fatfury2InstallHanders() { // Install protection handler - SekMapHandler(6, 0x200000, 0x2FFFFF, MAP_WRITE); - SekMapHandler(6, 0x200000, 0x2FFFFF, MAP_READ); + SekMapHandler(6, 0x200000, 0x2FFFFF, SM_WRITE); + SekMapHandler(6, 0x200000, 0x2FFFFF, SM_READ); SekSetWriteWordHandler(6, fatfury2WriteWordProtection); SekSetWriteByteHandler(6, fatfury2WriteByteProtection); SekSetReadWordHandler(6, fatfury2ReadWordProtection); @@ -4934,7 +4934,7 @@ static void kogCallback() static void kogInstallHandlers() { // Install jumper that controls title screen language - SekMapHandler(6, 0x0FFFFE, 0x0FFFFF, MAP_READ); + SekMapHandler(6, 0x0FFFFE, 0x0FFFFF, SM_READ); SekSetReadWordHandler(6, KogReadWord); } @@ -5401,7 +5401,7 @@ void __fastcall kof98WriteWordProtection(UINT32 sekAddress, UINT16 wordValue) static void kof98InstallHandler() { - SekMapHandler(6, 0x200000, 0x2FFBFF, MAP_WRITE); + SekMapHandler(6, 0x200000, 0x2FFBFF, SM_WRITE); SekSetWriteWordHandler(6, kof98WriteWordProtection); SekSetWriteByteHandler(6, kof98WriteByteProtection); @@ -5724,7 +5724,7 @@ static UINT16 __fastcall mslugx_protection_read() static void mslugxMapBank() { - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2ffbff, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2ffbff, SM_ROM); } static void mslugxBankswitch(UINT32 nBank) @@ -5771,7 +5771,7 @@ static void __fastcall mslugx_write_protection_byte(UINT32 SekAddress, UINT8 byt static void mslugxInstallBankSwitchHandler() { - SekMapHandler(6, 0x2ffc00, 0x2fffff, MAP_WRITE | MAP_READ | MAP_FETCH); + SekMapHandler(6, 0x2ffc00, 0x2fffff, SM_WRITE | SM_READ | SM_FETCH); SekSetReadWordHandler(6, mslugx_read_protection_word); SekSetReadByteHandler(6, mslugx_read_protection_byte); SekSetWriteWordHandler(6, mslugx_write_protection_word); @@ -5883,8 +5883,8 @@ void __fastcall kof99WriteWordBankswitch(UINT32 sekAddress, UINT16 wordValue) if (bankoffset[nBank] != nNeo68KROMBank) { nNeo68KROMBank = bankoffset[nBank]; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, MAP_ROM); - SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFBFF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, SM_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFBFF, SM_ROM); } } } @@ -6144,8 +6144,8 @@ void __fastcall garouWriteWordBankswitch(UINT32 sekAddress, UINT16 wordValue) if (bankoffset[nBank] != nNeo68KROMBank) { nNeo68KROMBank = bankoffset[nBank]; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, MAP_ROM); - SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFBFF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, SM_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFBFF, SM_ROM); } } } @@ -6246,8 +6246,8 @@ void __fastcall garouhWriteWordBankswitch(UINT32 sekAddress, UINT16 wordValue) if (bankoffset[nBank] != nNeo68KROMBank) { nNeo68KROMBank = bankoffset[nBank]; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, MAP_ROM); - SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFBFF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, SM_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFBFF, SM_ROM); } } } @@ -6442,8 +6442,8 @@ void __fastcall mslug3WriteWordBankswitch(UINT32 sekAddress, UINT16 wordValue) if (bankoffset[nBank] != nNeo68KROMBank) { nNeo68KROMBank = bankoffset[nBank]; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, MAP_ROM); - SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFFFF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, SM_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFFFF, SM_ROM); } } } @@ -6634,8 +6634,8 @@ void __fastcall kof2000WriteWordBankswitch(UINT32 sekAddress, UINT16 wordValue) if (bankoffset[nBank] != nNeo68KROMBank) { nNeo68KROMBank = bankoffset[nBank]; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, MAP_ROM); - SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFBFF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FE3FF, SM_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank + 0x0FE800, 0x2FE800, 0x2FFBFF, SM_ROM); } } } @@ -6893,7 +6893,7 @@ static void cthd2003Bankswitch(UINT32 nBank) if (nBank != nNeo68KROMBank) { nNeo68KROMBank = nBank; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fffff, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fffff, SM_ROM); } } @@ -6966,7 +6966,7 @@ static void cthd2003Callback() static void cthd2003InstallBankSwitchHandler() { - SekMapHandler(6, 0x200000, 0x2fffff, MAP_WRITE); + SekMapHandler(6, 0x200000, 0x2fffff, SM_WRITE); SekSetWriteWordHandler(6, cthd2003WriteWordBankswitch); SekSetWriteByteHandler(6, cthd2003WriteByteBankswitch); @@ -7044,7 +7044,7 @@ static void ct2k3spCallback() static void ct2kspInstallBankSwitchHandler() { - SekMapHandler(6, 0x200000, 0x2fffff, MAP_WRITE); + SekMapHandler(6, 0x200000, 0x2fffff, SM_WRITE); SekSetWriteWordHandler(6, cthd2003WriteWordBankswitch); SekSetWriteByteHandler(6, cthd2003WriteByteBankswitch); @@ -7504,7 +7504,7 @@ static void kof10thBankswitch(UINT32 nBank) if (nBank != nNeo68KROMBank) { nNeo68KROMBank = nBank; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, SM_ROM); } } @@ -7533,7 +7533,7 @@ void __fastcall kof10thWriteWordBankswitch(UINT32 sekAddress, UINT16 wordValue) if (sekAddress == 0x2ffff0) kof10thBankswitch(wordValue); else if (sekAddress == 0x2ffff8 && *(UINT16*)(kof10thExtraRAMB + 0x1ff8) != BURN_ENDIAN_SWAP_INT16(wordValue)) - SekMapMemory(Neo68KROMActive + ((wordValue & 1) ? 0x710000 : 0x010000) , 0x010000, 0x0dffff, MAP_ROM); + SekMapMemory(Neo68KROMActive + ((wordValue & 1) ? 0x710000 : 0x010000) , 0x010000, 0x0dffff, SM_ROM); *(UINT16*)(kof10thExtraRAMB + (sekAddress & 0x01ffe)) = wordValue; } @@ -7570,7 +7570,7 @@ static void kof10thCallback() static void kof10thMapBank() { - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, SM_ROM); } static INT32 kof10thScan(INT32 nAction, INT32* pnMin) @@ -7600,15 +7600,15 @@ static INT32 kof10thScan(INT32 nAction, INT32* pnMin) static void kof10thInstallHandlers() { // Install RAM handlers - SekMapMemory(kof10thExtraRAMA, 0x0e0000, 0x0fffff, MAP_ROM); // Text RAM on range 0x0e0000 - 0x0fffff - SekMapMemory(kof10thExtraRAMB, 0x2fe000, 0x2fffff, MAP_ROM); // Extra 68K RAM + SekMapMemory(kof10thExtraRAMA, 0x0e0000, 0x0fffff, SM_ROM); // Text RAM on range 0x0e0000 - 0x0fffff + SekMapMemory(kof10thExtraRAMB, 0x2fe000, 0x2fffff, SM_ROM); // Extra 68K RAM // Install bankswitch and text handlers - SekMapHandler(6, 0x2fe000, 0x2fffff, MAP_WRITE); + SekMapHandler(6, 0x2fe000, 0x2fffff, SM_WRITE); SekSetWriteWordHandler(6, kof10thWriteWordBankswitch); SekSetWriteByteHandler(6, kof10thWriteByteBankswitch); - SekMapHandler(7, 0x200000, 0x23ffff, MAP_WRITE); + SekMapHandler(7, 0x200000, 0x23ffff, SM_WRITE); SekSetWriteWordHandler(7, kof10thWriteWordCustom); // Set bank @@ -8060,14 +8060,14 @@ void __fastcall ms5plusWriteWordBankSwitch(UINT32 sekAddress, UINT16 wordValue) if (nNeo68KROMBank != nBank) { nNeo68KROMBank = nBank; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, SM_ROM); } }; } static void ms5plusInstallHandlers() { - SekMapHandler(6, 0x2fe000, 0x2fffff, MAP_WRITE); + SekMapHandler(6, 0x2fe000, 0x2fffff, SM_WRITE); SekSetWriteWordHandler(6, ms5plusWriteWordBankSwitch); } @@ -9149,7 +9149,7 @@ static void kf2k3blInstallHandlers() { NeoPVCInstallHandlers(); - SekMapHandler(7, 0x058196, 0x058197, MAP_READ); + SekMapHandler(7, 0x058196, 0x058197, SM_READ); SekSetReadByteHandler(7, kf2k3blReadByteProtection); } @@ -9247,7 +9247,7 @@ void __fastcall kf2k3blaWriteWordBankswitch(UINT32 sekAddress, UINT16 wordValue) if (nBank != nNeo68KROMBank) { nNeo68KROMBank = nBank; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2fdfff, SM_ROM); } } } @@ -9256,7 +9256,7 @@ static void kf2k3blaInstallHandlers() { NeoPVCInstallHandlers(); - SekMapHandler(7, 0x2ffff0, 0x2fffff, MAP_WRITE); + SekMapHandler(7, 0x2ffff0, 0x2fffff, SM_WRITE); SekSetWriteWordHandler(7, kf2k3blaWriteWordBankswitch); } diff --git a/src/burn/drv/neogeo/neo_run.cpp b/src/burn/drv/neogeo/neo_run.cpp index 783951fe2..c797bbe1d 100644 --- a/src/burn/drv/neogeo/neo_run.cpp +++ b/src/burn/drv/neogeo/neo_run.cpp @@ -861,9 +861,9 @@ static void NeoZ80MapROM(bool bMapBoardROM) static void MapVectorTable(bool bMapBoardROM) { if (!bMapBoardROM && Neo68KROMActive) { - SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x000000, 0x0003FF, MAP_ROM); + SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x000000, 0x0003FF, SM_ROM); } else { - SekMapMemory(NeoVectorActive, 0x000000, 0x0003FF, MAP_ROM); + SekMapMemory(NeoVectorActive, 0x000000, 0x0003FF, SM_ROM); } } @@ -871,7 +871,7 @@ inline static void MapPalette(INT32 nBank) { if (nNeoPaletteBank != nBank) { nNeoPaletteBank = nBank; - SekMapMemory(NeoPalSrc[nBank], 0x400000, 0x401FFF, MAP_ROM); + SekMapMemory(NeoPalSrc[nBank], 0x400000, 0x401FFF, SM_ROM); NeoSetPalette(); } @@ -887,20 +887,20 @@ static void Bankswitch(UINT32 nBank) if (nBank != nNeo68KROMBank) { // bprintf(PRINT_NORMAL, "Bankswitched main ROM, new address is 0x%08X.\n", nBank); nNeo68KROMBank = nBank; - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FFFFF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FFFFF, SM_ROM); } } void NeoMapBank() { - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FFFFF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FFFFF, SM_ROM); } void NeoMap68KFix() { if ((nNeoSystemType & NEO_SYS_CART) && (nCodeSize[nNeoActiveSlot] > 0x100000)) { - SekMapMemory(Neo68KFix[nNeoActiveSlot] + 0x0400, 0x000400, 0x0FFFFF, MAP_ROM); + SekMapMemory(Neo68KFix[nNeoActiveSlot] + 0x0400, 0x000400, 0x0FFFFF, SM_ROM); if (Neo68KROM[nNeoActiveSlot]) { memcpy(NeoVector[nNeoActiveSlot] + 0x80, Neo68KFix[nNeoActiveSlot] + 0x80, 0x0380); @@ -1090,8 +1090,8 @@ static void NeoMapActiveCartridge() Neo68KROMActive = NULL; - SekMapHandler(0, 0x000000, 0x0FFFFF, MAP_RAM); - SekMapHandler(0, 0x200000, 0x2FFFFF, MAP_RAM); + SekMapHandler(0, 0x000000, 0x0FFFFF, SM_RAM); + SekMapHandler(0, 0x200000, 0x2FFFFF, SM_RAM); b68KBoardROMBankedIn = true; MapVectorTable(b68KBoardROMBankedIn); @@ -1119,24 +1119,24 @@ static void NeoMapActiveCartridge() SekSetReadByteHandler(7, NULL); SekSetWriteByteHandler(7, NULL); - SekMapHandler(0, 0x000000, 0x0FFFFF, MAP_WRITE); + SekMapHandler(0, 0x000000, 0x0FFFFF, SM_WRITE); if (nCodeSize[nNeoActiveSlot] <= 0x080000) { - SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x000000, 0x07FFFF, MAP_ROM); - SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x080000, 0x0FFFFF, MAP_ROM); - SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x200000, 0x27FFFF, MAP_ROM); - SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x280000, 0x2FFFFF, MAP_ROM); + SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x000000, 0x07FFFF, SM_ROM); + SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x080000, 0x0FFFFF, SM_ROM); + SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x200000, 0x27FFFF, SM_ROM); + SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x280000, 0x2FFFFF, SM_ROM); } if (nCodeSize[nNeoActiveSlot] <= 0x100000) { - SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x000000, 0x0FFFFF, MAP_ROM); - SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x200000, 0x2FFFFF, MAP_ROM); + SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x000000, 0x0FFFFF, SM_ROM); + SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x200000, 0x2FFFFF, SM_ROM); } if (nCodeSize[nNeoActiveSlot] > 0x100000) { - SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x000000, 0x0FFFFF, MAP_ROM); + SekMapMemory(Neo68KFix[nNeoActiveSlot], 0x000000, 0x0FFFFF, SM_ROM); - SekMapHandler(4, 0x200000, 0x2FFFFF, MAP_WRITE); + SekMapHandler(4, 0x200000, 0x2FFFFF, SM_WRITE); SekSetWriteWordHandler(4, neogeoWriteWordBankswitch); SekSetWriteByteHandler(4, neogeoWriteByteBankswitch); @@ -1159,14 +1159,14 @@ static void NeoMapActiveCartridge() } if ((BurnDrvGetHardwareCode() & HARDWARE_SNK_CONTROLMASK) == HARDWARE_SNK_GAMBLING) { - SekMapMemory(NeoNVRAM2, 0x200000, 0x201FFF, MAP_RAM); // 68K RAM + SekMapMemory(NeoNVRAM2, 0x200000, 0x201FFF, SM_RAM); // 68K RAM - SekMapHandler(6, 0x202000, 0x2FFFFF, MAP_READ); + SekMapHandler(6, 0x202000, 0x2FFFFF, SM_READ); SekSetReadByteHandler(6, neogeoReadByteGambling); SekSetReadWordHandler(6, neogeoReadWordGambling); if (!strcmp(BurnDrvGetTextA(DRV_NAME), "vliner") || !strcmp(BurnDrvGetTextA(DRV_NAME), "vlinero")) { - SekMapHandler(7, 0x320000, 0x320001, MAP_READ); + SekMapHandler(7, 0x320000, 0x320001, SM_READ); SekSetReadByteHandler(7, vliner_timing); } } @@ -1490,7 +1490,7 @@ INT32 NeoScan(INT32 nAction, INT32* pnMin) } else { if ((BurnDrvGetHardwareCode() & HARDWARE_SNK_CONTROLMASK) != HARDWARE_SNK_GAMBLING) { SekOpen(0); - SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FFFFF, MAP_ROM); + SekMapMemory(Neo68KROMActive + nNeo68KROMBank, 0x200000, 0x2FFFFF, SM_ROM); SekClose(); } } @@ -3630,11 +3630,11 @@ static INT32 neogeoReset() if (nNeoSystemType & NEO_SYS_MVS) { for (INT32 a = 0xD00000; a < 0xE00000; a += 0x010000) { - SekMapMemory(NeoNVRAM, a, a + 0xFFFF, MAP_RAM); // 68K RAM + SekMapMemory(NeoNVRAM, a, a + 0xFFFF, SM_RAM); // 68K RAM } - SekMapHandler(1, 0xD00000, 0xDFFFFF, MAP_WRITE); // + SekMapHandler(1, 0xD00000, 0xDFFFFF, SM_WRITE); // } else { - SekMapHandler(0, 0xD00000, 0xDFFFFF, MAP_RAM); // AES/NeoCD don't have the SRAM + SekMapHandler(0, 0xD00000, 0xDFFFFF, SM_RAM); // AES/NeoCD don't have the SRAM } if (nNeoSystemType & NEO_SYS_CART) { @@ -3643,18 +3643,18 @@ static INT32 neogeoReset() if (nNeoSystemType & NEO_SYS_PCB) { if (BurnDrvGetHardwareCode() & HARDWARE_SNK_KOF2K3) { - SekMapMemory(Neo68KBIOS, 0xC00000, 0xC7FFFF, MAP_ROM); - SekMapMemory(Neo68KBIOS, 0xC80000, 0xCFFFFF, MAP_ROM); + SekMapMemory(Neo68KBIOS, 0xC00000, 0xC7FFFF, SM_ROM); + SekMapMemory(Neo68KBIOS, 0xC80000, 0xCFFFFF, SM_ROM); } else { for (INT32 a = 0xC00000; a < 0xD00000; a += 0x020000) { - SekMapMemory(Neo68KBIOS + (NeoSystem & 0x03) * 0x020000, a, a + 0x01FFFF, MAP_ROM); + SekMapMemory(Neo68KBIOS + (NeoSystem & 0x03) * 0x020000, a, a + 0x01FFFF, SM_ROM); } } } // Set by a switch on the PCB if (!strcmp(BurnDrvGetTextA(DRV_NAME), "svcpcb") || !strcmp(BurnDrvGetTextA(DRV_NAME), "svcpcba") || !strcmp(BurnDrvGetTextA(DRV_NAME), "svcpcbnd") || !strcmp(BurnDrvGetTextA(DRV_NAME), "ms5pcb") || !strcmp(BurnDrvGetTextA(DRV_NAME), "ms5pcbnd")) { - SekMapMemory(Neo68KBIOS + 0x20000 * (~NeoSystem & 1), 0xc00000, 0xc1ffff, MAP_ROM); + SekMapMemory(Neo68KBIOS + 0x20000 * (~NeoSystem & 1), 0xc00000, 0xc1ffff, SM_ROM); } MapVectorTable(true); @@ -3764,20 +3764,20 @@ static INT32 NeoInitCommon() if (nNeoSystemType & NEO_SYS_CART) { for (INT32 a = 0x100000; a < 0x200000; a += 0x010000) { - SekMapMemory(Neo68KRAM, a, a + 0xFFFF, MAP_RAM); // 68K RAM + SekMapMemory(Neo68KRAM, a, a + 0xFFFF, SM_RAM); // 68K RAM } if (!(nNeoSystemType & NEO_SYS_PCB)) { // for (INT32 a = 0xC00000; a < 0xD00000; a += 0x020000) { -// SekMapMemory(Neo68KBIOS, a, a + 0x01FFFF, MAP_ROM); // MVS/AES BIOS ROM +// SekMapMemory(Neo68KBIOS, a, a + 0x01FFFF, SM_ROM); // MVS/AES BIOS ROM // } - SekMapMemory(Neo68KBIOS, 0xC00000, 0xC7FFFF, MAP_ROM); // BIOS ROM + SekMapMemory(Neo68KBIOS, 0xC00000, 0xC7FFFF, SM_ROM); // BIOS ROM } } else { - SekMapMemory(Neo68KFix[0], 0x000000, 0x1FFFFF, MAP_RAM); // Main 68K RAM - SekMapMemory(Neo68KBIOS, 0xC00000, 0xC7FFFF, MAP_ROM); // NeoCD BIOS ROM - SekMapMemory(Neo68KBIOS, 0xC80000, 0xCFFFFF, MAP_ROM); // + SekMapMemory(Neo68KFix[0], 0x000000, 0x1FFFFF, SM_RAM); // Main 68K RAM + SekMapMemory(Neo68KBIOS, 0xC00000, 0xC7FFFF, SM_ROM); // NeoCD BIOS ROM + SekMapMemory(Neo68KBIOS, 0xC80000, 0xCFFFFF, SM_ROM); // } SekSetReadWordHandler(0, neogeoReadWord); @@ -3789,43 +3789,43 @@ static INT32 NeoInitCommon() SekSetWriteByteHandler(1, neogeoWriteByteSRAM); if (!(nNeoSystemType & NEO_SYS_PCB)) { - SekMapHandler(2, 0x800000, 0xBFFFFF, MAP_ROM); // Memory card - SekMapHandler(2, 0x800000, 0xBFFFFF, MAP_WRITE); // + SekMapHandler(2, 0x800000, 0xBFFFFF, SM_ROM); // Memory card + SekMapHandler(2, 0x800000, 0xBFFFFF, SM_WRITE); // SekSetReadByteHandler(2, neogeoReadByteMemoryCard); SekSetWriteByteHandler(2, neogeoWriteByteMemoryCard); } - SekMapHandler(3, 0x400000, 0x7FFFFF, MAP_WRITE); // Palette + SekMapHandler(3, 0x400000, 0x7FFFFF, SM_WRITE); // Palette SekSetWriteWordHandler(3, NeoPalWriteWord); SekSetWriteByteHandler(3, NeoPalWriteByte); // Set up mirrors for (INT32 a = 0x420000; a < 0x800000; a += 0x2000) { - SekMapMemory(NeoPalSrc[0], a, a + 0x1FFF, MAP_ROM); + SekMapMemory(NeoPalSrc[0], a, a + 0x1FFF, SM_ROM); } - SekMapHandler(5, 0x3C0000, 0x3DFFFF, MAP_RAM); // Read Video Controller + SekMapHandler(5, 0x3C0000, 0x3DFFFF, SM_RAM); // Read Video Controller SekSetReadWordHandler(5, neogeoReadWordVideo); SekSetReadByteHandler(5, neogeoReadByteVideo); SekSetWriteWordHandler(5, neogeoWriteWordVideo); SekSetWriteByteHandler(5, neogeoWriteByteVideo); if (nNeoSystemType & NEO_SYS_CD) { - SekMapHandler(4, 0x000000, 0x0003FF, MAP_WRITE); + SekMapHandler(4, 0x000000, 0x0003FF, SM_WRITE); SekSetWriteWordHandler(4, neogeoWriteWord68KProgram); SekSetWriteByteHandler(4, neogeoWriteByte68KProgram); - SekMapHandler(6, 0xE00000, 0xEFFFFF, MAP_RAM); + SekMapHandler(6, 0xE00000, 0xEFFFFF, SM_RAM); SekSetReadWordHandler(6, neogeoReadWordTransfer); SekSetReadByteHandler(6, neogeoReadByteTransfer); SekSetWriteWordHandler(6, neogeoWriteWordTransfer); SekSetWriteByteHandler(6, neogeoWriteByteTransfer); - SekMapHandler(7, 0xF00000, 0xFFFFFF, MAP_RAM); + SekMapHandler(7, 0xF00000, 0xFFFFFF, SM_RAM); SekSetReadWordHandler(7, neogeoReadWordCDROM); SekSetReadByteHandler(7, neogeoReadByteCDROM); diff --git a/src/burn/drv/pce/pce.cpp b/src/burn/drv/pce/pce.cpp index 66bbf7671..d5c65f701 100644 --- a/src/burn/drv/pce/pce.cpp +++ b/src/burn/drv/pce/pce.cpp @@ -156,7 +156,7 @@ static void sf2_bankswitch(UINT8 offset) { pce_sf2_bank = offset; - h6280MapMemory(PCECartROM + (offset * 0x80000) + 0x080000, 0x080000, 0x0fffff, MAP_ROM); + h6280MapMemory(PCECartROM + (offset * 0x80000) + 0x080000, 0x080000, 0x0fffff, H6280_ROM); } static void pce_write(UINT32 address, UINT8 data) @@ -480,11 +480,11 @@ static INT32 CommonInit(int type) { h6280Init(0); h6280Open(0); - h6280MapMemory(PCECartROM + 0x000000, 0x000000, 0x0fffff, MAP_ROM); - h6280MapMemory(PCEUserRAM + 0x000000, 0x1f0000, 0x1f1fff, MAP_RAM); // mirrored - h6280MapMemory(PCEUserRAM + 0x000000, 0x1f2000, 0x1f3fff, MAP_RAM); - h6280MapMemory(PCEUserRAM + 0x000000, 0x1f4000, 0x1f5fff, MAP_RAM); - h6280MapMemory(PCEUserRAM + 0x000000, 0x1f6000, 0x1f7fff, MAP_RAM); + h6280MapMemory(PCECartROM + 0x000000, 0x000000, 0x0fffff, H6280_ROM); + h6280MapMemory(PCEUserRAM + 0x000000, 0x1f0000, 0x1f1fff, H6280_RAM); // mirrored + h6280MapMemory(PCEUserRAM + 0x000000, 0x1f2000, 0x1f3fff, H6280_RAM); + h6280MapMemory(PCEUserRAM + 0x000000, 0x1f4000, 0x1f5fff, H6280_RAM); + h6280MapMemory(PCEUserRAM + 0x000000, 0x1f6000, 0x1f7fff, H6280_RAM); h6280SetWritePortHandler(pce_write_port); h6280SetWriteHandler(pce_write); h6280SetReadHandler(pce_read); @@ -502,8 +502,8 @@ static INT32 CommonInit(int type) { h6280Init(0); h6280Open(0); - h6280MapMemory(PCECartROM, 0x000000, 0x0fffff, MAP_ROM); - h6280MapMemory(PCEUserRAM, 0x1f0000, 0x1f7fff, MAP_RAM); + h6280MapMemory(PCECartROM, 0x000000, 0x0fffff, H6280_ROM); + h6280MapMemory(PCEUserRAM, 0x1f0000, 0x1f7fff, H6280_RAM); h6280SetWritePortHandler(sgx_write_port); h6280SetWriteHandler(sgx_write); h6280SetReadHandler(sgx_read); @@ -553,7 +553,7 @@ INT32 populousInit() if (nRet == 0) { h6280Open(0); - h6280MapMemory(PCECartRAM, 0x080000, 0x087fff, MAP_RAM); + h6280MapMemory(PCECartRAM, 0x080000, 0x087fff, H6280_RAM); h6280Close(); } diff --git a/src/burn/drv/pgm/pgm_asic25.cpp b/src/burn/drv/pgm/pgm_asic25.cpp index c3f5ebc9b..94e86488d 100644 --- a/src/burn/drv/pgm/pgm_asic25.cpp +++ b/src/burn/drv/pgm/pgm_asic25.cpp @@ -907,8 +907,8 @@ void install_protection_asic25_asic22_killbld() sharedprotram = (UINT16*)PGMUSER0; SekOpen(0); - SekMapMemory(PGMUSER0, 0x300000, 0x303fff, MAP_RAM); - SekMapHandler(4, 0xd40000, 0xd40003, MAP_READ | MAP_WRITE); + SekMapMemory(PGMUSER0, 0x300000, 0x303fff, SM_RAM); + SekMapHandler(4, 0xd40000, 0xd40003, SM_READ | SM_WRITE); SekSetReadWordHandler(4, igs025_prot_read); SekSetWriteWordHandler(4, killbld_igs025_prot_write); SekClose(); @@ -924,8 +924,8 @@ void install_protection_asic25_asic22_drgw3() sharedprotram = (UINT16*)PGMUSER0; SekOpen(0); - SekMapMemory(PGMUSER0, 0x300000, 0x303fff, MAP_RAM); - SekMapHandler(4, 0xda5610, 0xda5613, MAP_READ | MAP_WRITE); + SekMapMemory(PGMUSER0, 0x300000, 0x303fff, SM_RAM); + SekMapHandler(4, 0xda5610, 0xda5613, SM_READ | SM_WRITE); SekSetReadWordHandler(4, igs025_prot_read); SekSetWriteWordHandler(4, killbld_igs025_prot_write); SekClose(); @@ -937,7 +937,7 @@ void install_protection_asic25_asic12_dw2() pPgmResetCallback = drgw2_reset; SekOpen(0); - SekMapHandler(4, 0xd80000, 0xd80003, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0xd80000, 0xd80003, SM_READ | SM_WRITE); SekSetReadWordHandler(4, igs025_prot_read); SekSetWriteWordHandler(4, drgw2_igs025_prot_write); SekClose(); @@ -951,8 +951,8 @@ void install_protection_asic25_asic28_olds() sharedprotram = (UINT16*)PGMUSER0; SekOpen(0); - SekMapMemory(PGMUSER0, 0x400000, 0x403fff, MAP_RAM); - SekMapHandler(4, 0xdcb400, 0xdcb403, MAP_READ | MAP_WRITE); + SekMapMemory(PGMUSER0, 0x400000, 0x403fff, SM_RAM); + SekMapHandler(4, 0xdcb400, 0xdcb403, SM_READ | SM_WRITE); SekSetReadWordHandler(4, igs025_prot_read); SekSetWriteWordHandler(4, olds_igs025_prot_write); SekClose(); diff --git a/src/burn/drv/pgm/pgm_asic27a_type1.cpp b/src/burn/drv/pgm/pgm_asic27a_type1.cpp index 28e44686f..43723e5e9 100644 --- a/src/burn/drv/pgm/pgm_asic27a_type1.cpp +++ b/src/burn/drv/pgm/pgm_asic27a_type1.cpp @@ -171,18 +171,18 @@ void install_protection_asic27a_kovsh() pPgmResetCallback = reset_kovsh_asic27a; SekOpen(0); - SekMapMemory(PGMARMShareRAM, 0x4f0000, 0x4f003f, MAP_RAM); + SekMapMemory(PGMARMShareRAM, 0x4f0000, 0x4f003f, SM_RAM); - SekMapHandler(4, 0x500000, 0x600005, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0x500000, 0x600005, SM_READ | SM_WRITE); SekSetReadWordHandler(4, kovsh_asic27a_read_word); SekSetWriteWordHandler(4, kovsh_asic27a_write_word); SekClose(); Arm7Init(0); Arm7Open(0); - Arm7MapMemory(PGMARMROM, 0x00000000, 0x00003fff, MAP_ROM); - Arm7MapMemory(PGMARMRAM0, 0x10000000, 0x100003ff, MAP_RAM); - Arm7MapMemory(PGMARMRAM2, 0x50000000, 0x500003ff, MAP_RAM); + Arm7MapMemory(PGMARMROM, 0x00000000, 0x00003fff, ARM7_ROM); + Arm7MapMemory(PGMARMRAM0, 0x10000000, 0x100003ff, ARM7_RAM); + Arm7MapMemory(PGMARMRAM2, 0x50000000, 0x500003ff, ARM7_RAM); Arm7SetWriteWordHandler(kovsh_asic27a_arm7_write_word); Arm7SetWriteLongHandler(kovsh_asic27a_arm7_write_long); Arm7SetReadLongHandler(kovsh_asic27a_arm7_read_long); @@ -255,18 +255,18 @@ void install_protection_asic27a_kovshp() pPgmScanCallback = kovsh_asic27aScan; SekOpen(0); - SekMapMemory(PGMARMShareRAM, 0x4f0000, 0x4f003f, MAP_RAM); + SekMapMemory(PGMARMShareRAM, 0x4f0000, 0x4f003f, SM_RAM); - SekMapHandler(4, 0x500000, 0x600005, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0x500000, 0x600005, SM_READ | SM_WRITE); SekSetReadWordHandler(4, kovsh_asic27a_read_word); SekSetWriteWordHandler(4, kovshp_asic27a_write_word); SekClose(); Arm7Init(0); Arm7Open(0); - Arm7MapMemory(PGMARMROM, 0x00000000, 0x00003fff, MAP_ROM); - Arm7MapMemory(PGMARMRAM0, 0x10000000, 0x100003ff, MAP_RAM); - Arm7MapMemory(PGMARMRAM2, 0x50000000, 0x500003ff, MAP_RAM); + Arm7MapMemory(PGMARMROM, 0x00000000, 0x00003fff, ARM7_ROM); + Arm7MapMemory(PGMARMRAM0, 0x10000000, 0x100003ff, ARM7_RAM); + Arm7MapMemory(PGMARMRAM2, 0x50000000, 0x500003ff, ARM7_RAM); Arm7SetWriteWordHandler(kovsh_asic27a_arm7_write_word); Arm7SetWriteLongHandler(kovsh_asic27a_arm7_write_long); Arm7SetReadLongHandler(kovsh_asic27a_arm7_read_long); @@ -427,7 +427,7 @@ void install_protection_asic27a_ketsui() asic27a_sim_command = ddp3_asic27a_sim_command; SekOpen(0); - SekMapHandler(4, 0x400000, 0x400005, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0x400000, 0x400005, SM_READ | SM_WRITE); SekSetReadWordHandler(4, asic27a_sim_read); SekSetWriteWordHandler(4, asic27a_sim_write); SekClose(); @@ -440,7 +440,7 @@ void install_protection_asic27a_ddp3() asic27a_sim_command = ddp3_asic27a_sim_command; SekOpen(0); - SekMapHandler(4, 0x500000, 0x500005, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0x500000, 0x500005, SM_READ | SM_WRITE); SekSetReadWordHandler(4, asic27a_sim_read); SekSetWriteWordHandler(4, asic27a_sim_write); SekClose(); @@ -675,9 +675,9 @@ void install_protection_asic27a_oldsplus() asic27a_sim_command = oldsplus_asic27a_sim_command; SekOpen(0); - SekMapMemory(PGMUSER0, 0x4f0000, 0x4f003f | 0x3ff, MAP_READ); // ram + SekMapMemory(PGMUSER0, 0x4f0000, 0x4f003f | 0x3ff, SM_READ); // ram - SekMapHandler(4, 0x500000, 0x500003, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0x500000, 0x500003, SM_READ | SM_WRITE); SekSetReadWordHandler(4, asic27a_sim_read); SekSetWriteWordHandler(4, asic27a_sim_write); SekClose(); @@ -825,9 +825,9 @@ void install_protection_asic27_kov() asic27a_sim_command = kov_asic27a_sim_command; SekOpen(0); - SekMapMemory(PGMUSER0, 0x4f0000, 0x4f003f | 0x3ff, MAP_READ); + SekMapMemory(PGMUSER0, 0x4f0000, 0x4f003f | 0x3ff, SM_READ); - SekMapHandler(4, 0x500000, 0x500003, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0x500000, 0x500003, SM_READ | SM_WRITE); SekSetReadWordHandler(4, asic27a_sim_read); SekSetWriteWordHandler(4, asic27a_sim_write); SekClose(); @@ -1155,9 +1155,9 @@ void install_protection_asic27a_puzzli2() asic27a_sim_command = puzzli2_asic27a_sim_command; SekOpen(0); - SekMapMemory(PGMUSER0, 0x4f0000, 0x4f003f | 0x3ff, MAP_READ); + SekMapMemory(PGMUSER0, 0x4f0000, 0x4f003f | 0x3ff, SM_READ); - SekMapHandler(4, 0x500000, 0x500003, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0x500000, 0x500003, SM_READ | SM_WRITE); SekSetReadWordHandler(4, asic27a_sim_read); SekSetWriteWordHandler(4, asic27a_sim_write); SekClose(); @@ -1240,9 +1240,9 @@ void install_protection_asic27a_py2k2() asic27a_sim_command = py2k2_asic27a_sim_command; SekOpen(0); - SekMapMemory(PGMUSER0, 0x4f0000, 0x4f003f | 0x3ff, MAP_READ); + SekMapMemory(PGMUSER0, 0x4f0000, 0x4f003f | 0x3ff, SM_READ); - SekMapHandler(4, 0x500000, 0x500003, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0x500000, 0x500003, SM_READ | SM_WRITE); SekSetReadWordHandler(4, asic27a_sim_read); SekSetWriteWordHandler(4, asic27a_sim_write); SekClose(); @@ -1439,11 +1439,11 @@ void install_protection_asic27a_puzlstar() asic27a_sim_command = puzlstar_asic27a_sim_command; SekOpen(0); - SekMapHandler(4, 0x500000, 0x500003, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0x500000, 0x500003, SM_READ | SM_WRITE); SekSetReadWordHandler(4, asic27a_sim_read); SekSetWriteWordHandler(4, asic27a_sim_write); - SekMapHandler(5, 0x4f0000, 0x4f03ff, MAP_READ); + SekMapHandler(5, 0x4f0000, 0x4f03ff, SM_READ); SekSetReadWordHandler(5, puzlstar_protram_read_word); SekSetReadByteHandler(5, puzlstar_protram_read_byte); SekClose(); diff --git a/src/burn/drv/pgm/pgm_asic27a_type2.cpp b/src/burn/drv/pgm/pgm_asic27a_type2.cpp index 6716ca9a3..980237f8e 100644 --- a/src/burn/drv/pgm/pgm_asic27a_type2.cpp +++ b/src/burn/drv/pgm/pgm_asic27a_type2.cpp @@ -133,9 +133,9 @@ void install_protection_asic27a_martmast() SekOpen(0); - SekMapMemory(PGMARMShareRAM, 0xd00000, 0xd0ffff, MAP_RAM); + SekMapMemory(PGMARMShareRAM, 0xd00000, 0xd0ffff, SM_RAM); - SekMapHandler(4, 0xd10000, 0xd10003, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0xd10000, 0xd10003, SM_READ | SM_WRITE); SekSetReadWordHandler(4, asic27a_read_word); SekSetReadByteHandler(4, asic27a_read_byte); SekSetWriteWordHandler(4, asic27a_write_word); @@ -144,12 +144,12 @@ void install_protection_asic27a_martmast() Arm7Init(0); Arm7Open(0); - Arm7MapMemory(PGMARMROM, 0x00000000, 0x00003fff, MAP_ROM); - Arm7MapMemory(PGMUSER0, 0x08000000, 0x08000000+(nPGMExternalARMLen-1), MAP_ROM); - Arm7MapMemory(PGMARMRAM0, 0x10000000, 0x100003ff, MAP_RAM); - Arm7MapMemory(PGMARMRAM1, 0x18000000, 0x1800ffff, MAP_RAM); - Arm7MapMemory(PGMARMShareRAM, 0x48000000, 0x4800ffff, MAP_RAM); - Arm7MapMemory(PGMARMRAM2, 0x50000000, 0x500003ff, MAP_RAM); + Arm7MapMemory(PGMARMROM, 0x00000000, 0x00003fff, ARM7_ROM); + Arm7MapMemory(PGMUSER0, 0x08000000, 0x08000000+(nPGMExternalARMLen-1), ARM7_ROM); + Arm7MapMemory(PGMARMRAM0, 0x10000000, 0x100003ff, ARM7_RAM); + Arm7MapMemory(PGMARMRAM1, 0x18000000, 0x1800ffff, ARM7_RAM); + Arm7MapMemory(PGMARMShareRAM, 0x48000000, 0x4800ffff, ARM7_RAM); + Arm7MapMemory(PGMARMRAM2, 0x50000000, 0x500003ff, ARM7_RAM); Arm7SetWriteByteHandler(asic27a_arm7_write_byte); Arm7SetReadByteHandler(asic27a_arm7_read_byte); Arm7Close(); diff --git a/src/burn/drv/pgm/pgm_asic27a_type3.cpp b/src/burn/drv/pgm/pgm_asic27a_type3.cpp index a73e853a5..71efdfbbc 100644 --- a/src/burn/drv/pgm/pgm_asic27a_type3.cpp +++ b/src/burn/drv/pgm/pgm_asic27a_type3.cpp @@ -28,8 +28,8 @@ static inline void pgm_cpu_sync() static void svg_set_ram_bank(INT32 data) { svg_ram_sel = data & 1; - Arm7MapMemory(svg_ram[svg_ram_sel], 0x38000000, 0x3800ffff, MAP_RAM); - SekMapMemory(svg_ram[svg_ram_sel^1], 0x500000, 0x50ffff, MAP_RAM); + Arm7MapMemory(svg_ram[svg_ram_sel], 0x38000000, 0x3800ffff, ARM7_RAM); + SekMapMemory(svg_ram[svg_ram_sel^1], 0x500000, 0x50ffff, SM_RAM); } static void __fastcall svg_write_byte(UINT32 address, UINT8 data) @@ -155,7 +155,7 @@ void install_protection_asic27a_svg() svg_ram[1] = PGMARMShareRAM2; SekOpen(0); - SekMapHandler(5, 0x500000, 0x5fffff, MAP_RAM); + SekMapHandler(5, 0x500000, 0x5fffff, SM_RAM); SekSetReadWordHandler(5, svg_read_word); SekSetWriteWordHandler(5, svg_write_word); SekSetWriteByteHandler(5, svg_write_byte); @@ -163,12 +163,12 @@ void install_protection_asic27a_svg() Arm7Init(0); Arm7Open(0); - Arm7MapMemory(PGMARMROM, 0x00000000, 0x00003fff, MAP_ROM); - Arm7MapMemory(PGMUSER0, 0x08000000, 0x08000000 | (nPGMExternalARMLen-1), MAP_ROM); - Arm7MapMemory(PGMARMRAM0, 0x10000000, 0x100003ff, MAP_RAM); - Arm7MapMemory(PGMARMRAM1, 0x18000000, 0x1803ffff, MAP_RAM); - Arm7MapMemory(svg_ram[1], 0x38000000, 0x3800ffff, MAP_RAM); - Arm7MapMemory(PGMARMRAM2, 0x50000000, 0x500003ff, MAP_RAM); + Arm7MapMemory(PGMARMROM, 0x00000000, 0x00003fff, ARM7_ROM); + Arm7MapMemory(PGMUSER0, 0x08000000, 0x08000000 | (nPGMExternalARMLen-1), ARM7_ROM); + Arm7MapMemory(PGMARMRAM0, 0x10000000, 0x100003ff, ARM7_RAM); + Arm7MapMemory(PGMARMRAM1, 0x18000000, 0x1803ffff, ARM7_RAM); + Arm7MapMemory(svg_ram[1], 0x38000000, 0x3800ffff, ARM7_RAM); + Arm7MapMemory(PGMARMRAM2, 0x50000000, 0x500003ff, ARM7_RAM); Arm7SetWriteByteHandler(svg_arm7_write_byte); Arm7SetReadByteHandler(svg_arm7_read_byte); Arm7Close(); diff --git a/src/burn/drv/pgm/pgm_asic3.cpp b/src/burn/drv/pgm/pgm_asic3.cpp index 2e053b405..7778e12a5 100644 --- a/src/burn/drv/pgm/pgm_asic3.cpp +++ b/src/burn/drv/pgm/pgm_asic3.cpp @@ -165,7 +165,7 @@ void install_protection_asic3_orlegend() pPgmResetCallback = reset_asic3; SekOpen(0); - SekMapHandler(4, 0xc04000, 0xc0400f, MAP_READ | MAP_WRITE); + SekMapHandler(4, 0xc04000, 0xc0400f, SM_READ | SM_WRITE); SekSetReadWordHandler(4, asic3_read_word); SekSetWriteWordHandler(4, asic3_write_word); SekClose(); diff --git a/src/burn/drv/pgm/pgm_run.cpp b/src/burn/drv/pgm/pgm_run.cpp index 0f8cb9317..1c8a768fd 100644 --- a/src/burn/drv/pgm/pgm_run.cpp +++ b/src/burn/drv/pgm/pgm_run.cpp @@ -645,36 +645,36 @@ INT32 pgmInit() // ketsui and espgaluda if (BurnDrvGetHardwareCode() & HARDWARE_IGS_JAMMAPCB) { - SekMapMemory(PGM68KROM, 0x000000, (nPGM68KROMLen-1), MAP_ROM); // 68000 ROM (no bios) + SekMapMemory(PGM68KROM, 0x000000, (nPGM68KROMLen-1), SM_ROM); // 68000 ROM (no bios) } else { - SekMapMemory(PGM68KBIOS, 0x000000, 0x07ffff, MAP_ROM); // 68000 BIOS - SekMapMemory(PGM68KROM, 0x100000, (nPGM68KROMLen-1)+0x100000, MAP_ROM); // 68000 ROM + SekMapMemory(PGM68KBIOS, 0x000000, 0x07ffff, SM_ROM); // 68000 BIOS + SekMapMemory(PGM68KROM, 0x100000, (nPGM68KROMLen-1)+0x100000, SM_ROM); // 68000 ROM } for (INT32 i = 0; i < 0x100000; i+=0x20000) { // Main Ram + Mirrors... - SekMapMemory(PGM68KRAM, 0x800000 | i, 0x81ffff | i, MAP_RAM); + SekMapMemory(PGM68KRAM, 0x800000 | i, 0x81ffff | i, SM_RAM); } // Ripped from FBA Shuffle. for (INT32 i = 0; i < 0x100000; i+=0x08000) { // Video Ram + Mirrors... - SekMapMemory((UINT8 *)PGMBgRAM, 0x900000 | i, 0x900fff | i, MAP_RAM); - SekMapMemory((UINT8 *)PGMBgRAM, 0x901000 | i, 0x901fff | i, MAP_RAM); // mirror - SekMapMemory((UINT8 *)PGMBgRAM, 0x902000 | i, 0x902fff | i, MAP_RAM); // mirror - SekMapMemory((UINT8 *)PGMBgRAM, 0x903000 | i, 0x904fff | i, MAP_RAM); // mirror + SekMapMemory((UINT8 *)PGMBgRAM, 0x900000 | i, 0x900fff | i, SM_RAM); + SekMapMemory((UINT8 *)PGMBgRAM, 0x901000 | i, 0x901fff | i, SM_RAM); // mirror + SekMapMemory((UINT8 *)PGMBgRAM, 0x902000 | i, 0x902fff | i, SM_RAM); // mirror + SekMapMemory((UINT8 *)PGMBgRAM, 0x903000 | i, 0x904fff | i, SM_RAM); // mirror - SekMapMemory((UINT8 *)PGMTxtRAM, 0x904000 | i, 0x905fff | i, MAP_RAM); - SekMapMemory((UINT8 *)PGMTxtRAM, 0x906000 | i, 0x906fff | i, MAP_RAM); // mirror + SekMapMemory((UINT8 *)PGMTxtRAM, 0x904000 | i, 0x905fff | i, SM_RAM); + SekMapMemory((UINT8 *)PGMTxtRAM, 0x906000 | i, 0x906fff | i, SM_RAM); // mirror - SekMapMemory((UINT8 *)PGMRowRAM, 0x907000 | i, 0x907fff | i, MAP_RAM); + SekMapMemory((UINT8 *)PGMRowRAM, 0x907000 | i, 0x907fff | i, SM_RAM); } - SekMapMemory((UINT8 *)PGMPalRAM, 0xa00000, 0xa013ff, MAP_ROM); // palette - SekMapMemory((UINT8 *)PGMVidReg, 0xb00000, 0xb0ffff, MAP_RAM); // should be mirrored? + SekMapMemory((UINT8 *)PGMPalRAM, 0xa00000, 0xa013ff, SM_ROM); // palette + SekMapMemory((UINT8 *)PGMVidReg, 0xb00000, 0xb0ffff, SM_RAM); // should be mirrored? - SekMapHandler(1, 0xa00000, 0xa013ff, MAP_WRITE); - SekMapHandler(2, 0xc10000, 0xc1ffff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xa00000, 0xa013ff, SM_WRITE); + SekMapHandler(2, 0xc10000, 0xc1ffff, SM_READ | SM_WRITE); SekSetReadWordHandler(0, PgmReadWord); SekSetReadByteHandler(0, PgmReadByte); diff --git a/src/burn/drv/pre90s/d_alinvade.cpp b/src/burn/drv/pre90s/d_alinvade.cpp index d1fc12c08..562b5fdbb 100644 --- a/src/burn/drv/pre90s/d_alinvade.cpp +++ b/src/burn/drv/pre90s/d_alinvade.cpp @@ -161,11 +161,11 @@ static INT32 DrvInit() M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(Drv6502RAM, 0x0000, 0x01ff, MAP_RAM); - M6502MapMemory(DrvVidRAM, 0x0400, 0x0fff, MAP_RAM); + M6502MapMemory(Drv6502RAM, 0x0000, 0x01ff, M6502_RAM); + M6502MapMemory(DrvVidRAM, 0x0400, 0x0fff, M6502_RAM); for (INT32 i = 0; i < 0x1000; i+=0x100) - M6502MapMemory(DrvProtPROM, 0xc000+i, 0xc0ff+i, MAP_ROM); // mirrored - M6502MapMemory(Drv6502ROM, 0xe000, 0xffff, MAP_ROM); + M6502MapMemory(DrvProtPROM, 0xc000+i, 0xc0ff+i, M6502_ROM); // mirrored + M6502MapMemory(Drv6502ROM, 0xe000, 0xffff, M6502_ROM); M6502SetWriteHandler(alinvade_write); M6502SetReadHandler(alinvade_read); M6502Close(); diff --git a/src/burn/drv/pre90s/d_alpha68k.cpp b/src/burn/drv/pre90s/d_alpha68k.cpp index 2fad335c3..7fe8cd117 100644 --- a/src/burn/drv/pre90s/d_alpha68k.cpp +++ b/src/burn/drv/pre90s/d_alpha68k.cpp @@ -725,9 +725,9 @@ static INT32 SstingryInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(DrvSharedRam , 0x020000, 0x020fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x040000, 0x041fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(DrvSharedRam , 0x020000, 0x020fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x040000, 0x041fff, SM_RAM); SekSetReadByteHandler(0, Kyros68KReadByte); SekSetWriteByteHandler(0, Kyros68KWriteByte); SekSetReadWordHandler(0, Kyros68KReadWord); @@ -839,9 +839,9 @@ static INT32 KyrosInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(DrvSharedRam , 0x020000, 0x020fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x040000, 0x041fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(DrvSharedRam , 0x020000, 0x020fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x040000, 0x041fff, SM_RAM); SekSetReadByteHandler(0, Kyros68KReadByte); SekSetWriteByteHandler(0, Kyros68KWriteByte); SekSetReadWordHandler(0, Kyros68KReadWord); diff --git a/src/burn/drv/pre90s/d_ambush.cpp b/src/burn/drv/pre90s/d_ambush.cpp index 6db337634..3cc3ed22b 100644 --- a/src/burn/drv/pre90s/d_ambush.cpp +++ b/src/burn/drv/pre90s/d_ambush.cpp @@ -479,7 +479,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(4000000 / 60); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_arabian.cpp b/src/burn/drv/pre90s/d_arabian.cpp index 77324623a..7788f93d8 100644 --- a/src/burn/drv/pre90s/d_arabian.cpp +++ b/src/burn/drv/pre90s/d_arabian.cpp @@ -591,7 +591,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(3000000 / 60); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_armedf.cpp b/src/burn/drv/pre90s/d_armedf.cpp index 3625f9243..46bd5c366 100644 --- a/src/burn/drv/pre90s/d_armedf.cpp +++ b/src/burn/drv/pre90s/d_armedf.cpp @@ -785,29 +785,29 @@ static INT32 DrvGfxDecode() static void Armedf68KInit() { - SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x060000, 0x060fff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x061000, 0x065fff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x066000, 0x066fff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x067000, 0x067fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x068000, 0x069fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x06a000, 0x06afff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x06b000, 0x06bfff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x06c000, 0x06c7ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x060000, 0x060fff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x061000, 0x065fff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x066000, 0x066fff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x067000, 0x067fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x068000, 0x069fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x06a000, 0x06afff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x06b000, 0x06bfff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x06c000, 0x06c7ff, SM_RAM); SekSetWriteWordHandler(0, armedf_write_word); } static void Cclimbr268KInit() { - SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x060000, 0x060fff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x061000, 0x063fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x064000, 0x064fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x068000, 0x069fff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x06a000, 0x06a9ff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x06c000, 0x06c9ff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x070000, 0x070fff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x074000, 0x074fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x060000, 0x060fff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x061000, 0x063fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x064000, 0x064fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x068000, 0x069fff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x06a000, 0x06a9ff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x06c000, 0x06c9ff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x070000, 0x070fff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x074000, 0x074fff, SM_RAM); SekSetWriteWordHandler(0, cclimbr2_write_word); SekSetWriteByteHandler(0, cclimbr2_write_byte); SekSetReadWordHandler(0, cclimbr2_read_word); diff --git a/src/burn/drv/pre90s/d_atetris.cpp b/src/burn/drv/pre90s/d_atetris.cpp index deb07cbd2..217424b7d 100644 --- a/src/burn/drv/pre90s/d_atetris.cpp +++ b/src/burn/drv/pre90s/d_atetris.cpp @@ -290,15 +290,15 @@ static INT32 CommonInit(INT32 boot) M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(Drv6502RAM, 0x0000, 0x0fff, MAP_RAM); - M6502MapMemory(DrvVidRAM, 0x1000, 0x1fff, MAP_RAM); - M6502MapMemory(DrvPalRAM, 0x2000, 0x20ff, MAP_ROM); - M6502MapMemory(DrvPalRAM, 0x2100, 0x21ff, MAP_ROM); - M6502MapMemory(DrvPalRAM, 0x2200, 0x22ff, MAP_ROM); - M6502MapMemory(DrvPalRAM, 0x2300, 0x23ff, MAP_ROM); - M6502MapMemory(DrvNVRAM, 0x2400, 0x25ff, MAP_ROM); - M6502MapMemory(DrvNVRAM, 0x2600, 0x27ff, MAP_ROM); - M6502MapMemory(Drv6502ROM + 0x8000, 0x8000, 0xffff, MAP_ROM); + M6502MapMemory(Drv6502RAM, 0x0000, 0x0fff, M6502_RAM); + M6502MapMemory(DrvVidRAM, 0x1000, 0x1fff, M6502_RAM); + M6502MapMemory(DrvPalRAM, 0x2000, 0x20ff, M6502_ROM); + M6502MapMemory(DrvPalRAM, 0x2100, 0x21ff, M6502_ROM); + M6502MapMemory(DrvPalRAM, 0x2200, 0x22ff, M6502_ROM); + M6502MapMemory(DrvPalRAM, 0x2300, 0x23ff, M6502_ROM); + M6502MapMemory(DrvNVRAM, 0x2400, 0x25ff, M6502_ROM); + M6502MapMemory(DrvNVRAM, 0x2600, 0x27ff, M6502_ROM); + M6502MapMemory(Drv6502ROM + 0x8000, 0x8000, 0xffff, M6502_ROM); M6502SetReadHandler(atetris_read); M6502SetReadOpHandler(atetris_read); M6502SetReadOpArgHandler(atetris_read); diff --git a/src/burn/drv/pre90s/d_aztarac.cpp b/src/burn/drv/pre90s/d_aztarac.cpp index f8f42a5b0..cd166df87 100644 --- a/src/burn/drv/pre90s/d_aztarac.cpp +++ b/src/burn/drv/pre90s/d_aztarac.cpp @@ -380,10 +380,10 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); SekSetIrqCallback(aztarac_irq_callback); - SekMapMemory(Drv68KROM, 0x000000, 0x00bfff, MAP_ROM); - SekMapMemory(DrvNVRAM, 0x022000, 0x0223ff, MAP_ROM); - SekMapMemory(DrvVecRAM, 0xff8000, 0xffafff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xffe000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x00bfff, SM_ROM); + SekMapMemory(DrvNVRAM, 0x022000, 0x0223ff, SM_ROM); + SekMapMemory(DrvVecRAM, 0xff8000, 0xffafff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xffe000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, aztarac_write_word); SekSetWriteByteHandler(0, aztarac_write_byte); SekSetReadWordHandler(0, aztarac_read_word); diff --git a/src/burn/drv/pre90s/d_baraduke.cpp b/src/burn/drv/pre90s/d_baraduke.cpp index 90f33b52b..b8e833b4d 100644 --- a/src/burn/drv/pre90s/d_baraduke.cpp +++ b/src/burn/drv/pre90s/d_baraduke.cpp @@ -488,20 +488,20 @@ static INT32 DrvInit(INT32 type) M6809Init(1); M6809Open(0); - M6809MapMemory(DrvSprRAM, 0x0000, 0x1fff, MAP_READ | MAP_FETCH); - M6809MapMemory(DrvSprRAM, 0x0000, 0x1eff, MAP_WRITE); - M6809MapMemory(DrvVidRAM, 0x2000, 0x3fff, MAP_RAM); - M6809MapMemory(DrvTxtRAM, 0x4800, 0x4fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x06000, 0x6000, 0xffff, MAP_ROM); + M6809MapMemory(DrvSprRAM, 0x0000, 0x1fff, M6809_READ | M6809_FETCH); + M6809MapMemory(DrvSprRAM, 0x0000, 0x1eff, M6809_WRITE); + M6809MapMemory(DrvVidRAM, 0x2000, 0x3fff, M6809_RAM); + M6809MapMemory(DrvTxtRAM, 0x4800, 0x4fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x06000, 0x6000, 0xffff, M6809_ROM); M6809SetWriteHandler(baraduke_main_write); M6809SetReadHandler(baraduke_main_read); M6809Close(); HD63701Init(1); // HD63701Open(0); - HD63701MapMemory(DrvHD63701ROM + 0x8000, 0x8000, 0xbfff, MAP_ROM); - HD63701MapMemory(DrvHD63701RAM, 0xc000, 0xc7ff, MAP_RAM); - HD63701MapMemory(DrvHD63701ROM + 0xf000, 0xf000, 0xffff, MAP_ROM); + HD63701MapMemory(DrvHD63701ROM + 0x8000, 0x8000, 0xbfff, HD63701_ROM); + HD63701MapMemory(DrvHD63701RAM, 0xc000, 0xc7ff, HD63701_RAM); + HD63701MapMemory(DrvHD63701ROM + 0xf000, 0xf000, 0xffff, HD63701_ROM); HD63701SetReadHandler(baraduke_mcu_read); HD63701SetWriteHandler(baraduke_mcu_write); HD63701SetReadPortHandler(baraduke_mcu_read_port); diff --git a/src/burn/drv/pre90s/d_bionicc.cpp b/src/burn/drv/pre90s/d_bionicc.cpp index af7f6ca18..b2279f69c 100644 --- a/src/burn/drv/pre90s/d_bionicc.cpp +++ b/src/burn/drv/pre90s/d_bionicc.cpp @@ -417,13 +417,13 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0xfe0000, 0xfe3fff, MAP_RAM); - SekMapMemory(DrvTextRAM, 0xfec000, 0xfecfff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0xff0000, 0xff3fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0xff4000, 0xff7fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xff8000, 0xff87ff, MAP_ROM); - SekMapMemory(Drv68KRAM1, 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0xfe0000, 0xfe3fff, SM_RAM); + SekMapMemory(DrvTextRAM, 0xfec000, 0xfecfff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0xff0000, 0xff3fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0xff4000, 0xff7fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xff8000, 0xff87ff, SM_ROM); + SekMapMemory(Drv68KRAM1, 0xffc000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, bionicc_read_byte); SekSetReadWordHandler(0, bionicc_read_word); SekSetWriteByteHandler(0, bionicc_write_byte); diff --git a/src/burn/drv/pre90s/d_blockout.cpp b/src/burn/drv/pre90s/d_blockout.cpp index 10834ea20..9bdfdd2e5 100644 --- a/src/burn/drv/pre90s/d_blockout.cpp +++ b/src/burn/drv/pre90s/d_blockout.cpp @@ -430,13 +430,13 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvVidRAM0, 0x180000, 0x1bffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x1d4000, 0x1dffff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x1f4000, 0x1fffff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x200000, 0x207fff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x208000, 0x21ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x280200, 0x2805ff, MAP_ROM); // maps 280000 - 2707ff + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvVidRAM0, 0x180000, 0x1bffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x1d4000, 0x1dffff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x1f4000, 0x1fffff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x200000, 0x207fff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x208000, 0x21ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x280200, 0x2805ff, SM_ROM); // maps 280000 - 2707ff SekSetWriteByteHandler(0, blockout_write_byte); SekSetWriteWordHandler(0, blockout_write_word); SekSetReadByteHandler(0, blockout_read_byte); diff --git a/src/burn/drv/pre90s/d_capbowl.cpp b/src/burn/drv/pre90s/d_capbowl.cpp index c7daf2821..a31ccb0d8 100644 --- a/src/burn/drv/pre90s/d_capbowl.cpp +++ b/src/burn/drv/pre90s/d_capbowl.cpp @@ -80,7 +80,7 @@ static void bankswitch(INT32 d) int bank = 0x08000 + (((d & 0x0c) >> 1) | (d & 1)) * 0x4000; - M6809MapMemory(DrvMainROM + bank, 0x0000, 0x3fff, MAP_ROM); + M6809MapMemory(DrvMainROM + bank, 0x0000, 0x3fff, M6809_ROM); } static void main_write(UINT16 a, UINT8 d) @@ -363,15 +363,15 @@ static INT32 DrvInit(INT32 game) M6809Init(2); M6809Open(0); - M6809MapMemory(DrvNVRAM, 0x5000, 0x57ff, MAP_RAM); - M6809MapMemory(DrvMainROM, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvNVRAM, 0x5000, 0x57ff, M6809_RAM); + M6809MapMemory(DrvMainROM, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(main_write); M6809SetReadHandler(main_read); M6809Close(); M6809Open(1); - M6809MapMemory(DrvSoundRAM, 0x0000, 0x07ff, MAP_RAM); - M6809MapMemory(DrvSoundROM, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvSoundRAM, 0x0000, 0x07ff, M6809_RAM); + M6809MapMemory(DrvSoundROM, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(sound_write); M6809SetReadHandler(sound_read); M6809Close(); diff --git a/src/burn/drv/pre90s/d_commando.cpp b/src/burn/drv/pre90s/d_commando.cpp index 745513f2a..7fc67369e 100644 --- a/src/burn/drv/pre90s/d_commando.cpp +++ b/src/burn/drv/pre90s/d_commando.cpp @@ -1026,7 +1026,7 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); if (i == 24) { ZetSetVector(0xd7); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); } ZetClose(); diff --git a/src/burn/drv/pre90s/d_cybertnk.cpp b/src/burn/drv/pre90s/d_cybertnk.cpp index 3ad8d4e96..944bceb4b 100644 --- a/src/burn/drv/pre90s/d_cybertnk.cpp +++ b/src/burn/drv/pre90s/d_cybertnk.cpp @@ -548,15 +548,15 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM0, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x080000, 0x087fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x0a0000, 0x0a0fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x0c0000, 0x0c1fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x0c4000, 0x0c5fff, MAP_RAM); - SekMapMemory(DrvVidRAM2, 0x0c8000, 0x0c9fff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0x0e0000, 0x0e0fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x100000, 0x103fff, MAP_ROM); - SekMapMemory(DrvPalRAM + 0x4000,0x104000, 0x107fff, MAP_RAM); // Copy of first half + SekMapMemory(Drv68KROM0, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x080000, 0x087fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x0a0000, 0x0a0fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x0c0000, 0x0c1fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x0c4000, 0x0c5fff, SM_RAM); + SekMapMemory(DrvVidRAM2, 0x0c8000, 0x0c9fff, SM_RAM); + SekMapMemory(DrvShareRAM, 0x0e0000, 0x0e0fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x100000, 0x103fff, SM_ROM); + SekMapMemory(DrvPalRAM + 0x4000,0x104000, 0x107fff, SM_RAM); // Copy of first half SekSetWriteByteHandler(0, cybertnk_main_write_byte); SekSetWriteWordHandler(0, cybertnk_main_write_word); SekSetReadByteHandler(0, cybertnk_main_read_byte); @@ -565,10 +565,10 @@ static INT32 DrvInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Drv68KROM1, 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(Drv68KRAM1, 0x080000, 0x083fff, MAP_RAM); - SekMapMemory(DrvRoadRAM, 0x0c0000, 0x0c0fff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0x100000, 0x100fff, MAP_RAM); + SekMapMemory(Drv68KROM1, 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(Drv68KRAM1, 0x080000, 0x083fff, SM_RAM); + SekMapMemory(DrvRoadRAM, 0x0c0000, 0x0c0fff, SM_RAM); + SekMapMemory(DrvShareRAM, 0x100000, 0x100fff, SM_RAM); SekClose(); ZetInit(0); diff --git a/src/burn/drv/pre90s/d_ddragon.cpp b/src/burn/drv/pre90s/d_ddragon.cpp index 9371a605c..da284a137 100644 --- a/src/burn/drv/pre90s/d_ddragon.cpp +++ b/src/burn/drv/pre90s/d_ddragon.cpp @@ -1057,7 +1057,7 @@ void DrvDdragonHD6309WriteByte(UINT16 Address, UINT8 Data) case 0x3808: { UINT8 DrvOldRomBank = DrvRomBank; DrvRomBank = (Data & 0xe0) >> 5; - HD6309MapMemory(DrvHD6309Rom + 0x8000 + (DrvRomBank * 0x4000), 0x4000, 0x7fff, MAP_ROM); + HD6309MapMemory(DrvHD6309Rom + 0x8000 + (DrvRomBank * 0x4000), 0x4000, 0x7fff, M6809_ROM); DrvScrollXHi = (Data & 0x01) << 8; DrvScrollYHi = (Data & 0x02) << 7; @@ -1092,10 +1092,10 @@ void DrvDdragonHD6309WriteByte(UINT16 Address, UINT8 Data) if (DrvGameType == DD_GAME_DARKTOWR) { if (DrvRomBank == 4 && DrvOldRomBank != 4) { - HD6309MemCallback(0x4000, 0x7fff, MAP_RAM); + HD6309MemCallback(0x4000, 0x7fff, HD6309_RAM); } else { if (DrvRomBank != 4 && DrvOldRomBank == 4) { - HD6309MapMemory(DrvHD6309Rom + 0x8000 + (DrvRomBank * 0x4000), 0x4000, 0x7fff, MAP_ROM); + HD6309MapMemory(DrvHD6309Rom + 0x8000 + (DrvRomBank * 0x4000), 0x4000, 0x7fff, M6809_ROM); } } } @@ -1897,21 +1897,21 @@ static INT32 DrvMachineInit() HD6309Init(0); HD6309Open(0); - HD6309MapMemory(DrvHD6309Ram , 0x0000, 0x0fff, MAP_RAM); - HD6309MapMemory(DrvPaletteRam1 , 0x1000, 0x11ff, MAP_RAM); - HD6309MapMemory(DrvPaletteRam2 , 0x1200, 0x13ff, MAP_RAM); - HD6309MapMemory(DrvFgVideoRam , 0x1800, 0x1fff, MAP_RAM); - HD6309MapMemory(DrvSpriteRam , 0x2000, 0x2fff, MAP_WRITE); - HD6309MapMemory(DrvBgVideoRam , 0x3000, 0x37ff, MAP_RAM); - HD6309MapMemory(DrvHD6309Rom + 0x8000, 0x4000, 0x7fff, MAP_ROM); - HD6309MapMemory(DrvHD6309Rom , 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(DrvHD6309Ram , 0x0000, 0x0fff, M6809_RAM); + HD6309MapMemory(DrvPaletteRam1 , 0x1000, 0x11ff, M6809_RAM); + HD6309MapMemory(DrvPaletteRam2 , 0x1200, 0x13ff, M6809_RAM); + HD6309MapMemory(DrvFgVideoRam , 0x1800, 0x1fff, M6809_RAM); + HD6309MapMemory(DrvSpriteRam , 0x2000, 0x2fff, M6809_WRITE); + HD6309MapMemory(DrvBgVideoRam , 0x3000, 0x37ff, M6809_RAM); + HD6309MapMemory(DrvHD6309Rom + 0x8000, 0x4000, 0x7fff, M6809_ROM); + HD6309MapMemory(DrvHD6309Rom , 0x8000, 0xffff, M6809_ROM); HD6309SetReadHandler(DrvDdragonHD6309ReadByte); HD6309SetWriteHandler(DrvDdragonHD6309WriteByte); HD6309Close(); if (DrvSubCPUType == DD_CPU_TYPE_HD63701) { HD63701Init(1); - HD63701MapMemory(DrvSubCPURom , 0xc000, 0xffff, MAP_ROM); + HD63701MapMemory(DrvSubCPURom , 0xc000, 0xffff, HD63701_ROM); HD63701SetReadHandler(DrvDdragonHD63701ReadByte); HD63701SetWriteHandler(DrvDdragonHD63701WriteByte); } @@ -1919,7 +1919,7 @@ static INT32 DrvMachineInit() if (DrvSubCPUType == DD_CPU_TYPE_HD6309) { HD6309Init(1); HD6309Open(1); - HD6309MapMemory(DrvSubCPURom , 0xc000, 0xffff, MAP_ROM); + HD6309MapMemory(DrvSubCPURom , 0xc000, 0xffff, HD6309_ROM); HD6309SetReadHandler(DrvDdragonbSubHD6309ReadByte); HD6309SetWriteHandler(DrvDdragonbSubHD6309WriteByte); HD6309Close(); @@ -1927,7 +1927,7 @@ static INT32 DrvMachineInit() if (DrvSubCPUType == DD_CPU_TYPE_M6803) { M6803Init(1); - M6803MapMemory(DrvSubCPURom , 0xc000, 0xffff, MAP_ROM); + M6803MapMemory(DrvSubCPURom , 0xc000, 0xffff, M6803_ROM); M6803SetReadHandler(DrvDdragonbaM6803ReadByte); M6803SetWriteHandler(DrvDdragonbaM6803WriteByte); M6803SetWritePortHandler(DrvDdragonbaM6803WritePort); @@ -1936,8 +1936,8 @@ static INT32 DrvMachineInit() if (DrvSoundCPUType == DD_CPU_TYPE_M6809) { M6809Init(1); M6809Open(0); - M6809MapMemory(DrvSoundCPURam , 0x0000, 0x0fff, MAP_RAM); - M6809MapMemory(DrvSoundCPURom , 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvSoundCPURam , 0x0000, 0x0fff, M6809_RAM); + M6809MapMemory(DrvSoundCPURom , 0x8000, 0xffff, M6809_ROM); M6809SetReadHandler(DrvDdragonM6809ReadByte); M6809SetWriteHandler(DrvDdragonM6809WriteByte); M6809Close(); @@ -1954,8 +1954,8 @@ static INT32 DrvMachineInit() if (DrvGameType == DD_GAME_DARKTOWR) { m6805Init(1, 0x800); - m6805MapMemory(DrvMCURom + 0x80, 0x080, 0x7ff, MAP_ROM); - m6805MapMemory(DrvMCURom, 0x008, 0x07f, MAP_RAM); + m6805MapMemory(DrvMCURom + 0x80, 0x080, 0x7ff, M6805_ROM); + m6805MapMemory(DrvMCURom, 0x008, 0x07f, M6805_RAM); m6805SetReadHandler(DrvMCUReadByte); m6805SetWriteHandler(DrvMCUWriteByte); } @@ -1977,14 +1977,14 @@ static INT32 Drv2MachineInit() // Setup the HD6309 emulation HD6309Init(0); HD6309Open(0); - HD6309MapMemory(DrvHD6309Ram , 0x0000, 0x17ff, MAP_RAM); - HD6309MapMemory(DrvFgVideoRam , 0x1800, 0x1fff, MAP_RAM); - HD6309MapMemory(DrvSpriteRam , 0x2000, 0x2fff, MAP_WRITE); - HD6309MapMemory(DrvBgVideoRam , 0x3000, 0x37ff, MAP_RAM); - HD6309MapMemory(DrvPaletteRam1 , 0x3c00, 0x3dff, MAP_RAM); - HD6309MapMemory(DrvPaletteRam2 , 0x3e00, 0x3fff, MAP_RAM); - HD6309MapMemory(DrvHD6309Rom + 0x8000, 0x4000, 0x7fff, MAP_ROM); - HD6309MapMemory(DrvHD6309Rom , 0x8000, 0xffff, MAP_ROM); + HD6309MapMemory(DrvHD6309Ram , 0x0000, 0x17ff, M6809_RAM); + HD6309MapMemory(DrvFgVideoRam , 0x1800, 0x1fff, M6809_RAM); + HD6309MapMemory(DrvSpriteRam , 0x2000, 0x2fff, M6809_WRITE); + HD6309MapMemory(DrvBgVideoRam , 0x3000, 0x37ff, M6809_RAM); + HD6309MapMemory(DrvPaletteRam1 , 0x3c00, 0x3dff, M6809_RAM); + HD6309MapMemory(DrvPaletteRam2 , 0x3e00, 0x3fff, M6809_RAM); + HD6309MapMemory(DrvHD6309Rom + 0x8000, 0x4000, 0x7fff, M6809_ROM); + HD6309MapMemory(DrvHD6309Rom , 0x8000, 0xffff, M6809_ROM); HD6309SetReadHandler(DrvDdragonHD6309ReadByte); HD6309SetWriteHandler(DrvDdragonHD6309WriteByte); HD6309Close(); @@ -2607,7 +2607,7 @@ static INT32 DrvScan(INT32 nAction, INT32 *pnMin) if (nAction & ACB_WRITE) { HD6309Open(0); - HD6309MapMemory(DrvHD6309Rom + 0x8000 + (DrvRomBank * 0x4000), 0x4000, 0x7fff, MAP_ROM); + HD6309MapMemory(DrvHD6309Rom + 0x8000 + (DrvRomBank * 0x4000), 0x4000, 0x7fff, M6809_ROM); HD6309Close(); if (DrvSubCPUBusy == 0) { diff --git a/src/burn/drv/pre90s/d_dkong.cpp b/src/burn/drv/pre90s/d_dkong.cpp index 02576b39b..b01afbdd1 100644 --- a/src/burn/drv/pre90s/d_dkong.cpp +++ b/src/burn/drv/pre90s/d_dkong.cpp @@ -1537,16 +1537,16 @@ static INT32 Dkong3Init() M6502Init(0, TYPE_N2A03); M6502Open(0); - M6502MapMemory(DrvSndRAM0, 0x0000, 0x01ff, MAP_RAM); - M6502MapMemory(DrvSndROM0, 0xe000, 0xffff, MAP_ROM); + M6502MapMemory(DrvSndRAM0, 0x0000, 0x01ff, M6502_RAM); + M6502MapMemory(DrvSndROM0, 0xe000, 0xffff, M6502_ROM); M6502SetWriteHandler(dkong3_sound0_write); M6502SetReadHandler(dkong3_sound0_read); M6502Close(); M6502Init(1, TYPE_N2A03); M6502Open(1); - M6502MapMemory(DrvSndRAM1, 0x0000, 0x01ff, MAP_RAM); - M6502MapMemory(DrvSndROM1, 0xe000, 0xffff, MAP_ROM); + M6502MapMemory(DrvSndRAM1, 0x0000, 0x01ff, M6502_RAM); + M6502MapMemory(DrvSndROM1, 0xe000, 0xffff, M6502_ROM); M6502SetWriteHandler(dkong3_sound1_write); M6502SetReadHandler(dkong3_sound1_read); M6502Close(); @@ -1645,14 +1645,14 @@ static INT32 s2650DkongInit(INT32 (*pRomLoadCallback)()) s2650Init(1); s2650Open(0); - s2650MapMemory(Drv2650ROM + 0x0000, 0x0000, 0x0fff, MAP_ROM); - s2650MapMemory(Drv2650RAM + 0x0000, 0x1000, 0x13ff, MAP_RAM); // sprite ram (after dma) - s2650MapMemory(DrvSprRAM + 0x0000, 0x1600, 0x17ff, MAP_RAM); - s2650MapMemory(DrvVidRAM + 0x0000, 0x1800, 0x1bff, MAP_RAM); - s2650MapMemory(DrvSprRAM + 0x0400, 0x1c00, 0x1eff, MAP_RAM); - s2650MapMemory(Drv2650ROM + 0x2000, 0x2000, 0x2fff, MAP_ROM); - s2650MapMemory(Drv2650ROM + 0x4000, 0x4000, 0x4fff, MAP_ROM); - s2650MapMemory(Drv2650ROM + 0x6000, 0x6000, 0x6fff, MAP_ROM); + s2650MapMemory(Drv2650ROM + 0x0000, 0x0000, 0x0fff, S2650_ROM); + s2650MapMemory(Drv2650RAM + 0x0000, 0x1000, 0x13ff, S2650_RAM); // sprite ram (after dma) + s2650MapMemory(DrvSprRAM + 0x0000, 0x1600, 0x17ff, S2650_RAM); + s2650MapMemory(DrvVidRAM + 0x0000, 0x1800, 0x1bff, S2650_RAM); + s2650MapMemory(DrvSprRAM + 0x0400, 0x1c00, 0x1eff, S2650_RAM); + s2650MapMemory(Drv2650ROM + 0x2000, 0x2000, 0x2fff, S2650_ROM); + s2650MapMemory(Drv2650ROM + 0x4000, 0x4000, 0x4fff, S2650_ROM); + s2650MapMemory(Drv2650ROM + 0x6000, 0x6000, 0x6fff, S2650_ROM); s2650SetIrqCallback(s2650_irq_callback); s2650SetWriteHandler(s2650_main_write); s2650SetReadHandler(s2650_main_read); diff --git a/src/burn/drv/pre90s/d_epos.cpp b/src/burn/drv/pre90s/d_epos.cpp index b3beb68e0..3b54f0d9e 100644 --- a/src/burn/drv/pre90s/d_epos.cpp +++ b/src/burn/drv/pre90s/d_epos.cpp @@ -627,7 +627,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(2750000 / 60); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_funkybee.cpp b/src/burn/drv/pre90s/d_funkybee.cpp index 0be14709d..949dddf30 100644 --- a/src/burn/drv/pre90s/d_funkybee.cpp +++ b/src/burn/drv/pre90s/d_funkybee.cpp @@ -571,7 +571,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(3072000 / 60); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_gauntlet.cpp b/src/burn/drv/pre90s/d_gauntlet.cpp index 90ef970a1..f76ea5808 100644 --- a/src/burn/drv/pre90s/d_gauntlet.cpp +++ b/src/burn/drv/pre90s/d_gauntlet.cpp @@ -416,7 +416,7 @@ void atarigen_SlapsticInit(INT32 base, INT32 chipnum) //atarigen_slapstic = install_mem_read_handler(cpunum, base, base + 0x7fff, atarigen_slapstic_r); //atarigen_slapstic = install_mem_write_handler(cpunum, base, base + 0x7fff, atarigen_slapstic_w); SekOpen(0); - SekMapHandler(1, base, base + 0x7fff, MAP_RAM); + SekMapHandler(1, base, base + 0x7fff, SM_RAM); SekSetReadByteHandler(1, atarigen_slapstic_r); SekSetReadWordHandler(1, atarigen_slapstic_r_word); SekSetWriteByteHandler(1, atarigen_slapstic_w); @@ -2048,13 +2048,13 @@ static INT32 DrvInit() // Setup the 68000 emulation SekInit(0, 0x68010); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPlayfieldRam , 0x900000, 0x901fff, MAP_RAM); - SekMapMemory(DrvMOSpriteRam , 0x902000, 0x903fff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x2000 , 0x904000, 0x904fff, MAP_RAM); - SekMapMemory(DrvAlphaRam , 0x905000, 0x905f7f, MAP_RAM); - SekMapMemory(DrvMOSlipRam , 0x905f80, 0x905fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x910000, 0x9107ff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPlayfieldRam , 0x900000, 0x901fff, SM_RAM); + SekMapMemory(DrvMOSpriteRam , 0x902000, 0x903fff, SM_RAM); + SekMapMemory(Drv68KRam + 0x2000 , 0x904000, 0x904fff, SM_RAM); + SekMapMemory(DrvAlphaRam , 0x905000, 0x905f7f, SM_RAM); + SekMapMemory(DrvMOSlipRam , 0x905f80, 0x905fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x910000, 0x9107ff, SM_RAM); SekSetReadByteHandler(0, Gauntlet68KReadByte); SekSetWriteByteHandler(0, Gauntlet68KWriteByte); SekSetReadWordHandler(0, Gauntlet68KReadWord); @@ -2063,8 +2063,8 @@ static INT32 DrvInit() M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502Ram , 0x0000, 0x0fff, MAP_RAM); - M6502MapMemory(DrvM6502Rom , 0x4000, 0xffff, MAP_ROM); + M6502MapMemory(DrvM6502Ram , 0x0000, 0x0fff, M6502_RAM); + M6502MapMemory(DrvM6502Rom , 0x4000, 0xffff, M6502_ROM); M6502SetReadHandler(GauntletSoundRead); M6502SetWriteHandler(GauntletSoundWrite); M6502Close(); @@ -2160,13 +2160,13 @@ static INT32 Gaunt2pInit() // Setup the 68000 emulation SekInit(0, 0x68010); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPlayfieldRam , 0x900000, 0x901fff, MAP_RAM); - SekMapMemory(DrvMOSpriteRam , 0x902000, 0x903fff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x2000 , 0x904000, 0x904fff, MAP_RAM); - SekMapMemory(DrvAlphaRam , 0x905000, 0x905f7f, MAP_RAM); - SekMapMemory(DrvMOSlipRam , 0x905f80, 0x905fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x910000, 0x9107ff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPlayfieldRam , 0x900000, 0x901fff, SM_RAM); + SekMapMemory(DrvMOSpriteRam , 0x902000, 0x903fff, SM_RAM); + SekMapMemory(Drv68KRam + 0x2000 , 0x904000, 0x904fff, SM_RAM); + SekMapMemory(DrvAlphaRam , 0x905000, 0x905f7f, SM_RAM); + SekMapMemory(DrvMOSlipRam , 0x905f80, 0x905fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x910000, 0x9107ff, SM_RAM); SekSetReadByteHandler(0, Gauntlet68KReadByte); SekSetWriteByteHandler(0, Gauntlet68KWriteByte); SekSetReadWordHandler(0, Gauntlet68KReadWord); @@ -2175,8 +2175,8 @@ static INT32 Gaunt2pInit() M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502Ram , 0x0000, 0x0fff, MAP_RAM); - M6502MapMemory(DrvM6502Rom , 0x4000, 0xffff, MAP_ROM); + M6502MapMemory(DrvM6502Ram , 0x0000, 0x0fff, M6502_RAM); + M6502MapMemory(DrvM6502Rom , 0x4000, 0xffff, M6502_ROM); M6502SetReadHandler(GauntletSoundRead); M6502SetWriteHandler(GauntletSoundWrite); M6502Close(); @@ -2282,13 +2282,13 @@ static INT32 Gaunt2Init() // Setup the 68000 emulation SekInit(0, 0x68010); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPlayfieldRam , 0x900000, 0x901fff, MAP_RAM); - SekMapMemory(DrvMOSpriteRam , 0x902000, 0x903fff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x2000 , 0x904000, 0x904fff, MAP_RAM); - SekMapMemory(DrvAlphaRam , 0x905000, 0x905f7f, MAP_RAM); - SekMapMemory(DrvMOSlipRam , 0x905f80, 0x905fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x910000, 0x9107ff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPlayfieldRam , 0x900000, 0x901fff, SM_RAM); + SekMapMemory(DrvMOSpriteRam , 0x902000, 0x903fff, SM_RAM); + SekMapMemory(Drv68KRam + 0x2000 , 0x904000, 0x904fff, SM_RAM); + SekMapMemory(DrvAlphaRam , 0x905000, 0x905f7f, SM_RAM); + SekMapMemory(DrvMOSlipRam , 0x905f80, 0x905fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x910000, 0x9107ff, SM_RAM); SekSetReadByteHandler(0, Gauntlet68KReadByte); SekSetWriteByteHandler(0, Gauntlet68KWriteByte); SekSetReadWordHandler(0, Gauntlet68KReadWord); @@ -2297,8 +2297,8 @@ static INT32 Gaunt2Init() M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502Ram , 0x0000, 0x0fff, MAP_RAM); - M6502MapMemory(DrvM6502Rom , 0x4000, 0xffff, MAP_ROM); + M6502MapMemory(DrvM6502Ram , 0x0000, 0x0fff, M6502_RAM); + M6502MapMemory(DrvM6502Rom , 0x4000, 0xffff, M6502_ROM); M6502SetReadHandler(GauntletSoundRead); M6502SetWriteHandler(GauntletSoundWrite); M6502Close(); diff --git a/src/burn/drv/pre90s/d_ginganin.cpp b/src/burn/drv/pre90s/d_ginganin.cpp index b99e100bc..fc21ce903 100644 --- a/src/burn/drv/pre90s/d_ginganin.cpp +++ b/src/burn/drv/pre90s/d_ginganin.cpp @@ -380,12 +380,12 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x020000, 0x023fff, MAP_RAM); - SekMapMemory(DrvTxtRAM, 0x030000, 0x0307ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x040000, 0x0407ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x050000, 0x0507ff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x068000, 0x06bfff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x020000, 0x023fff, SM_RAM); + SekMapMemory(DrvTxtRAM, 0x030000, 0x0307ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x040000, 0x0407ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x050000, 0x0507ff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x068000, 0x06bfff, SM_RAM); SekSetWriteWordHandler(0, ginganin_write_word); SekSetWriteByteHandler(0, ginganin_write_byte); SekSetReadWordHandler(0, ginganin_read_word); @@ -394,8 +394,8 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x0000, 0x07ff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x4000, 0x4000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM, 0x0000, 0x07ff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x4000, 0x4000, 0xffff, M6809_ROM); M6809SetWriteHandler(ginganin_sound_write); M6809SetReadHandler(ginganin_sound_read); M6809Close(); diff --git a/src/burn/drv/pre90s/d_gng.cpp b/src/burn/drv/pre90s/d_gng.cpp index e0789ec63..5de8ac69b 100644 --- a/src/burn/drv/pre90s/d_gng.cpp +++ b/src/burn/drv/pre90s/d_gng.cpp @@ -805,9 +805,9 @@ void DrvGngM6809WriteByte(UINT16 Address, UINT8 Data) DrvRomBank = Data & 3; if (Data == 4) { DrvRomBank = 4; - M6809MapMemory(DrvM6809Rom, 0x4000, 0x5fff, MAP_ROM); + M6809MapMemory(DrvM6809Rom, 0x4000, 0x5fff, M6809_ROM); } else { - M6809MapMemory(DrvM6809Rom + 0xc000 + (DrvRomBank * 0x2000), 0x4000, 0x5fff, MAP_ROM); + M6809MapMemory(DrvM6809Rom + 0xc000 + (DrvRomBank * 0x2000), 0x4000, 0x5fff, M6809_ROM); } return; } @@ -939,14 +939,14 @@ static INT32 DrvInit() // Setup the M6809 emulation M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809Ram , 0x0000, 0x1dff, MAP_RAM); - M6809MapMemory(DrvSpriteRam , 0x1e00, 0x1fff, MAP_RAM); - M6809MapMemory(DrvFgVideoRam , 0x2000, 0x27ff, MAP_RAM); - M6809MapMemory(DrvBgVideoRam , 0x2800, 0x2fff, MAP_RAM); - M6809MapMemory(DrvPaletteRam2 , 0x3800, 0x38ff, MAP_RAM); - M6809MapMemory(DrvPaletteRam1 , 0x3900, 0x39ff, MAP_RAM); - M6809MapMemory(DrvM6809Rom , 0x4000, 0x5fff, MAP_ROM); - M6809MapMemory(DrvM6809Rom + 0x2000 , 0x6000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809Ram , 0x0000, 0x1dff, M6809_RAM); + M6809MapMemory(DrvSpriteRam , 0x1e00, 0x1fff, M6809_RAM); + M6809MapMemory(DrvFgVideoRam , 0x2000, 0x27ff, M6809_RAM); + M6809MapMemory(DrvBgVideoRam , 0x2800, 0x2fff, M6809_RAM); + M6809MapMemory(DrvPaletteRam2 , 0x3800, 0x38ff, M6809_RAM); + M6809MapMemory(DrvPaletteRam1 , 0x3900, 0x39ff, M6809_RAM); + M6809MapMemory(DrvM6809Rom , 0x4000, 0x5fff, M6809_ROM); + M6809MapMemory(DrvM6809Rom + 0x2000 , 0x6000, 0xffff, M6809_ROM); M6809SetReadHandler(DrvGngM6809ReadByte); M6809SetWriteHandler(DrvGngM6809WriteByte); M6809Close(); @@ -1032,14 +1032,14 @@ static INT32 DiamondInit() // Setup the M6809 emulation M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809Ram , 0x0000, 0x1dff, MAP_RAM); - M6809MapMemory(DrvSpriteRam , 0x1e00, 0x1fff, MAP_RAM); - M6809MapMemory(DrvFgVideoRam , 0x2000, 0x27ff, MAP_RAM); - M6809MapMemory(DrvBgVideoRam , 0x2800, 0x2fff, MAP_RAM); - M6809MapMemory(DrvPaletteRam2 , 0x3800, 0x38ff, MAP_RAM); - M6809MapMemory(DrvPaletteRam1 , 0x3900, 0x39ff, MAP_RAM); - M6809MapMemory(DrvM6809Rom , 0x4000, 0x5fff, MAP_ROM); - M6809MapMemory(DrvM6809Rom + 0x2000 , 0x6000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809Ram , 0x0000, 0x1dff, M6809_RAM); + M6809MapMemory(DrvSpriteRam , 0x1e00, 0x1fff, M6809_RAM); + M6809MapMemory(DrvFgVideoRam , 0x2000, 0x27ff, M6809_RAM); + M6809MapMemory(DrvBgVideoRam , 0x2800, 0x2fff, M6809_RAM); + M6809MapMemory(DrvPaletteRam2 , 0x3800, 0x38ff, M6809_RAM); + M6809MapMemory(DrvPaletteRam1 , 0x3900, 0x39ff, M6809_RAM); + M6809MapMemory(DrvM6809Rom , 0x4000, 0x5fff, M6809_ROM); + M6809MapMemory(DrvM6809Rom + 0x2000 , 0x6000, 0xffff, M6809_ROM); M6809SetReadHandler(DrvGngM6809ReadByte); M6809SetWriteHandler(DrvGngM6809WriteByte); M6809Close(); diff --git a/src/burn/drv/pre90s/d_higemaru.cpp b/src/burn/drv/pre90s/d_higemaru.cpp index ea3b9f635..fae23ba16 100644 --- a/src/burn/drv/pre90s/d_higemaru.cpp +++ b/src/burn/drv/pre90s/d_higemaru.cpp @@ -433,11 +433,13 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(33333); +// ZetRaiseIrq(0xd7); ZetSetVector(0xd7); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetRun(33334); +// ZetRaiseIrq(0xcf); ZetSetVector(0xcf); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_ikki.cpp b/src/burn/drv/pre90s/d_ikki.cpp index c43101d4e..1a91f1211 100644 --- a/src/burn/drv/pre90s/d_ikki.cpp +++ b/src/burn/drv/pre90s/d_ikki.cpp @@ -520,10 +520,10 @@ static INT32 DrvFrame() nCyclesDone[0] += ZetRun(nCycleSegment); if (i == 15) { vblank = 0; - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); } if (i == 239) { - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); vblank = 1; } ZetClose(); @@ -532,8 +532,8 @@ static INT32 DrvFrame() ZetOpen(1); nCyclesDone[1] += ZetRun(nCycleSegment); - if (i == 15) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); - if (i == 239) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == 15) ZetRaiseIrq(0); + if (i == 239)ZetRaiseIrq(0); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_jack.cpp b/src/burn/drv/pre90s/d_jack.cpp index 731b78ce7..2803cf5fd 100644 --- a/src/burn/drv/pre90s/d_jack.cpp +++ b/src/burn/drv/pre90s/d_jack.cpp @@ -1078,28 +1078,28 @@ static INT32 DrvInit() if (joinem || loverb) { - ZetMapMemory(Rom0 + 0x0000, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(Rom0 + 0x8000, 0x8000, 0x8fff, MAP_RAM); - ZetMapMemory(Rom0 + 0x9000, 0x9000, 0x97ff, MAP_RAM); + ZetMapMemory(Rom0 + 0x0000, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(Rom0 + 0x8000, 0x8000, 0x8fff, ZET_RAM); + ZetMapMemory(Rom0 + 0x9000, 0x9000, 0x97ff, ZET_RAM); if (!unclepoo) ZetMapArea(0xb500, 0xb5ff, 0, Rom0 + 0xb500); // controls hack } else { - ZetMapMemory(Rom0 + 0x0000, 0x0000, 0x3fff, MAP_ROM); - ZetMapMemory(Rom0 + 0x4000, 0x4000, 0x5fff, MAP_RAM); + ZetMapMemory(Rom0 + 0x0000, 0x0000, 0x3fff, ZET_ROM); + ZetMapMemory(Rom0 + 0x4000, 0x4000, 0x5fff, ZET_RAM); } //ZetMapArea(0xb000, 0xb07f, 0, Rom0 + 0xb000); // move to cpu0_read/write //ZetMapArea(0xb000, 0xb07f, 1, Rom0 + 0xb000); - ZetMapMemory(Rom0 + 0xb800, 0xb800, 0xbbff, MAP_RAM); - ZetMapMemory(Rom0 + 0xbc00, 0xbc00, 0xbfff, MAP_RAM); + ZetMapMemory(Rom0 + 0xb800, 0xb800, 0xbbff, ZET_RAM); + ZetMapMemory(Rom0 + 0xbc00, 0xbc00, 0xbfff, ZET_RAM); if (suprtriv) { - ZetMapMemory(Rom0 + 0xc000, 0xd000, 0xffff, MAP_RAM); // + 0xc000, really? + ZetMapMemory(Rom0 + 0xc000, 0xd000, 0xffff, ZET_RAM); // + 0xc000, really? } else if (!unclepoo) { - ZetMapMemory(Rom0 + 0xc000, 0xc000, 0xffff, MAP_ROM); + ZetMapMemory(Rom0 + 0xc000, 0xc000, 0xffff, ZET_ROM); } ZetClose(); @@ -1279,9 +1279,9 @@ static INT32 DrvFrame() //if (joinem) //if (i == (nInterleave / 3) || i == ((nInterleave / 3) * 2)) if (joinem && (i % 249) == 0) - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); // game speed (joinem, uncle poo) + ZetRaiseIrq(0); // game speed (joinem, uncle poo) - if (tri_fix && i == (nInterleave / 2)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (tri_fix && i == (nInterleave / 2)) ZetRaiseIrq(0); if (i == (nInterleave - 1)) // vblank { @@ -1292,7 +1292,7 @@ static INT32 DrvFrame() ZetNmi(); } else { // other - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); } } diff --git a/src/burn/drv/pre90s/d_kangaroo.cpp b/src/burn/drv/pre90s/d_kangaroo.cpp index e42112b5a..7893fb159 100644 --- a/src/burn/drv/pre90s/d_kangaroo.cpp +++ b/src/burn/drv/pre90s/d_kangaroo.cpp @@ -581,13 +581,13 @@ INT32 DrvFrame() /* ZetOpen(0); nCyclesDone[0] -= ZetRun(nCyclesDone[0] / (nInterleave - i)); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetRaiseIrq(0); ZetClose(); // Run Z80 #1 ZetOpen(1); nCyclesDone[1] -= ZetRun(nCyclesDone[1] / (nInterleave - i)); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetRaiseIrq(0); ZetClose();*/ // Render Sound Segment diff --git a/src/burn/drv/pre90s/d_kncljoe.cpp b/src/burn/drv/pre90s/d_kncljoe.cpp index 00f553660..f5b6275b3 100644 --- a/src/burn/drv/pre90s/d_kncljoe.cpp +++ b/src/burn/drv/pre90s/d_kncljoe.cpp @@ -451,8 +451,8 @@ static INT32 DrvInit() M6803Init(1); // M6803Open(0); - M6803MapMemory(DrvM6803ROM, 0x6000, 0x7fff, MAP_ROM); - M6803MapMemory(DrvM6803ROM, 0xe000, 0xffff, MAP_ROM); + M6803MapMemory(DrvM6803ROM, 0x6000, 0x7fff, M6803_ROM); + M6803MapMemory(DrvM6803ROM, 0xe000, 0xffff, M6803_ROM); M6803SetReadHandler(kncljoe_sound_read); M6803SetWriteHandler(kncljoe_sound_write); M6803SetWritePortHandler(kncljoe_sound_write_port); diff --git a/src/burn/drv/pre90s/d_kyugo.cpp b/src/burn/drv/pre90s/d_kyugo.cpp index d8e8fb112..a82a0d88a 100644 --- a/src/burn/drv/pre90s/d_kyugo.cpp +++ b/src/burn/drv/pre90s/d_kyugo.cpp @@ -2369,7 +2369,7 @@ static INT32 KyugoFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 2 || i == 4 || i == 6 || i == 8) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == 2 || i == 4 || i == 6 || i == 8) ZetRaiseIrq(0); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_ladybug.cpp b/src/burn/drv/pre90s/d_ladybug.cpp index d652f4cbe..3ae3947e7 100644 --- a/src/burn/drv/pre90s/d_ladybug.cpp +++ b/src/burn/drv/pre90s/d_ladybug.cpp @@ -1184,12 +1184,12 @@ static INT32 SraiderFrame() for (INT32 i = 0; i < nInterleave; i++) { ZetOpen(0); ZetRun(nTotalCycles[0] / nInterleave); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetRaiseIrq(0); ZetClose(); ZetOpen(1); ZetRun(nTotalCycles[1] / nInterleave); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetRaiseIrq(0); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_lastduel.cpp b/src/burn/drv/pre90s/d_lastduel.cpp index 6c54778c3..25d9e4c1f 100644 --- a/src/burn/drv/pre90s/d_lastduel.cpp +++ b/src/burn/drv/pre90s/d_lastduel.cpp @@ -952,13 +952,13 @@ static INT32 DrvInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvSpriteRam , 0xfc1800, 0xfc1fff, MAP_RAM); - SekMapMemory(DrvVideoRam , 0xfc8000, 0xfc9fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0xfcc000, 0xfcc7ff, MAP_RAM); - SekMapMemory(DrvScroll1Ram , 0xfd4000, 0xfd7fff, MAP_RAM); - SekMapMemory(DrvScroll2Ram , 0xfd8000, 0xfdffff, MAP_RAM); - SekMapMemory(Drv68KRam , 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvSpriteRam , 0xfc1800, 0xfc1fff, SM_RAM); + SekMapMemory(DrvVideoRam , 0xfc8000, 0xfc9fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0xfcc000, 0xfcc7ff, SM_RAM); + SekMapMemory(DrvScroll1Ram , 0xfd4000, 0xfd7fff, SM_RAM); + SekMapMemory(DrvScroll2Ram , 0xfd8000, 0xfdffff, SM_RAM); + SekMapMemory(Drv68KRam , 0xff0000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, Madgear68KWriteWord); SekSetReadByteHandler(0, Madgear68KReadByte); SekClose(); @@ -1047,13 +1047,13 @@ static INT32 Ledstrm2Init() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvSpriteRam , 0xfc1800, 0xfc1fff, MAP_RAM); - SekMapMemory(DrvVideoRam , 0xfc8000, 0xfc9fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0xfcc000, 0xfcc7ff, MAP_RAM); - SekMapMemory(DrvScroll1Ram , 0xfd4000, 0xfd7fff, MAP_RAM); - SekMapMemory(DrvScroll2Ram , 0xfd8000, 0xfdffff, MAP_RAM); - SekMapMemory(Drv68KRam , 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvSpriteRam , 0xfc1800, 0xfc1fff, SM_RAM); + SekMapMemory(DrvVideoRam , 0xfc8000, 0xfc9fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0xfcc000, 0xfcc7ff, SM_RAM); + SekMapMemory(DrvScroll1Ram , 0xfd4000, 0xfd7fff, SM_RAM); + SekMapMemory(DrvScroll2Ram , 0xfd8000, 0xfdffff, SM_RAM); + SekMapMemory(Drv68KRam , 0xff0000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, Madgear68KWriteWord); SekSetReadByteHandler(0, Madgear68KReadByte); SekClose(); @@ -1141,13 +1141,13 @@ static INT32 LastduelInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(DrvSpriteRam , 0xfc0800, 0xfc0fff, MAP_RAM); - SekMapMemory(DrvVideoRam , 0xfcc000, 0xfcdfff, MAP_RAM); - SekMapMemory(DrvScroll1Ram , 0xfd0000, 0xfd3fff, MAP_RAM); - SekMapMemory(DrvScroll2Ram , 0xfd4000, 0xfd7fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0xfd8000, 0xfd87ff, MAP_RAM); - SekMapMemory(Drv68KRam , 0xfe0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(DrvSpriteRam , 0xfc0800, 0xfc0fff, SM_RAM); + SekMapMemory(DrvVideoRam , 0xfcc000, 0xfcdfff, SM_RAM); + SekMapMemory(DrvScroll1Ram , 0xfd0000, 0xfd3fff, SM_RAM); + SekMapMemory(DrvScroll2Ram , 0xfd4000, 0xfd7fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0xfd8000, 0xfd87ff, SM_RAM); + SekMapMemory(Drv68KRam , 0xfe0000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, Lastduel68KReadWord); SekSetWriteWordHandler(0, Lastduel68KWriteWord); SekSetWriteByteHandler(0, Lastduel68KWriteByte); @@ -1246,13 +1246,13 @@ static INT32 LastduelbInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(DrvSpriteRam , 0xfc0800, 0xfc0fff, MAP_RAM); - SekMapMemory(DrvVideoRam , 0xfcc000, 0xfcdfff, MAP_RAM); - SekMapMemory(DrvScroll1Ram , 0xfd0000, 0xfd3fff, MAP_RAM); - SekMapMemory(DrvScroll2Ram , 0xfd4000, 0xfd7fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0xfd8000, 0xfd87ff, MAP_RAM); - SekMapMemory(Drv68KRam , 0xfe0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(DrvSpriteRam , 0xfc0800, 0xfc0fff, SM_RAM); + SekMapMemory(DrvVideoRam , 0xfcc000, 0xfcdfff, SM_RAM); + SekMapMemory(DrvScroll1Ram , 0xfd0000, 0xfd3fff, SM_RAM); + SekMapMemory(DrvScroll2Ram , 0xfd4000, 0xfd7fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0xfd8000, 0xfd87ff, SM_RAM); + SekMapMemory(Drv68KRam , 0xfe0000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, Lastduel68KReadWord); SekSetWriteWordHandler(0, Lastduel68KWriteWord); SekSetWriteByteHandler(0, Lastduel68KWriteByte); diff --git a/src/burn/drv/pre90s/d_meijinsn.cpp b/src/burn/drv/pre90s/d_meijinsn.cpp index a912313d3..ea45e7af7 100644 --- a/src/burn/drv/pre90s/d_meijinsn.cpp +++ b/src/burn/drv/pre90s/d_meijinsn.cpp @@ -341,9 +341,9 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvVidRAM, 0x100000, 0x107fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x180000, 0x181fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvVidRAM, 0x100000, 0x107fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x180000, 0x181fff, SM_RAM); SekSetWriteByteHandler(0, meijinsn_write_byte); SekSetReadByteHandler(0, meijinsn_read_byte); SekClose(); diff --git a/src/burn/drv/pre90s/d_mole.cpp b/src/burn/drv/pre90s/d_mole.cpp index af3cf0a7b..e0414aebf 100644 --- a/src/burn/drv/pre90s/d_mole.cpp +++ b/src/burn/drv/pre90s/d_mole.cpp @@ -313,9 +313,9 @@ static INT32 DrvInit() M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(Rom + 0x0000, 0x0000, 0x03ff, MAP_RAM); // Rom - M6502MapMemory(Rom + 0x5000, 0x5000, 0x7fff, MAP_ROM); // Rom - M6502MapMemory(Rom + 0x5000, 0xd000, 0xffff, MAP_ROM); // Rom Mirror + M6502MapMemory(Rom + 0x0000, 0x0000, 0x03ff, M6502_RAM); // Rom + M6502MapMemory(Rom + 0x5000, 0x5000, 0x7fff, M6502_ROM); // Rom + M6502MapMemory(Rom + 0x5000, 0xd000, 0xffff, M6502_ROM); // Rom Mirror M6502SetReadHandler(mole_read_byte); M6502SetWriteHandler(mole_write_byte); M6502SetReadMemIndexHandler(mole_read_byte); diff --git a/src/burn/drv/pre90s/d_mrflea.cpp b/src/burn/drv/pre90s/d_mrflea.cpp index 77c170bc0..9a9ecff38 100644 --- a/src/burn/drv/pre90s/d_mrflea.cpp +++ b/src/burn/drv/pre90s/d_mrflea.cpp @@ -123,7 +123,7 @@ void __fastcall mrflea_out_port(UINT16 a, UINT8 data) ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); ZetOpen(0); } @@ -477,7 +477,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetRaiseIrq(0); ZetClose(); // Run Z80 #1 @@ -487,7 +487,7 @@ static INT32 DrvFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - if ((mrflea_status&0x08) || i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if ((mrflea_status&0x08) || i == (nInterleave - 1)) ZetRaiseIrq(0); ZetClose(); // Render Sound Segment diff --git a/src/burn/drv/pre90s/d_mustache.cpp b/src/burn/drv/pre90s/d_mustache.cpp index bd5b74074..8130db909 100644 --- a/src/burn/drv/pre90s/d_mustache.cpp +++ b/src/burn/drv/pre90s/d_mustache.cpp @@ -395,12 +395,12 @@ static INT32 DrvInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0xbfff, MAP_ROM); - ZetMapMemory(DrvZ80ROMDec, 0x0000, 0x7fff, MAP_FETCHOP); - ZetMapMemory(DrvVidRAM, 0xc000, 0xcfff, MAP_RAM); - ZetMapMemory(t5182SharedRAM, 0xd400, 0xd4ff, MAP_RAM); - ZetMapMemory(DrvSprRAM, 0xe800, 0xefff, MAP_RAM); - ZetMapMemory(DrvZ80RAM, 0xf000, 0xffff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0xbfff, ZET_ROM); + ZetMapMemory(DrvZ80ROMDec, 0x0000, 0x7fff, ZET_FETCHOP); + ZetMapMemory(DrvVidRAM, 0xc000, 0xcfff, ZET_RAM); + ZetMapMemory(t5182SharedRAM, 0xd400, 0xd4ff, ZET_RAM); + ZetMapMemory(DrvSprRAM, 0xe800, 0xefff, ZET_RAM); + ZetMapMemory(DrvZ80RAM, 0xf000, 0xffff, ZET_RAM); ZetSetWriteHandler(mustache_main_write); ZetSetReadHandler(mustache_main_read); ZetClose(); diff --git a/src/burn/drv/pre90s/d_mystston.cpp b/src/burn/drv/pre90s/d_mystston.cpp index f1f4d82c0..fe0fe712d 100644 --- a/src/burn/drv/pre90s/d_mystston.cpp +++ b/src/burn/drv/pre90s/d_mystston.cpp @@ -327,10 +327,10 @@ static INT32 DrvInit() M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(Drv6502RAM, 0x0000, 0x0fff, MAP_RAM); - M6502MapMemory(DrvFgRAM, 0x1000, 0x17ff, MAP_RAM); - M6502MapMemory(DrvBgRAM, 0x1800, 0x1fff, MAP_RAM); - M6502MapMemory(Drv6502ROM + 0x4000, 0x4000, 0xffff, MAP_ROM); + M6502MapMemory(Drv6502RAM, 0x0000, 0x0fff, M6502_RAM); + M6502MapMemory(DrvFgRAM, 0x1000, 0x17ff, M6502_RAM); + M6502MapMemory(DrvBgRAM, 0x1800, 0x1fff, M6502_RAM); + M6502MapMemory(Drv6502ROM + 0x4000, 0x4000, 0xffff, M6502_ROM); M6502SetWriteHandler(mystston_write); M6502SetReadHandler(mystston_read); M6502Close(); diff --git a/src/burn/drv/pre90s/d_pac2650.cpp b/src/burn/drv/pre90s/d_pac2650.cpp index 0c7238841..45351c00c 100644 --- a/src/burn/drv/pre90s/d_pac2650.cpp +++ b/src/burn/drv/pre90s/d_pac2650.cpp @@ -130,10 +130,10 @@ static inline void bankswitch(INT32 data) if (s2650_bank != (data & 1)) { for (INT32 i = 0; i <= 0x8000; i+= 0x8000) { - s2650MapMemory(DrvPrgROM + 0x00000 + bank, 0x0000 | i, 0x0fff | i, MAP_ROM); - s2650MapMemory(DrvPrgROM + 0x01000 + bank, 0x2000 | i, 0x2fff | i, MAP_ROM); - s2650MapMemory(DrvPrgROM + 0x02000 + bank, 0x4000 | i, 0x4fff | i, MAP_ROM); - s2650MapMemory(DrvPrgROM + 0x03000 + bank, 0x6000 | i, 0x6fff | i, MAP_ROM); + s2650MapMemory(DrvPrgROM + 0x00000 + bank, 0x0000 | i, 0x0fff | i, S2650_ROM); + s2650MapMemory(DrvPrgROM + 0x01000 + bank, 0x2000 | i, 0x2fff | i, S2650_ROM); + s2650MapMemory(DrvPrgROM + 0x02000 + bank, 0x4000 | i, 0x4fff | i, S2650_ROM); + s2650MapMemory(DrvPrgROM + 0x03000 + bank, 0x6000 | i, 0x6fff | i, S2650_ROM); } s2650_bank = data & 1; @@ -359,9 +359,9 @@ static INT32 DrvInit(INT32 game, INT32 swap) s2650Init(1); s2650Open(0); for (INT32 i = 0; i <= 0xe000; i+= 0x2000) { - s2650MapMemory(DrvScrRAM, 0x1400 | i, 0x14ff | i, MAP_RAM); - s2650MapMemory(DrvVidRAM, 0x1800 | i, 0x1bff | i, MAP_RAM); - s2650MapMemory(DrvPrgRAM, 0x1c00 | i, 0x1fff | i, MAP_RAM); + s2650MapMemory(DrvScrRAM, 0x1400 | i, 0x14ff | i, S2650_RAM); + s2650MapMemory(DrvVidRAM, 0x1800 | i, 0x1bff | i, S2650_RAM); + s2650MapMemory(DrvPrgRAM, 0x1c00 | i, 0x1fff | i, S2650_RAM); } s2650SetWriteHandler(s2650games_write); s2650SetReadHandler(s2650games_read); diff --git a/src/burn/drv/pre90s/d_pacland.cpp b/src/burn/drv/pre90s/d_pacland.cpp index e9f6aee52..d3d917806 100644 --- a/src/burn/drv/pre90s/d_pacland.cpp +++ b/src/burn/drv/pre90s/d_pacland.cpp @@ -142,7 +142,7 @@ static void bankswitch(INT32 nBank) nBank = (nBank & 0x07) * 0x2000; - M6809MapMemory(DrvMainROM + 0x10000 + nBank, 0x4000, 0x5fff, MAP_ROM); + M6809MapMemory(DrvMainROM + 0x10000 + nBank, 0x4000, 0x5fff, M6809_ROM); } static void pacland_main_write(UINT16 address, UINT8 data) @@ -492,19 +492,19 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvVidRAM0, 0x0000, 0x0fff, MAP_RAM); - M6809MapMemory(DrvVidRAM1, 0x1000, 0x1fff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x2000, 0x37ff, MAP_RAM); - M6809MapMemory(DrvMainROM + 0x8000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvVidRAM0, 0x0000, 0x0fff, M6809_RAM); + M6809MapMemory(DrvVidRAM1, 0x1000, 0x1fff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x2000, 0x37ff, M6809_RAM); + M6809MapMemory(DrvMainROM + 0x8000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(pacland_main_write); M6809SetReadHandler(pacland_main_read); M6809Close(); HD63701Init(1); // Open - HD63701MapMemory(DrvMCUROM + 0x8000, 0x8000, 0xbfff, MAP_ROM); - HD63701MapMemory(DrvMCURAM, 0xc000, 0xc7ff, MAP_RAM); - HD63701MapMemory(DrvMCUROM + 0xf000, 0xf000, 0xffff, MAP_ROM); + HD63701MapMemory(DrvMCUROM + 0x8000, 0x8000, 0xbfff, HD63701_ROM); + HD63701MapMemory(DrvMCURAM, 0xc000, 0xc7ff, HD63701_RAM); + HD63701MapMemory(DrvMCUROM + 0xf000, 0xf000, 0xffff, HD63701_ROM); HD63701SetWritePortHandler(pacland_mcu_write_port); HD63701SetReadPortHandler(pacland_mcu_read_port); HD63701SetWriteHandler(pacland_mcu_write); diff --git a/src/burn/drv/pre90s/d_pkunwar.cpp b/src/burn/drv/pre90s/d_pkunwar.cpp index 5b4d5bfd9..0cfe17345 100644 --- a/src/burn/drv/pre90s/d_pkunwar.cpp +++ b/src/burn/drv/pre90s/d_pkunwar.cpp @@ -494,7 +494,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(3000000 / 60); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_prehisle.cpp b/src/burn/drv/pre90s/d_prehisle.cpp index 674ecd96e..3b5c7019d 100644 --- a/src/burn/drv/pre90s/d_prehisle.cpp +++ b/src/burn/drv/pre90s/d_prehisle.cpp @@ -521,12 +521,12 @@ INT32 PrehisleInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(PrehisleRom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(PrehisleRam , 0x070000, 0x073fff, MAP_RAM); - SekMapMemory(PrehisleVideoRam , 0x090000, 0x0907ff, MAP_RAM); - SekMapMemory(PrehisleSpriteRam , 0x0a0000, 0x0a07ff, MAP_RAM); - SekMapMemory(PrehisleVideo2Ram , 0x0b0000, 0x0b3fff, MAP_RAM); - SekMapMemory(PrehislePaletteRam, 0x0d0000, 0x0d07ff, MAP_RAM); + SekMapMemory(PrehisleRom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(PrehisleRam , 0x070000, 0x073fff, SM_RAM); + SekMapMemory(PrehisleVideoRam , 0x090000, 0x0907ff, SM_RAM); + SekMapMemory(PrehisleSpriteRam , 0x0a0000, 0x0a07ff, SM_RAM); + SekMapMemory(PrehisleVideo2Ram , 0x0b0000, 0x0b3fff, SM_RAM); + SekMapMemory(PrehislePaletteRam, 0x0d0000, 0x0d07ff, SM_RAM); SekSetReadWordHandler(0, PrehisleReadWord); SekSetWriteWordHandler(0, PrehisleWriteWord); SekClose(); diff --git a/src/burn/drv/pre90s/d_punchout.cpp b/src/burn/drv/pre90s/d_punchout.cpp index b3c9f0a8f..e7ee87b77 100644 --- a/src/burn/drv/pre90s/d_punchout.cpp +++ b/src/burn/drv/pre90s/d_punchout.cpp @@ -671,8 +671,8 @@ static INT32 CommonInit(INT32 (*pInitCallback)(), INT32 punchout, INT32 reverse_ M6502Init(0, TYPE_N2A03); M6502Open(0); - M6502MapMemory(DrvSndRAM, 0x0000, 0x07ff, MAP_RAM); - M6502MapMemory(DrvSndROM, 0xe000, 0xffff, MAP_ROM); + M6502MapMemory(DrvSndRAM, 0x0000, 0x07ff, M6502_RAM); + M6502MapMemory(DrvSndROM, 0xe000, 0xffff, M6502_ROM); M6502SetWriteHandler(sound_write); M6502SetReadHandler(sound_read); M6502Close(); diff --git a/src/burn/drv/pre90s/d_quizo.cpp b/src/burn/drv/pre90s/d_quizo.cpp index 5cb8c2012..72dacba26 100644 --- a/src/burn/drv/pre90s/d_quizo.cpp +++ b/src/burn/drv/pre90s/d_quizo.cpp @@ -270,7 +270,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(4000000 / 60); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(1); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_renegade.cpp b/src/burn/drv/pre90s/d_renegade.cpp index fbf5e04c2..c3610428b 100644 --- a/src/burn/drv/pre90s/d_renegade.cpp +++ b/src/burn/drv/pre90s/d_renegade.cpp @@ -668,7 +668,7 @@ void RenegadeWriteByte(UINT16 Address, UINT8 Data) case 0x3805: { DrvRomBank = Data & 1; - M6502MapMemory(DrvM6502Rom + 0x8000 + (DrvRomBank * 0x4000), 0x4000, 0x7fff, MAP_ROM); + M6502MapMemory(DrvM6502Rom + 0x8000 + (DrvRomBank * 0x4000), 0x4000, 0x7fff, M6502_ROM); return; } @@ -943,22 +943,22 @@ static INT32 DrvInit(INT32 nMcuType) M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(DrvM6502Ram , 0x0000, 0x17ff, MAP_RAM); - M6502MapMemory(DrvVideoRam2 , 0x1800, 0x1fff, MAP_RAM); - M6502MapMemory(DrvSpriteRam , 0x2000, 0x27ff, MAP_RAM); - M6502MapMemory(DrvVideoRam1 , 0x2800, 0x2fff, MAP_RAM); - M6502MapMemory(DrvPaletteRam1 , 0x3000, 0x30ff, MAP_RAM); - M6502MapMemory(DrvPaletteRam2 , 0x3100, 0x31ff, MAP_RAM); - M6502MapMemory(DrvM6502Rom + 0x8000 , 0x4000, 0x7fff, MAP_ROM); - M6502MapMemory(DrvM6502Rom , 0x8000, 0xffff, MAP_ROM); + M6502MapMemory(DrvM6502Ram , 0x0000, 0x17ff, M6502_RAM); + M6502MapMemory(DrvVideoRam2 , 0x1800, 0x1fff, M6502_RAM); + M6502MapMemory(DrvSpriteRam , 0x2000, 0x27ff, M6502_RAM); + M6502MapMemory(DrvVideoRam1 , 0x2800, 0x2fff, M6502_RAM); + M6502MapMemory(DrvPaletteRam1 , 0x3000, 0x30ff, M6502_RAM); + M6502MapMemory(DrvPaletteRam2 , 0x3100, 0x31ff, M6502_RAM); + M6502MapMemory(DrvM6502Rom + 0x8000 , 0x4000, 0x7fff, M6502_ROM); + M6502MapMemory(DrvM6502Rom , 0x8000, 0xffff, M6502_ROM); M6502SetReadHandler(RenegadeReadByte); M6502SetWriteHandler(RenegadeWriteByte); M6502Close(); M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809Ram , 0x0000, 0x0fff, MAP_RAM); - M6809MapMemory(DrvM6809Rom , 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809Ram , 0x0000, 0x0fff, M6809_RAM); + M6809MapMemory(DrvM6809Rom , 0x8000, 0xffff, M6809_ROM); M6809SetReadHandler(RenegadeM6809ReadByte); M6809SetWriteHandler(RenegadeM6809WriteByte); M6809Close(); @@ -973,8 +973,8 @@ static INT32 DrvInit(INT32 nMcuType) m6805Init(1, 0x800); m6805Open(0); - m6805MapMemory(DrvM68705Ram , 0x0010, 0x007f, MAP_RAM); - m6805MapMemory(DrvM68705Rom + 0x0080, 0x0080, 0x07ff, MAP_ROM); + m6805MapMemory(DrvM68705Ram , 0x0010, 0x007f, M6805_RAM); + m6805MapMemory(DrvM68705Rom + 0x0080, 0x0080, 0x07ff, M6805_ROM); m6805SetWriteHandler(MCUWriteByte); m6805SetReadHandler(MCUReadByte); m6805Close(); diff --git a/src/burn/drv/pre90s/d_route16.cpp b/src/burn/drv/pre90s/d_route16.cpp index cbd255bd6..ce375bf78 100644 --- a/src/burn/drv/pre90s/d_route16.cpp +++ b/src/burn/drv/pre90s/d_route16.cpp @@ -597,7 +597,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i+1 == nInterleave) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i+1 == nInterleave) ZetRaiseIrq(1); ZetClose(); // Run Z80 #1 diff --git a/src/burn/drv/pre90s/d_rpunch.cpp b/src/burn/drv/pre90s/d_rpunch.cpp index 007bb5696..709fc9d7c 100644 --- a/src/burn/drv/pre90s/d_rpunch.cpp +++ b/src/burn/drv/pre90s/d_rpunch.cpp @@ -547,12 +547,12 @@ static INT32 DrvInit(INT32 (*pRomLoadCallback)(), INT32 game) SekOpen(0); // FBA doesn't support memory masks, so use mirroring instead for (INT32 i = 0; i < 1 << 24; i+= 1 << 20) { - SekMapMemory(Drv68KROM, i+0x000000, i+0x03ffff, MAP_ROM); - SekMapMemory(DrvBMPRAM, i+0x040000, i+0x04ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, i+0x060000, i+0x060fff, MAP_RAM); - SekMapMemory(DrvVidRAM, i+0x080000, i+0x083fff, MAP_RAM); - SekMapMemory(DrvPalRAM, i+0x0a0000, i+0x0a07ff, MAP_ROM); - SekMapMemory(Drv68KRAM, i+0x0fc000, i+0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, i+0x000000, i+0x03ffff, SM_ROM); + SekMapMemory(DrvBMPRAM, i+0x040000, i+0x04ffff, SM_RAM); + SekMapMemory(DrvSprRAM, i+0x060000, i+0x060fff, SM_RAM); + SekMapMemory(DrvVidRAM, i+0x080000, i+0x083fff, SM_RAM); + SekMapMemory(DrvPalRAM, i+0x0a0000, i+0x0a07ff, SM_ROM); + SekMapMemory(Drv68KRAM, i+0x0fc000, i+0x0fffff, SM_RAM); } SekSetWriteWordHandler(0, rpunch_main_write_word); SekSetWriteByteHandler(0, rpunch_main_write_byte); diff --git a/src/burn/drv/pre90s/d_scregg.cpp b/src/burn/drv/pre90s/d_scregg.cpp index b04c2db40..bd4602744 100644 --- a/src/burn/drv/pre90s/d_scregg.cpp +++ b/src/burn/drv/pre90s/d_scregg.cpp @@ -292,11 +292,11 @@ static void scregg6502Init() { M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(Drv6502RAM, 0x0000, 0x07ff, MAP_RAM); - M6502MapMemory(DrvVidRAM, 0x1000, 0x13ff, MAP_RAM); - M6502MapMemory(DrvColRAM, 0x1400, 0x17ff, MAP_RAM); - M6502MapMemory(Drv6502ROM + 0x3000, 0x3000, 0x7fff, MAP_ROM); - M6502MapMemory(Drv6502ROM + 0x7000, 0xf000, 0xffff, MAP_ROM); + M6502MapMemory(Drv6502RAM, 0x0000, 0x07ff, M6502_RAM); + M6502MapMemory(DrvVidRAM, 0x1000, 0x13ff, M6502_RAM); + M6502MapMemory(DrvColRAM, 0x1400, 0x17ff, M6502_RAM); + M6502MapMemory(Drv6502ROM + 0x3000, 0x3000, 0x7fff, M6502_ROM); + M6502MapMemory(Drv6502ROM + 0x7000, 0xf000, 0xffff, M6502_ROM); M6502SetWriteMemIndexHandler(eggs_write); M6502SetReadMemIndexHandler(eggs_read); M6502SetReadOpArgHandler(eggs_read); @@ -310,10 +310,10 @@ static void dommy6502Init() { M6502Init(0, TYPE_M6502); M6502Open(0); - M6502MapMemory(Drv6502RAM, 0x0000, 0x07ff, MAP_RAM); - M6502MapMemory(DrvVidRAM, 0x2000, 0x23ff, MAP_RAM); - M6502MapMemory(DrvColRAM, 0x2400, 0x27ff, MAP_RAM); - M6502MapMemory(Drv6502ROM + 0xa000, 0xa000, 0xffff, MAP_ROM); + M6502MapMemory(Drv6502RAM, 0x0000, 0x07ff, M6502_RAM); + M6502MapMemory(DrvVidRAM, 0x2000, 0x23ff, M6502_RAM); + M6502MapMemory(DrvColRAM, 0x2400, 0x27ff, M6502_RAM); + M6502MapMemory(Drv6502ROM + 0xa000, 0xa000, 0xffff, M6502_ROM); M6502SetWriteMemIndexHandler(dommy_write); M6502SetReadMemIndexHandler(dommy_read); M6502SetReadOpArgHandler(dommy_read); diff --git a/src/burn/drv/pre90s/d_sf.cpp b/src/burn/drv/pre90s/d_sf.cpp index 95be83b0e..dd575e3e1 100644 --- a/src/burn/drv/pre90s/d_sf.cpp +++ b/src/burn/drv/pre90s/d_sf.cpp @@ -820,9 +820,9 @@ static INT32 DrvInit(INT32 initver) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68kRom, 0x000000, 0x04ffff, MAP_ROM); - SekMapMemory(Drv68kVidRam, 0x800000, 0x800fff, MAP_RAM); - SekMapMemory(Drv68kRam, 0xff8000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68kRom, 0x000000, 0x04ffff, SM_ROM); + SekMapMemory(Drv68kVidRam, 0x800000, 0x800fff, SM_RAM); + SekMapMemory(Drv68kRam, 0xff8000, 0xffffff, SM_RAM); SekSetWriteByteHandler(0, sf_write_byte); SekSetWriteWordHandler(0, sf_write_word); SekSetReadByteHandler(0, sf_read_byte); diff --git a/src/burn/drv/pre90s/d_skykid.cpp b/src/burn/drv/pre90s/d_skykid.cpp index fb5150124..bb8fd24a1 100644 --- a/src/burn/drv/pre90s/d_skykid.cpp +++ b/src/burn/drv/pre90s/d_skykid.cpp @@ -279,7 +279,7 @@ static void m6809Bankswitch(INT32 bank) if (m6809_bank[0] != bank) { m6809_bank[0] = bank; - M6809MapMemory(DrvM6809ROM + 0x10000 + bank * 0x2000, 0x0000, 0x1fff, MAP_ROM); + M6809MapMemory(DrvM6809ROM + 0x10000 + bank * 0x2000, 0x0000, 0x1fff, M6809_ROM); } } @@ -602,20 +602,20 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809ROM + 0x10000, 0x0000, 0x1fff, MAP_ROM); - M6809MapMemory(DrvVidRAM, 0x2000, 0x2fff, MAP_RAM); - M6809MapMemory(DrvTxtRAM, 0x4000, 0x47ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x4800, 0x5fff, MAP_RAM); - M6809MapMemory(DrvM6809ROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809ROM + 0x10000, 0x0000, 0x1fff, M6809_ROM); + M6809MapMemory(DrvVidRAM, 0x2000, 0x2fff, M6809_RAM); + M6809MapMemory(DrvTxtRAM, 0x4000, 0x47ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x4800, 0x5fff, M6809_RAM); + M6809MapMemory(DrvM6809ROM + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(skykid_main_write); M6809SetReadHandler(skykid_main_read); M6809Close(); HD63701Init(1); // HD63701Open(0); - HD63701MapMemory(DrvHD63701ROM + 0x8000, 0x8000, 0xbfff, MAP_ROM); - HD63701MapMemory(DrvHD63701RAM, 0xc000, 0xc7ff, MAP_RAM); - HD63701MapMemory(DrvHD63701ROM + 0xf000, 0xf000, 0xffff, MAP_ROM); + HD63701MapMemory(DrvHD63701ROM + 0x8000, 0x8000, 0xbfff, HD63701_ROM); + HD63701MapMemory(DrvHD63701RAM, 0xc000, 0xc7ff, HD63701_RAM); + HD63701MapMemory(DrvHD63701ROM + 0xf000, 0xf000, 0xffff, HD63701_ROM); HD63701SetReadHandler(skykid_mcu_read); HD63701SetWriteHandler(skykid_mcu_write); HD63701SetReadPortHandler(skykid_mcu_read_port); diff --git a/src/burn/drv/pre90s/d_snk68.cpp b/src/burn/drv/pre90s/d_snk68.cpp index 94f843bf0..8ed7822af 100644 --- a/src/burn/drv/pre90s/d_snk68.cpp +++ b/src/burn/drv/pre90s/d_snk68.cpp @@ -816,11 +816,11 @@ static void pow_map_68k() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRam, 0x040000, 0x043fff, MAP_RAM); - SekMapMemory(DrvVidRam, 0x100000, 0x100fff, MAP_RAM); // video ram - SekMapMemory(DrvSprRam, 0x200000, 0x207fff, MAP_RAM); // sprite ram - SekMapMemory(DrvPalRam, 0x400000, 0x400fff, MAP_ROM); // palette ram + SekMapMemory(Drv68KRom, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRam, 0x040000, 0x043fff, SM_RAM); + SekMapMemory(DrvVidRam, 0x100000, 0x100fff, SM_RAM); // video ram + SekMapMemory(DrvSprRam, 0x200000, 0x207fff, SM_RAM); // sprite ram + SekMapMemory(DrvPalRam, 0x400000, 0x400fff, SM_ROM); // palette ram SekSetWriteByteHandler(0, pow_write_byte); SekSetWriteWordHandler(0, pow_write_word); SekSetReadByteHandler(0, pow_read_byte); @@ -832,13 +832,13 @@ static void sar_map_68k() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRam, 0x040000, 0x043fff, MAP_RAM); - SekMapMemory(DrvSprRam, 0x100000, 0x107fff, MAP_ROM); // sprite ram - SekMapMemory(DrvVidRam, 0x200000, 0x200fff, MAP_RAM); // video ram - SekMapMemory(DrvVidRam, 0x201000, 0x201fff, MAP_WRITE); // video ram mirror - SekMapMemory(Drv68KRomBank, 0x300000, 0x33ffff, MAP_ROM); // extra rom - SekMapMemory(DrvPalRam, 0x400000, 0x400fff, MAP_ROM); // palette ram + SekMapMemory(Drv68KRom, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRam, 0x040000, 0x043fff, SM_RAM); + SekMapMemory(DrvSprRam, 0x100000, 0x107fff, SM_ROM); // sprite ram + SekMapMemory(DrvVidRam, 0x200000, 0x200fff, SM_RAM); // video ram + SekMapMemory(DrvVidRam, 0x201000, 0x201fff, SM_WRITE); // video ram mirror + SekMapMemory(Drv68KRomBank, 0x300000, 0x33ffff, SM_ROM); // extra rom + SekMapMemory(DrvPalRam, 0x400000, 0x400fff, SM_ROM); // palette ram SekSetWriteByteHandler(0, pow_write_byte); SekSetWriteWordHandler(0, pow_write_word); SekSetReadByteHandler(0, sar_read_byte); diff --git a/src/burn/drv/pre90s/d_solomon.cpp b/src/burn/drv/pre90s/d_solomon.cpp index 22d2dddfc..e1a16be3c 100644 --- a/src/burn/drv/pre90s/d_solomon.cpp +++ b/src/burn/drv/pre90s/d_solomon.cpp @@ -705,7 +705,7 @@ INT32 SolomonFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); // Render Sound Segment diff --git a/src/burn/drv/pre90s/d_sonson.cpp b/src/burn/drv/pre90s/d_sonson.cpp index 1f83fef27..5618b9827 100644 --- a/src/burn/drv/pre90s/d_sonson.cpp +++ b/src/burn/drv/pre90s/d_sonson.cpp @@ -403,18 +403,18 @@ static INT32 DrvInit() M6809Init(2); M6809Open(0); - M6809MapMemory(DrvM6809RAM0, 0x0000, 0x0fff, MAP_RAM); - M6809MapMemory(DrvVidRAM, 0x1000, 0x13ff, MAP_RAM); - M6809MapMemory(DrvColRAM, 0x1400, 0x17ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x2020, 0x207f, MAP_RAM); // 0x100 min - M6809MapMemory(DrvM6809ROM0 + 0x04000, 0x4000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM0, 0x0000, 0x0fff, M6809_RAM); + M6809MapMemory(DrvVidRAM, 0x1000, 0x13ff, M6809_RAM); + M6809MapMemory(DrvColRAM, 0x1400, 0x17ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x2020, 0x207f, M6809_RAM); // 0x100 min + M6809MapMemory(DrvM6809ROM0 + 0x04000, 0x4000, 0xffff, M6809_ROM); M6809SetReadHandler(sonson_main_read); M6809SetWriteHandler(sonson_main_write); M6809Close(); M6809Open(1); - M6809MapMemory(DrvM6809RAM1, 0x0000, 0x07ff, MAP_RAM); - M6809MapMemory(DrvM6809ROM1 + 0x0e000, 0xe000, 0xffff, MAP_ROM); + M6809MapMemory(DrvM6809RAM1, 0x0000, 0x07ff, M6809_RAM); + M6809MapMemory(DrvM6809ROM1 + 0x0e000, 0xe000, 0xffff, M6809_ROM); M6809SetReadHandler(sonson_sound_read); M6809SetWriteHandler(sonson_sound_write); M6809Close(); diff --git a/src/burn/drv/pre90s/d_srumbler.cpp b/src/burn/drv/pre90s/d_srumbler.cpp index 988e1b48b..197c8a09e 100644 --- a/src/burn/drv/pre90s/d_srumbler.cpp +++ b/src/burn/drv/pre90s/d_srumbler.cpp @@ -135,7 +135,7 @@ static void bankswitch(INT32 data) { INT32 bank = DrvPROM[(data & 0xf0) | i] | DrvPROM[0x100 | ((data & 0x0f) << 4) | i]; - M6809MapMemory(DrvM6809ROM + bank * 0x1000, 0x1000 * i, 0x1000 * i + 0x0fff, MAP_ROM); + M6809MapMemory(DrvM6809ROM + bank * 0x1000, 0x1000 * i, 0x1000 * i + 0x0fff, M6809_ROM); } } @@ -372,11 +372,11 @@ static INT32 DrvInit() M6809Init(1); M6809Open(0); - M6809MapMemory(DrvM6809RAM, 0x0000, 0x1dff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x1e00, 0x1fff, MAP_RAM); - M6809MapMemory(DrvBgRAM, 0x2000, 0x3fff, MAP_RAM); - M6809MapMemory(DrvFgRAM, 0x5000, 0x5fff, MAP_WRITE); - M6809MapMemory(DrvPalRAM, 0x7000, 0x73ff, MAP_WRITE); + M6809MapMemory(DrvM6809RAM, 0x0000, 0x1dff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x1e00, 0x1fff, M6809_RAM); + M6809MapMemory(DrvBgRAM, 0x2000, 0x3fff, M6809_RAM); + M6809MapMemory(DrvFgRAM, 0x5000, 0x5fff, M6809_WRITE); + M6809MapMemory(DrvPalRAM, 0x7000, 0x73ff, M6809_WRITE); M6809SetReadHandler(srumbler_main_read); M6809SetWriteHandler(srumbler_main_write); M6809Close(); @@ -621,7 +621,7 @@ static INT32 DrvFrame() if (i == (nInterleave / 1) - 1) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); BurnTimerUpdate(i * (nCyclesTotal[1] / nInterleave)); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); } BurnTimerEndFrame(nCyclesTotal[1]); diff --git a/src/burn/drv/pre90s/d_tail2nose.cpp b/src/burn/drv/pre90s/d_tail2nose.cpp index 5e2697e33..f8cdb3947 100644 --- a/src/burn/drv/pre90s/d_tail2nose.cpp +++ b/src/burn/drv/pre90s/d_tail2nose.cpp @@ -438,14 +438,14 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KROM + 0x040000, 0x200000, 0x27ffff, MAP_ROM); - SekMapMemory(Drv68KROM + 0x0c0000, 0x2c0000, 0x2dffff, MAP_ROM); - SekMapMemory(DrvZoomRAM, 0x400000, 0x41ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0xff8000, 0xffbfff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0xffc000, 0xffcfff, MAP_RAM); - SekMapMemory(DrvVidRAM, 0xffd000, 0xffdfff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xffe000, 0xffefff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KROM + 0x040000, 0x200000, 0x27ffff, SM_ROM); + SekMapMemory(Drv68KROM + 0x0c0000, 0x2c0000, 0x2dffff, SM_ROM); + SekMapMemory(DrvZoomRAM, 0x400000, 0x41ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0xff8000, 0xffbfff, SM_RAM); + SekMapMemory(DrvSprRAM, 0xffc000, 0xffcfff, SM_RAM); + SekMapMemory(DrvVidRAM, 0xffd000, 0xffdfff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xffe000, 0xffefff, SM_ROM); SekSetWriteWordHandler(0, tail2nose_main_write_word); SekSetWriteByteHandler(0, tail2nose_main_write_byte); SekSetReadWordHandler(0, tail2nose_main_read_word); diff --git a/src/burn/drv/pre90s/d_tbowl.cpp b/src/burn/drv/pre90s/d_tbowl.cpp index ab02ac5fb..80bbe4599 100644 --- a/src/burn/drv/pre90s/d_tbowl.cpp +++ b/src/burn/drv/pre90s/d_tbowl.cpp @@ -189,7 +189,7 @@ static void bankswitch(INT32 n, INT32 data) INT32 bank = 0x10000 + (data & 0xf8) * 256; - ZetMapMemory((n ? DrvZ80ROM1 : DrvZ80ROM0) + bank, 0xf000, 0xf7ff, MAP_ROM); + ZetMapMemory((n ? DrvZ80ROM1 : DrvZ80ROM0) + bank, 0xf000, 0xf7ff, ZET_ROM); } static void __fastcall tbowl_main_write(UINT16 address, UINT8 data) @@ -493,30 +493,30 @@ static INT32 DrvInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM0, 0x8000, 0x9fff, MAP_RAM); - ZetMapMemory(DrvBgRAM2, 0xa000, 0xbfff, MAP_RAM); - ZetMapMemory(DrvBgRAM, 0xc000, 0xdfff, MAP_RAM); - ZetMapMemory(DrvTxRAM, 0xe000, 0xefff, MAP_RAM); - ZetMapMemory(DrvShareRAM, 0xf800, 0xfbff, MAP_RAM); + ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM0, 0x8000, 0x9fff, ZET_RAM); + ZetMapMemory(DrvBgRAM2, 0xa000, 0xbfff, ZET_RAM); + ZetMapMemory(DrvBgRAM, 0xc000, 0xdfff, ZET_RAM); + ZetMapMemory(DrvTxRAM, 0xe000, 0xefff, ZET_RAM); + ZetMapMemory(DrvShareRAM, 0xf800, 0xfbff, ZET_RAM); ZetSetWriteHandler(tbowl_main_write); ZetSetReadHandler(tbowl_main_read); ZetClose(); ZetInit(1); ZetOpen(1); - ZetMapMemory(DrvZ80ROM1, 0x0000, 0xbfff, MAP_ROM); - ZetMapMemory(DrvZ80RAM1, 0xc000, 0xd7ff, MAP_RAM); - ZetMapMemory(DrvSprRAM, 0xd800, 0xdfff, MAP_RAM); - ZetMapMemory(DrvPalRAM, 0xe000, 0xefff, MAP_RAM); - ZetMapMemory(DrvShareRAM, 0xf800, 0xfbff, MAP_RAM); + ZetMapMemory(DrvZ80ROM1, 0x0000, 0xbfff, ZET_ROM); + ZetMapMemory(DrvZ80RAM1, 0xc000, 0xd7ff, ZET_RAM); + ZetMapMemory(DrvSprRAM, 0xd800, 0xdfff, ZET_RAM); + ZetMapMemory(DrvPalRAM, 0xe000, 0xefff, ZET_RAM); + ZetMapMemory(DrvShareRAM, 0xf800, 0xfbff, ZET_RAM); ZetSetWriteHandler(tbowl_sub_write); ZetClose(); ZetInit(2); ZetOpen(2); - ZetMapMemory(DrvZ80ROM2, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM2, 0xc000, 0xc7ff, MAP_RAM); + ZetMapMemory(DrvZ80ROM2, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM2, 0xc000, 0xc7ff, ZET_RAM); ZetSetWriteHandler(tbowl_sound_write); ZetSetReadHandler(tbowl_sound_read); ZetClose(); @@ -710,14 +710,14 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave-1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave-1)) ZetRaiseIrq(0); ZetClose(); nSegment = (nTotalCycles[1] - nCyclesDone[1]) / (nInterleave - i); ZetOpen(1); nCyclesDone[1] += ZetRun(nSegment); - if (i == (nInterleave-1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave-1)) ZetRaiseIrq(0); ZetClose(); ZetOpen(2); diff --git a/src/burn/drv/pre90s/d_tecmo.cpp b/src/burn/drv/pre90s/d_tecmo.cpp index 6bfc759ab..81e4d11aa 100644 --- a/src/burn/drv/pre90s/d_tecmo.cpp +++ b/src/burn/drv/pre90s/d_tecmo.cpp @@ -1163,7 +1163,7 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave-1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave-1)) ZetRaiseIrq(0); ZetClose(); ZetOpen(1); diff --git a/src/burn/drv/pre90s/d_terracre.cpp b/src/burn/drv/pre90s/d_terracre.cpp index aea43f91c..faae7b741 100644 --- a/src/burn/drv/pre90s/d_terracre.cpp +++ b/src/burn/drv/pre90s/d_terracre.cpp @@ -1039,11 +1039,11 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(DrvSpriteRam , 0x020000, 0x021fff, MAP_RAM); - SekMapMemory(DrvBgVideoRam , 0x022000, 0x022fff, MAP_RAM); -// SekMapMemory(Drv68KRam , 0x023000, 0x023fff, MAP_RAM); - SekMapMemory(DrvFgVideoRam , 0x028000, 0x0287ff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(DrvSpriteRam , 0x020000, 0x021fff, SM_RAM); + SekMapMemory(DrvBgVideoRam , 0x022000, 0x022fff, SM_RAM); +// SekMapMemory(Drv68KRam , 0x023000, 0x023fff, SM_RAM); + SekMapMemory(DrvFgVideoRam , 0x028000, 0x0287ff, SM_RAM); SekSetReadWordHandler(0, Terracre68KReadWord); SekSetWriteWordHandler(0, Terracre68KWriteWord); SekSetReadByteHandler(0, Terracre68KReadByte); @@ -1107,10 +1107,10 @@ static INT32 DrvAmazonInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(DrvSpriteRam , 0x040000, 0x040fff, MAP_RAM); - SekMapMemory(DrvBgVideoRam , 0x042000, 0x042fff, MAP_RAM); - SekMapMemory(DrvFgVideoRam , 0x050000, 0x050fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(DrvSpriteRam , 0x040000, 0x040fff, SM_RAM); + SekMapMemory(DrvBgVideoRam , 0x042000, 0x042fff, SM_RAM); + SekMapMemory(DrvFgVideoRam , 0x050000, 0x050fff, SM_RAM); SekSetReadWordHandler(0, Amazon68KReadWord); SekSetWriteWordHandler(0, Amazon68KWriteWord); SekSetReadByteHandler(0, Amazon68KReadByte); diff --git a/src/burn/drv/pre90s/d_tigeroad.cpp b/src/burn/drv/pre90s/d_tigeroad.cpp index 2f7587c24..33b611191 100644 --- a/src/burn/drv/pre90s/d_tigeroad.cpp +++ b/src/burn/drv/pre90s/d_tigeroad.cpp @@ -692,11 +692,11 @@ static INT32 DrvInit(INT32 (*pInitCallback)()) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0xfe0800, 0xfe1bff, MAP_RAM); - SekMapMemory(DrvVidRAM, 0xfec000, 0xfec7ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xff8000, 0xff87ff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0xfe0800, 0xfe1bff, SM_RAM); + SekMapMemory(DrvVidRAM, 0xfec000, 0xfec7ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xff8000, 0xff87ff, SM_ROM); + SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, SM_RAM); SekSetWriteByteHandler(0, tigeroad_write_byte); SekSetWriteWordHandler(0, tigeroad_write_word); SekSetReadByteHandler(0, tigeroad_read_byte); diff --git a/src/burn/drv/pre90s/d_toki.cpp b/src/burn/drv/pre90s/d_toki.cpp index 9ba51c9ca..b8663278c 100644 --- a/src/burn/drv/pre90s/d_toki.cpp +++ b/src/burn/drv/pre90s/d_toki.cpp @@ -694,14 +694,14 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x060000, 0x06d7ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x06d800, 0x06dfff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x06e000, 0x06e7ff, MAP_ROM); - SekMapMemory(DrvBg1RAM, 0x06e800, 0x06efff, MAP_RAM); - SekMapMemory(DrvBg2RAM, 0x06f000, 0x06f7ff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x06f800, 0x06ffff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x0a0000, 0x0a0057, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x060000, 0x06d7ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x06d800, 0x06dfff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x06e000, 0x06e7ff, SM_ROM); + SekMapMemory(DrvBg1RAM, 0x06e800, 0x06efff, SM_RAM); + SekMapMemory(DrvBg2RAM, 0x06f000, 0x06f7ff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x06f800, 0x06ffff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x0a0000, 0x0a0057, SM_RAM); SekSetWriteByteHandler(0, toki_write_byte); SekSetWriteWordHandler(0, toki_write_word); SekSetReadByteHandler(0, toki_read_byte); @@ -803,14 +803,14 @@ static INT32 JujubaInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x060000, 0x06d7ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x06d800, 0x06dfff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x06e000, 0x06e7ff, MAP_ROM); - SekMapMemory(DrvBg1RAM, 0x06e800, 0x06efff, MAP_RAM); - SekMapMemory(DrvBg2RAM, 0x06f000, 0x06f7ff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x06f800, 0x06ffff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x0a0000, 0x0a0057, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x060000, 0x06d7ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x06d800, 0x06dfff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x06e000, 0x06e7ff, SM_ROM); + SekMapMemory(DrvBg1RAM, 0x06e800, 0x06efff, SM_RAM); + SekMapMemory(DrvBg2RAM, 0x06f000, 0x06f7ff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x06f800, 0x06ffff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x0a0000, 0x0a0057, SM_RAM); SekSetWriteByteHandler(0, toki_write_byte); SekSetWriteWordHandler(0, toki_write_word); SekSetReadByteHandler(0, toki_read_byte); @@ -865,13 +865,13 @@ static INT32 TokibInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x060000, 0x06dfff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x06e000, 0x06e7ff, MAP_ROM); - SekMapMemory(DrvBg1RAM, 0x06e800, 0x06efff, MAP_RAM); - SekMapMemory(DrvBg2RAM, 0x06f000, 0x06f7ff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x06f800, 0x06ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x071800, 0x0718ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x060000, 0x06dfff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x06e000, 0x06e7ff, SM_ROM); + SekMapMemory(DrvBg1RAM, 0x06e800, 0x06efff, SM_RAM); + SekMapMemory(DrvBg2RAM, 0x06f000, 0x06f7ff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x06f800, 0x06ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x071800, 0x0718ff, SM_RAM); SekSetWriteByteHandler(0, toki_write_byte); SekSetWriteWordHandler(0, toki_write_word); SekSetReadByteHandler(0, toki_read_byte); diff --git a/src/burn/drv/pre90s/d_wwfsstar.cpp b/src/burn/drv/pre90s/d_wwfsstar.cpp index 7c128e78e..c58c20af2 100644 --- a/src/burn/drv/pre90s/d_wwfsstar.cpp +++ b/src/burn/drv/pre90s/d_wwfsstar.cpp @@ -444,12 +444,12 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvFgRAM, 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x0c0000, 0x0c0fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x100000, 0x1003ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x140000, 0x140fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x1c0000, 0x1c3fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvFgRAM, 0x080000, 0x080fff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x0c0000, 0x0c0fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x100000, 0x1003ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x140000, 0x140fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x1c0000, 0x1c3fff, SM_RAM); SekSetReadWordHandler(0, wwfsstar_main_read_word); SekSetReadByteHandler(0, wwfsstar_main_read_byte); SekSetWriteWordHandler(0, wwfsstar_main_write_word); diff --git a/src/burn/drv/pre90s/d_xain.cpp b/src/burn/drv/pre90s/d_xain.cpp index bbbcea8be..f82706485 100644 --- a/src/burn/drv/pre90s/d_xain.cpp +++ b/src/burn/drv/pre90s/d_xain.cpp @@ -164,7 +164,7 @@ static inline void palette_update(INT32 offset) static void bankswitchA(INT32 data) { nBankAData = data; - M6809MapMemory(DrvMainROM + ((data & 0x08) ? 0x14000 : 0x10000), 0x4000, 0x7fff, MAP_ROM); + M6809MapMemory(DrvMainROM + ((data & 0x08) ? 0x14000 : 0x10000), 0x4000, 0x7fff, M6809_ROM); } static void xain_main_write(UINT16 address, UINT8 data) @@ -318,7 +318,7 @@ static UINT8 xain_main_read(UINT16 address) static void bankswitchB(INT32 data) { nBankBData = data; - M6809MapMemory(DrvSubROM + ((data & 0x01) ? 0x14000 : 0x10000), 0x4000, 0x7fff, MAP_ROM); + M6809MapMemory(DrvSubROM + ((data & 0x01) ? 0x14000 : 0x10000), 0x4000, 0x7fff, M6809_ROM); } static void xain_sub_write(UINT16 address, UINT8 data) @@ -638,35 +638,35 @@ static INT32 DrvInit() M6809Init(3); M6809Open(0); - M6809MapMemory(DrvShareRAM, 0x0000, 0x1fff, MAP_RAM); - M6809MapMemory(DrvCharRAM, 0x2000, 0x27ff, MAP_RAM); - M6809MapMemory(DrvBgRAM1, 0x2800, 0x2fff, MAP_RAM); - M6809MapMemory(DrvBgRAM0, 0x3000, 0x37ff, MAP_RAM); - M6809MapMemory(DrvSprRAM, 0x3800, 0x39ff, MAP_RAM); - M6809MapMemory(DrvPalRAM, 0x3c00, 0x3fff, MAP_ROM); - M6809MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvShareRAM, 0x0000, 0x1fff, M6809_RAM); + M6809MapMemory(DrvCharRAM, 0x2000, 0x27ff, M6809_RAM); + M6809MapMemory(DrvBgRAM1, 0x2800, 0x2fff, M6809_RAM); + M6809MapMemory(DrvBgRAM0, 0x3000, 0x37ff, M6809_RAM); + M6809MapMemory(DrvSprRAM, 0x3800, 0x39ff, M6809_RAM); + M6809MapMemory(DrvPalRAM, 0x3c00, 0x3fff, M6809_ROM); + M6809MapMemory(DrvMainROM + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(xain_main_write); M6809SetReadHandler(xain_main_read); M6809Close(); M6809Open(1); - M6809MapMemory(DrvShareRAM, 0x0000, 0x1fff, MAP_RAM); - M6809MapMemory(DrvSubROM + 0x08000, 0x8000, 0xffff, MAP_ROM); + M6809MapMemory(DrvShareRAM, 0x0000, 0x1fff, M6809_RAM); + M6809MapMemory(DrvSubROM + 0x08000, 0x8000, 0xffff, M6809_ROM); M6809SetWriteHandler(xain_sub_write); M6809SetReadHandler(xain_sub_read); M6809Close(); M6809Open(2); - M6809MapMemory(DrvSoundRAM, 0x0000, 0x07ff, MAP_RAM); - M6809MapMemory(DrvSoundROM + 0x4000, 0x4000, 0xffff, MAP_ROM); + M6809MapMemory(DrvSoundRAM, 0x0000, 0x07ff, M6809_RAM); + M6809MapMemory(DrvSoundROM + 0x4000, 0x4000, 0xffff, M6809_ROM); M6809SetWriteHandler(xain_sound_write); M6809SetReadHandler(xain_sound_read); M6809Close(); m6805Init(1, 0x800); m6805Open(0); - m6805MapMemory(DrvMcuRAM, 0x0010, 0x007f, MAP_RAM); - m6805MapMemory(DrvMcuROM + 0x80, 0x0080, 0x07ff, MAP_ROM); + m6805MapMemory(DrvMcuRAM, 0x0010, 0x007f, M6805_RAM); + m6805MapMemory(DrvMcuROM + 0x80, 0x0080, 0x07ff, M6805_ROM); m6805SetWriteHandler(xain_68705_write_ports); m6805SetReadHandler(xain_68705_read_ports); m6805Close(); diff --git a/src/burn/drv/psikyo/d_psikyo.cpp b/src/burn/drv/psikyo/d_psikyo.cpp index 684d2fbcf..764ea2de4 100644 --- a/src/burn/drv/psikyo/d_psikyo.cpp +++ b/src/burn/drv/psikyo/d_psikyo.cpp @@ -1751,15 +1751,15 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Psikyo68KROM, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(PsikyoSpriteRAM, 0x400000, 0x401FFF, MAP_RAM); - SekMapMemory(PsikyoTileRAM[0], 0x800000, 0x801FFF, MAP_RAM); - SekMapMemory(PsikyoTileRAM[1], 0x802000, 0x803FFF, MAP_RAM); - SekMapMemory(PsikyoTileRAM[2], 0x804000, 0x807FFF, MAP_RAM); - SekMapMemory(Psikyo68KRAM, 0xFE0000, 0xFFFFFF, MAP_RAM); + SekMapMemory(Psikyo68KROM, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(PsikyoSpriteRAM, 0x400000, 0x401FFF, SM_RAM); + SekMapMemory(PsikyoTileRAM[0], 0x800000, 0x801FFF, SM_RAM); + SekMapMemory(PsikyoTileRAM[1], 0x802000, 0x803FFF, SM_RAM); + SekMapMemory(PsikyoTileRAM[2], 0x804000, 0x807FFF, SM_RAM); + SekMapMemory(Psikyo68KRAM, 0xFE0000, 0xFFFFFF, SM_RAM); - SekMapMemory(PsikyoPalSrc, 0x600000, 0x601FFF, MAP_ROM); // Palette RAM (write goes through handler) - SekMapHandler(1, 0x600000, 0x601FFF, MAP_WRITE); // + SekMapMemory(PsikyoPalSrc, 0x600000, 0x601FFF, SM_ROM); // Palette RAM (write goes through handler) + SekMapHandler(1, 0x600000, 0x601FFF, SM_WRITE); // switch (PsikyoHardwareVersion) { case PSIKYO_HW_SAMURAIA: { diff --git a/src/burn/drv/pst90s/d_1945kiii.cpp b/src/burn/drv/pst90s/d_1945kiii.cpp index 7db54b15c..eb74d75e7 100644 --- a/src/burn/drv/pst90s/d_1945kiii.cpp +++ b/src/burn/drv/pst90s/d_1945kiii.cpp @@ -278,14 +278,14 @@ static INT32 DrvInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, MAP_ROM); - SekMapMemory(Ram68K, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory((UINT8 *)RamPal, 0x200000, 0x200FFF, MAP_ROM); - SekMapHandler(1, 0x200000, 0x200FFF, MAP_WRITE); // palette write - SekMapMemory((UINT8 *)RamSpr0, 0x240000, 0x240FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr1, 0x280000, 0x280FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamBg, 0x2C0000, 0x2C0FFF, MAP_RAM); - SekMapMemory(Ram68K + 0x10000, 0x8C0000, 0x8CFFFF, MAP_RAM); + SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, SM_ROM); + SekMapMemory(Ram68K, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory((UINT8 *)RamPal, 0x200000, 0x200FFF, SM_ROM); + SekMapHandler(1, 0x200000, 0x200FFF, SM_WRITE); // palette write + SekMapMemory((UINT8 *)RamSpr0, 0x240000, 0x240FFF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr1, 0x280000, 0x280FFF, SM_RAM); + SekMapMemory((UINT8 *)RamBg, 0x2C0000, 0x2C0FFF, SM_RAM); + SekMapMemory(Ram68K + 0x10000, 0x8C0000, 0x8CFFFF, SM_RAM); SekSetReadWordHandler(0, k1945iiiReadWord); // SekSetReadByteHandler(0, k1945iiiReadByte); diff --git a/src/burn/drv/pst90s/d_aerofgt.cpp b/src/burn/drv/pst90s/d_aerofgt.cpp index d92889d6a..eacb35aa7 100644 --- a/src/burn/drv/pst90s/d_aerofgt.cpp +++ b/src/burn/drv/pst90s/d_aerofgt.cpp @@ -1761,8 +1761,8 @@ static void aerofgt_sound_init() { ZetInit(0); ZetOpen(0); - ZetMapMemory(RomZ80, 0x0000, 0x77ff, MAP_ROM); - ZetMapMemory(RamZ80, 0x7800, 0x7fff, MAP_RAM); + ZetMapMemory(RomZ80, 0x0000, 0x77ff, ZET_ROM); + ZetMapMemory(RamZ80, 0x7800, 0x7fff, ZET_RAM); ZetSetInHandler(aerofgtZ80PortRead); ZetSetOutHandler(aerofgtZ80PortWrite); ZetClose(); @@ -1778,8 +1778,8 @@ static void turbofrc_sound_init() { ZetInit(0); ZetOpen(0); - ZetMapMemory(RomZ80, 0x0000, 0x77ff, MAP_ROM); - ZetMapMemory(RamZ80, 0x7800, 0x7fff, MAP_RAM); + ZetMapMemory(RomZ80, 0x0000, 0x77ff, ZET_ROM); + ZetMapMemory(RamZ80, 0x7800, 0x7fff, ZET_RAM); ZetSetInHandler(turbofrcZ80PortRead); ZetSetOutHandler(turbofrcZ80PortWrite); ZetClose(); @@ -1829,14 +1829,14 @@ static INT32 aerofgtInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(RamPal, 0x1A0000, 0x1A07FF, MAP_ROM); // Palette - SekMapMemory((UINT8 *)RamRaster, 0x1B0000, 0x1B0FFF, MAP_RAM); // Raster / MRA_NOP / MRA_BANK7 - SekMapMemory((UINT8 *)RamBg1V, 0x1B2000, 0x1B3FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamBg2V, 0x1B4000, 0x1B5FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr1, 0x1C0000, 0x1C7FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr2, 0x1D0000, 0x1D1FFF, MAP_RAM); - SekMapMemory(Ram01, 0xFEF000, 0xFFEFFF, MAP_RAM); // 64K Work RAM + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(RamPal, 0x1A0000, 0x1A07FF, SM_ROM); // Palette + SekMapMemory((UINT8 *)RamRaster, 0x1B0000, 0x1B0FFF, SM_RAM); // Raster / MRA_NOP / MRA_BANK7 + SekMapMemory((UINT8 *)RamBg1V, 0x1B2000, 0x1B3FFF, SM_RAM); + SekMapMemory((UINT8 *)RamBg2V, 0x1B4000, 0x1B5FFF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr1, 0x1C0000, 0x1C7FFF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr2, 0x1D0000, 0x1D1FFF, SM_RAM); + SekMapMemory(Ram01, 0xFEF000, 0xFFEFFF, SM_RAM); // 64K Work RAM // SekSetReadWordHandler(0, aerofgtReadWord); SekSetReadByteHandler(0, aerofgtReadByte); SekSetWriteWordHandler(0, aerofgtWriteWord); @@ -1894,19 +1894,19 @@ static INT32 turbofrcInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x0BFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x0C0000, 0x0CFFFF, MAP_RAM); // 64K Work RAM - SekMapMemory((UINT8 *)RamBg1V, 0x0D0000, 0x0D1FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamBg2V, 0x0D2000, 0x0D3FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr1, 0x0E0000, 0x0E3FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr2, 0x0E4000, 0x0E7FFF, MAP_RAM); - SekMapMemory(Ram01+0x10000, 0x0F8000, 0x0FBFFF, MAP_RAM); // Work RAM - SekMapMemory(Ram01+0x10000, 0xFF8000, 0xFFBFFF, MAP_RAM); // Work RAM - SekMapMemory((UINT8 *)RamSpr3, 0x0FC000, 0x0FC7FF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr3, 0xFFC000, 0xFFC7FF, MAP_RAM); - SekMapMemory((UINT8 *)RamRaster, 0x0FD000, 0x0FDFFF, MAP_RAM); - SekMapMemory((UINT8 *)RamRaster, 0xFFD000, 0xFFDFFF, MAP_RAM); - SekMapMemory(RamPal, 0x0FE000, 0x0FE7FF, MAP_ROM); // Palette + SekMapMemory(Rom01, 0x000000, 0x0BFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x0C0000, 0x0CFFFF, SM_RAM); // 64K Work RAM + SekMapMemory((UINT8 *)RamBg1V, 0x0D0000, 0x0D1FFF, SM_RAM); + SekMapMemory((UINT8 *)RamBg2V, 0x0D2000, 0x0D3FFF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr1, 0x0E0000, 0x0E3FFF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr2, 0x0E4000, 0x0E7FFF, SM_RAM); + SekMapMemory(Ram01+0x10000, 0x0F8000, 0x0FBFFF, SM_RAM); // Work RAM + SekMapMemory(Ram01+0x10000, 0xFF8000, 0xFFBFFF, SM_RAM); // Work RAM + SekMapMemory((UINT8 *)RamSpr3, 0x0FC000, 0x0FC7FF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr3, 0xFFC000, 0xFFC7FF, SM_RAM); + SekMapMemory((UINT8 *)RamRaster, 0x0FD000, 0x0FDFFF, SM_RAM); + SekMapMemory((UINT8 *)RamRaster, 0xFFD000, 0xFFDFFF, SM_RAM); + SekMapMemory(RamPal, 0x0FE000, 0x0FE7FF, SM_ROM); // Palette // SekSetReadWordHandler(0, turbofrcReadWord); SekSetReadByteHandler(0, turbofrcReadByte); SekSetWriteWordHandler(0, turbofrcWriteWord); @@ -1961,16 +1961,16 @@ static INT32 karatblzInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory((UINT8 *)RamBg1V, 0x080000, 0x081FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamBg2V, 0x082000, 0x083FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr1, 0x0A0000, 0x0AFFFF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr2, 0x0B0000, 0x0BFFFF, MAP_RAM); - SekMapMemory(Ram01, 0x0C0000, 0x0CFFFF, MAP_RAM); // 64K Work RAM - SekMapMemory(Ram01+0x10000, 0x0F8000, 0x0FBFFF, MAP_RAM); // Work RAM - SekMapMemory(Ram01+0x10000, 0xFF8000, 0xFFBFFF, MAP_RAM); // Work RAM - SekMapMemory((UINT8 *)RamSpr3, 0x0FC000, 0x0FC7FF, MAP_RAM); - SekMapMemory(RamPal, 0x0FE000, 0x0FE7FF, MAP_ROM); // Palette + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory((UINT8 *)RamBg1V, 0x080000, 0x081FFF, SM_RAM); + SekMapMemory((UINT8 *)RamBg2V, 0x082000, 0x083FFF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr1, 0x0A0000, 0x0AFFFF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr2, 0x0B0000, 0x0BFFFF, SM_RAM); + SekMapMemory(Ram01, 0x0C0000, 0x0CFFFF, SM_RAM); // 64K Work RAM + SekMapMemory(Ram01+0x10000, 0x0F8000, 0x0FBFFF, SM_RAM); // Work RAM + SekMapMemory(Ram01+0x10000, 0xFF8000, 0xFFBFFF, SM_RAM); // Work RAM + SekMapMemory((UINT8 *)RamSpr3, 0x0FC000, 0x0FC7FF, SM_RAM); + SekMapMemory(RamPal, 0x0FE000, 0x0FE7FF, SM_ROM); // Palette // SekSetReadWordHandler(0, karatblzReadWord); SekSetReadByteHandler(0, karatblzReadByte); SekSetWriteWordHandler(0, karatblzWriteWord); @@ -2033,13 +2033,13 @@ static INT32 spinlbrkInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x04FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory((UINT8 *)RamBg1V, 0x080000, 0x080FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamBg2V, 0x082000, 0x083FFF, MAP_RAM); - SekMapMemory(Ram01, 0xFF8000, 0xFFBFFF, MAP_RAM); // Work RAM - SekMapMemory((UINT8 *)RamSpr3, 0xFFC000, 0xFFC7FF, MAP_RAM); - SekMapMemory((UINT8 *)RamRaster, 0xFFD000, 0xFFD1FF, MAP_RAM); - SekMapMemory(RamPal, 0xFFE000, 0xFFE7FF, MAP_ROM); // Palette + SekMapMemory(Rom01, 0x000000, 0x04FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory((UINT8 *)RamBg1V, 0x080000, 0x080FFF, SM_RAM); + SekMapMemory((UINT8 *)RamBg2V, 0x082000, 0x083FFF, SM_RAM); + SekMapMemory(Ram01, 0xFF8000, 0xFFBFFF, SM_RAM); // Work RAM + SekMapMemory((UINT8 *)RamSpr3, 0xFFC000, 0xFFC7FF, SM_RAM); + SekMapMemory((UINT8 *)RamRaster, 0xFFD000, 0xFFD1FF, SM_RAM); + SekMapMemory(RamPal, 0xFFE000, 0xFFE7FF, SM_ROM); // Palette SekSetReadWordHandler(0, spinlbrkReadWord); // SekSetReadByteHandler(0, spinlbrkReadByte); SekSetWriteWordHandler(0, spinlbrkWriteWord); @@ -2095,16 +2095,16 @@ static INT32 aerofgtbInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x0C0000, 0x0CFFFF, MAP_RAM); // 64K Work RAM - SekMapMemory((UINT8 *)RamBg1V, 0x0D0000, 0x0D1FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamBg2V, 0x0D2000, 0x0D3FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr1, 0x0E0000, 0x0E3FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr2, 0x0E4000, 0x0E7FFF, MAP_RAM); - SekMapMemory(Ram01+0x10000, 0x0F8000, 0x0FBFFF, MAP_RAM); // Work RAM - SekMapMemory((UINT8 *)RamSpr3, 0x0FC000, 0x0FC7FF, MAP_RAM); - SekMapMemory(RamPal, 0x0FD000, 0x0FD7FF, MAP_ROM); // Palette - SekMapMemory((UINT8 *)RamRaster, 0x0FF000, 0x0FFFFF, MAP_RAM); // Raster + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x0C0000, 0x0CFFFF, SM_RAM); // 64K Work RAM + SekMapMemory((UINT8 *)RamBg1V, 0x0D0000, 0x0D1FFF, SM_RAM); + SekMapMemory((UINT8 *)RamBg2V, 0x0D2000, 0x0D3FFF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr1, 0x0E0000, 0x0E3FFF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr2, 0x0E4000, 0x0E7FFF, SM_RAM); + SekMapMemory(Ram01+0x10000, 0x0F8000, 0x0FBFFF, SM_RAM); // Work RAM + SekMapMemory((UINT8 *)RamSpr3, 0x0FC000, 0x0FC7FF, SM_RAM); + SekMapMemory(RamPal, 0x0FD000, 0x0FD7FF, SM_ROM); // Palette + SekMapMemory((UINT8 *)RamRaster, 0x0FF000, 0x0FFFFF, SM_RAM); // Raster SekSetReadWordHandler(0, aerofgtbReadWord); SekSetReadByteHandler(0, aerofgtbReadByte); SekSetWriteWordHandler(0, aerofgtbWriteWord); @@ -2152,13 +2152,13 @@ static INT32 pspikesInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x03FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); // 64K Work RAM - SekMapMemory((UINT8 *)RamSpr1, 0x200000, 0x203FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamBg1V, 0xFF8000, 0xFF8FFF, MAP_RAM); - SekMapMemory((UINT8 *)RamSpr3, 0xFFC000, 0xFFC7FF, MAP_RAM); - SekMapMemory((UINT8 *)RamRaster, 0xFFD000, 0xFFDFFF, MAP_RAM); // Raster - SekMapMemory(RamPal, 0xFFE000, 0xFFEFFF, MAP_ROM); // Palette + SekMapMemory(Rom01, 0x000000, 0x03FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); // 64K Work RAM + SekMapMemory((UINT8 *)RamSpr1, 0x200000, 0x203FFF, SM_RAM); + SekMapMemory((UINT8 *)RamBg1V, 0xFF8000, 0xFF8FFF, SM_RAM); + SekMapMemory((UINT8 *)RamSpr3, 0xFFC000, 0xFFC7FF, SM_RAM); + SekMapMemory((UINT8 *)RamRaster, 0xFFD000, 0xFFDFFF, SM_RAM); // Raster + SekMapMemory(RamPal, 0xFFE000, 0xFFEFFF, SM_ROM); // Palette // SekSetReadWordHandler(0, pspikesReadWord); SekSetReadByteHandler(0, pspikesReadByte); SekSetWriteWordHandler(0, pspikesWriteWord); diff --git a/src/burn/drv/pst90s/d_aquarium.cpp b/src/burn/drv/pst90s/d_aquarium.cpp index 7a527fdfa..ab1995133 100644 --- a/src/burn/drv/pst90s/d_aquarium.cpp +++ b/src/burn/drv/pst90s/d_aquarium.cpp @@ -394,13 +394,13 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvMidRAM, 0xc00000, 0xc00fff, MAP_RAM); - SekMapMemory(DrvBakRAM, 0xc01000, 0xc01fff, MAP_RAM); - SekMapMemory(DrvTxtRAM, 0xc02000, 0xc03fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0xc80000, 0xc81fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xd00000, 0xd00fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvMidRAM, 0xc00000, 0xc00fff, SM_RAM); + SekMapMemory(DrvBakRAM, 0xc01000, 0xc01fff, SM_RAM); + SekMapMemory(DrvTxtRAM, 0xc02000, 0xc03fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0xc80000, 0xc81fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xd00000, 0xd00fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, SM_RAM); SekSetWriteByteHandler(0, aquarium_write_byte); SekSetWriteWordHandler(0, aquarium_write_word); SekSetReadByteHandler(0, aquarium_read_byte); diff --git a/src/burn/drv/pst90s/d_blmbycar.cpp b/src/burn/drv/pst90s/d_blmbycar.cpp index 2c76a8d92..f1e56c5b3 100644 --- a/src/burn/drv/pst90s/d_blmbycar.cpp +++ b/src/burn/drv/pst90s/d_blmbycar.cpp @@ -467,12 +467,12 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvVRam1 , 0x104000, 0x105fff, MAP_RAM); - SekMapMemory(DrvVRam0 , 0x106000, 0x107fff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x00c000, 0x440000, 0x441fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x444000, 0x445fff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x000000, 0xfec000, 0xfeffff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvVRam1 , 0x104000, 0x105fff, SM_RAM); + SekMapMemory(DrvVRam0 , 0x106000, 0x107fff, SM_RAM); + SekMapMemory(Drv68KRam + 0x00c000, 0x440000, 0x441fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x444000, 0x445fff, SM_RAM); + SekMapMemory(Drv68KRam + 0x000000, 0xfec000, 0xfeffff, SM_RAM); SekSetReadWordHandler(0, Blmbycar68KReadWord); SekSetWriteWordHandler(0, Blmbycar68KWriteWord); SekSetReadByteHandler(0, Blmbycar68KReadByte); diff --git a/src/burn/drv/pst90s/d_bloodbro.cpp b/src/burn/drv/pst90s/d_bloodbro.cpp index eaa69d708..5f9ddfd69 100644 --- a/src/burn/drv/pst90s/d_bloodbro.cpp +++ b/src/burn/drv/pst90s/d_bloodbro.cpp @@ -618,16 +618,16 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x08afff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x08b000, 0x08bfff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x08c000, 0x08cfff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x08d000, 0x08d7ff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x08d800, 0x08ffff, MAP_RAM); - SekMapMemory(Drv68KRAM + 0xb000, 0x0c1000, 0x0c17ff, MAP_RAM); - SekMapMemory(Drv68KRAM1 + 0x0000, 0x120000, 0x127fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x128000, 0x1287ff, MAP_RAM); - SekMapMemory(Drv68KRAM1 + 0x8800, 0x128800, 0x128fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x08afff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x08b000, 0x08bfff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x08c000, 0x08cfff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x08d000, 0x08d7ff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x08d800, 0x08ffff, SM_RAM); + SekMapMemory(Drv68KRAM + 0xb000, 0x0c1000, 0x0c17ff, SM_RAM); + SekMapMemory(Drv68KRAM1 + 0x0000, 0x120000, 0x127fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x128000, 0x1287ff, SM_RAM); + SekMapMemory(Drv68KRAM1 + 0x8800, 0x128800, 0x128fff, SM_RAM); SekClose(); nGameSelect = 2; @@ -661,14 +661,14 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x08afff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x08b000, 0x08bfff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x08c000, 0x08cfff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x08d000, 0x08d7ff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x08d800, 0x08e7ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x08e800, 0x08f7ff, MAP_RAM); - SekMapMemory(Drv68KRAM + 0xb000, 0x08f800, 0x08ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x08afff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x08b000, 0x08bfff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x08c000, 0x08cfff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x08d000, 0x08d7ff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x08d800, 0x08e7ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x08e800, 0x08f7ff, SM_RAM); + SekMapMemory(Drv68KRAM + 0xb000, 0x08f800, 0x08ffff, SM_RAM); SekSetWriteByteHandler(0, bloodbro_write_byte); SekSetWriteWordHandler(0, bloodbro_write_word); SekSetReadByteHandler(0, bloodbro_read_byte); diff --git a/src/burn/drv/pst90s/d_crospang.cpp b/src/burn/drv/pst90s/d_crospang.cpp index f0e460ab9..1b022f425 100644 --- a/src/burn/drv/pst90s/d_crospang.cpp +++ b/src/burn/drv/pst90s/d_crospang.cpp @@ -433,13 +433,13 @@ static INT32 DrvInit(INT32 (*pRomLoadCallback)()) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvFgRAM, 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x122000, 0x1227ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x200000, 0x2005ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x210000, 0x2107ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x320000, 0x32ffff, MAP_RAM); // crospang, heuksun - SekMapMemory(Drv68KRAM, 0x3a0000, 0x3affff, MAP_RAM); // bestri + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvFgRAM, 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x122000, 0x1227ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x200000, 0x2005ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x210000, 0x2107ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x320000, 0x32ffff, SM_RAM); // crospang, heuksun + SekMapMemory(Drv68KRAM, 0x3a0000, 0x3affff, SM_RAM); // bestri SekSetWriteByteHandler(0, crospang_write_byte); SekSetWriteWordHandler(0, crospang_write_word); SekSetReadByteHandler(0, crospang_read_byte); diff --git a/src/burn/drv/pst90s/d_crshrace.cpp b/src/burn/drv/pst90s/d_crshrace.cpp index 39c22f5d4..759d07818 100644 --- a/src/burn/drv/pst90s/d_crshrace.cpp +++ b/src/burn/drv/pst90s/d_crshrace.cpp @@ -498,16 +498,16 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KROM + 0x100000, 0x300000, 0x3fffff, MAP_ROM); - SekMapMemory(Drv68KROM + 0x200000, 0x400000, 0x4fffff, MAP_ROM); - SekMapMemory(Drv68KROM + 0x200000, 0x500000, 0x5fffff, MAP_ROM); - SekMapMemory(DrvSprRAM2, 0xa00000, 0xa0ffff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0xd00000, 0xd01fff, MAP_ROM); - SekMapMemory(DrvSprRAM1, 0xe00000, 0xe01fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xfe0000, 0xfeffff, MAP_RAM); - SekMapMemory(DrvVidRAM2, 0xffd000, 0xffdfff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xffe000, 0xffefff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KROM + 0x100000, 0x300000, 0x3fffff, SM_ROM); + SekMapMemory(Drv68KROM + 0x200000, 0x400000, 0x4fffff, SM_ROM); + SekMapMemory(Drv68KROM + 0x200000, 0x500000, 0x5fffff, SM_ROM); + SekMapMemory(DrvSprRAM2, 0xa00000, 0xa0ffff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0xd00000, 0xd01fff, SM_ROM); + SekMapMemory(DrvSprRAM1, 0xe00000, 0xe01fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xfe0000, 0xfeffff, SM_RAM); + SekMapMemory(DrvVidRAM2, 0xffd000, 0xffdfff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xffe000, 0xffefff, SM_RAM); SekSetWriteWordHandler(0, crshrace_write_word); SekSetWriteByteHandler(0, crshrace_write_byte); SekSetReadWordHandler(0, crshrace_read_word); diff --git a/src/burn/drv/pst90s/d_dcon.cpp b/src/burn/drv/pst90s/d_dcon.cpp index f82fa72ad..d36090700 100644 --- a/src/burn/drv/pst90s/d_dcon.cpp +++ b/src/burn/drv/pst90s/d_dcon.cpp @@ -352,14 +352,14 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x08bfff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x08c000, 0x08c7ff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x08c800, 0x08cfff, MAP_RAM); - SekMapMemory(DrvMgRAM, 0x08d000, 0x08d7ff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x08d800, 0x08e7ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x08e800, 0x08f7ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x08f800, 0x08ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x08bfff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x08c000, 0x08c7ff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x08c800, 0x08cfff, SM_RAM); + SekMapMemory(DrvMgRAM, 0x08d000, 0x08d7ff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x08d800, 0x08e7ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x08e800, 0x08f7ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x08f800, 0x08ffff, SM_RAM); SekSetWriteWordHandler(0, dcon_main_write_word); SekSetReadWordHandler(0, dcon_main_read_word); SekClose(); diff --git a/src/burn/drv/pst90s/d_ddragon3.cpp b/src/burn/drv/pst90s/d_ddragon3.cpp index 2b706c58e..0d3a64495 100644 --- a/src/burn/drv/pst90s/d_ddragon3.cpp +++ b/src/burn/drv/pst90s/d_ddragon3.cpp @@ -1227,12 +1227,12 @@ static INT32 DrvInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvFgVideoRam , 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(DrvBgVideoRam , 0x082000, 0x0827ff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x1405ff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x180000, 0x180fff, MAP_RAM); - SekMapMemory(Drv68KRam , 0x1c0000, 0x1c3fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvFgVideoRam , 0x080000, 0x080fff, SM_RAM); + SekMapMemory(DrvBgVideoRam , 0x082000, 0x0827ff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x1405ff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x180000, 0x180fff, SM_RAM); + SekMapMemory(Drv68KRam , 0x1c0000, 0x1c3fff, SM_RAM); SekSetReadWordHandler(0, Ddragon368KReadWord); SekSetWriteWordHandler(0, Ddragon368KWriteWord); SekSetReadByteHandler(0, Ddragon368KReadByte); @@ -1339,12 +1339,12 @@ static INT32 DrvpInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvFgVideoRam , 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(DrvBgVideoRam , 0x082000, 0x0827ff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x1405ff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x180000, 0x180fff, MAP_RAM); - SekMapMemory(Drv68KRam , 0x1c0000, 0x1c3fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvFgVideoRam , 0x080000, 0x080fff, SM_RAM); + SekMapMemory(DrvBgVideoRam , 0x082000, 0x0827ff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x1405ff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x180000, 0x180fff, SM_RAM); + SekMapMemory(Drv68KRam , 0x1c0000, 0x1c3fff, SM_RAM); SekSetReadWordHandler(0, Ddragon368KReadWord); SekSetWriteWordHandler(0, Ddragon368KWriteWord); SekSetReadByteHandler(0, Ddragon368KReadByte); @@ -1448,12 +1448,12 @@ static INT32 DrvbInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvFgVideoRam , 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x081000, 0x081fff, MAP_RAM); - SekMapMemory(DrvBgVideoRam , 0x082000, 0x0827ff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x100000, 0x1005ff, MAP_RAM); - SekMapMemory(Drv68KRam , 0x1c0000, 0x1c3fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvFgVideoRam , 0x080000, 0x080fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x081000, 0x081fff, SM_RAM); + SekMapMemory(DrvBgVideoRam , 0x082000, 0x0827ff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x100000, 0x1005ff, SM_RAM); + SekMapMemory(Drv68KRam , 0x1c0000, 0x1c3fff, SM_RAM); SekSetReadWordHandler(0, Ddragon3b68KReadWord); SekSetWriteWordHandler(0, Ddragon3b68KWriteWord); SekSetReadByteHandler(0, Ddragon3b68KReadByte); @@ -1586,13 +1586,13 @@ static INT32 CtribeInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvFgVideoRam , 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x081000, 0x081fff, MAP_RAM); - SekMapMemory(DrvBgVideoRam , 0x082000, 0x0827ff, MAP_RAM); - SekMapMemory(Drv68KRam , 0x082800, 0x082fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x100000, 0x1005ff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x800 , 0x1c0000, 0x1c3fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvFgVideoRam , 0x080000, 0x080fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x081000, 0x081fff, SM_RAM); + SekMapMemory(DrvBgVideoRam , 0x082000, 0x0827ff, SM_RAM); + SekMapMemory(Drv68KRam , 0x082800, 0x082fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x100000, 0x1005ff, SM_RAM); + SekMapMemory(Drv68KRam + 0x800 , 0x1c0000, 0x1c3fff, SM_RAM); SekSetReadWordHandler(0, Ctribeb68KReadWord); SekSetWriteWordHandler(0, Ctribeb68KWriteWord); SekSetReadByteHandler(0, Ctribeb68KReadByte); diff --git a/src/burn/drv/pst90s/d_deniam.cpp b/src/burn/drv/pst90s/d_deniam.cpp index a4a262221..5a51c0df9 100644 --- a/src/burn/drv/pst90s/d_deniam.cpp +++ b/src/burn/drv/pst90s/d_deniam.cpp @@ -440,12 +440,12 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvVidRAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(DrvTxtRAM, 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x440000, 0x4407ff, MAP_WRITE); - SekMapMemory(DrvPalRAM, 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvVidRAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(DrvTxtRAM, 0x410000, 0x410fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x440000, 0x4407ff, SM_WRITE); + SekMapMemory(DrvPalRAM, 0x840000, 0x840fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, SM_RAM); SekSetWriteByteHandler(0, deniam16_write_byte); SekSetReadByteHandler(0, deniam16_read_byte); SekClose(); diff --git a/src/burn/drv/pst90s/d_diverboy.cpp b/src/burn/drv/pst90s/d_diverboy.cpp index b375a4d36..a970eb705 100644 --- a/src/burn/drv/pst90s/d_diverboy.cpp +++ b/src/burn/drv/pst90s/d_diverboy.cpp @@ -289,10 +289,10 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x040000, 0x04ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x080000, 0x083fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x140000, 0x1407ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x040000, 0x04ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x080000, 0x083fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x140000, 0x1407ff, SM_RAM); SekSetWriteByteHandler(0, diverboy_write_byte); SekSetWriteWordHandler(0, diverboy_write_word); SekSetReadByteHandler(0, diverboy_read_byte); diff --git a/src/burn/drv/pst90s/d_dooyong.cpp b/src/burn/drv/pst90s/d_dooyong.cpp index b1901f74a..b0165af7f 100644 --- a/src/burn/drv/pst90s/d_dooyong.cpp +++ b/src/burn/drv/pst90s/d_dooyong.cpp @@ -802,7 +802,7 @@ static void bankswitch(INT32 data) { z80_bank_select[0] = data; - ZetMapMemory(DrvZ80ROM0 + ((data & 0x07) * 0x4000), 0x8000, 0xbfff, MAP_ROM); + ZetMapMemory(DrvZ80ROM0 + ((data & 0x07) * 0x4000), 0x8000, 0xbfff, ZET_ROM); } static void __fastcall lastday_main_write(UINT16 address, UINT8 data) @@ -1630,8 +1630,8 @@ static void DrvSoundCPUInit(INT32 cpuno, INT32 type) { ZetInit(cpuno); ZetOpen(cpuno); - ZetMapMemory(DrvZ80ROM1, ((type) ? 0x0000 : 0x0000), ((type) ? 0xefff : 0x7fff), MAP_ROM); - ZetMapMemory(DrvZ80RAM1, ((type) ? 0xf000 : 0xc000), ((type) ? 0xf7ff : 0xc7ff), MAP_RAM); + ZetMapMemory(DrvZ80ROM1, ((type) ? 0x0000 : 0x0000), ((type) ? 0xefff : 0x7fff), ZET_ROM); + ZetMapMemory(DrvZ80RAM1, ((type) ? 0xf000 : 0xc000), ((type) ? 0xf7ff : 0xc7ff), ZET_RAM); ZetSetWriteHandler(sound_write); ZetSetReadHandler(sound_read); ZetClose(); @@ -1682,11 +1682,11 @@ static INT32 LastdayInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvPalRAM, 0xc800, 0xcfff, MAP_ROM); - ZetMapMemory(DrvTxtRAM, 0xd000, 0xdfff, MAP_RAM); - ZetMapMemory(DrvZ80RAM0, 0xe000, 0xefff, MAP_RAM); - ZetMapMemory(DrvSprRAM, 0xf000, 0xffff, MAP_RAM); + ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvPalRAM, 0xc800, 0xcfff, ZET_ROM); + ZetMapMemory(DrvTxtRAM, 0xd000, 0xdfff, ZET_RAM); + ZetMapMemory(DrvZ80RAM0, 0xe000, 0xefff, ZET_RAM); + ZetMapMemory(DrvSprRAM, 0xf000, 0xffff, ZET_RAM); ZetSetWriteHandler(lastday_main_write); ZetSetReadHandler(lastday_main_read); ZetClose(); @@ -1749,11 +1749,11 @@ static INT32 GulfstrmInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM0, 0xc000, 0xcfff, MAP_RAM); - ZetMapMemory(DrvSprRAM, 0xd000, 0xdfff, MAP_RAM); - ZetMapMemory(DrvTxtRAM, 0xe000, 0xefff, MAP_RAM); - ZetMapMemory(DrvPalRAM, 0xf800, 0xffff, MAP_ROM); + ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM0, 0xc000, 0xcfff, ZET_RAM); + ZetMapMemory(DrvSprRAM, 0xd000, 0xdfff, ZET_RAM); + ZetMapMemory(DrvTxtRAM, 0xe000, 0xefff, ZET_RAM); + ZetMapMemory(DrvPalRAM, 0xf800, 0xffff, ZET_ROM); ZetSetWriteHandler(gulfstrm_main_write); ZetSetReadHandler(gulfstrm_main_read); ZetClose(); @@ -1819,11 +1819,11 @@ static INT32 PolluxInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM0, 0xc000, 0xcfff, MAP_RAM); - ZetMapMemory(DrvSprRAM, 0xd000, 0xdfff, MAP_RAM); - ZetMapMemory(DrvTxtRAM, 0xe000, 0xefff, MAP_RAM); - ZetMapMemory(DrvPalRAM, 0xf800, 0xffff, MAP_ROM); + ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM0, 0xc000, 0xcfff, ZET_RAM); + ZetMapMemory(DrvSprRAM, 0xd000, 0xdfff, ZET_RAM); + ZetMapMemory(DrvTxtRAM, 0xe000, 0xefff, ZET_RAM); + ZetMapMemory(DrvPalRAM, 0xf800, 0xffff, ZET_ROM); ZetSetWriteHandler(gulfstrm_main_write); ZetSetReadHandler(pollux_main_read); ZetClose(); @@ -1918,11 +1918,11 @@ static INT32 FlytigerCommonInit(INT32 game_select) ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvSprRAM, 0xc000, 0xcfff, MAP_RAM); - ZetMapMemory(DrvZ80RAM0, 0xd000, 0xdfff, MAP_RAM); - ZetMapMemory(DrvPalRAM, 0xe800, 0xefff, MAP_ROM); - ZetMapMemory(DrvTxtRAM, 0xf000, 0xffff, MAP_RAM); + ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvSprRAM, 0xc000, 0xcfff, ZET_RAM); + ZetMapMemory(DrvZ80RAM0, 0xd000, 0xdfff, ZET_RAM); + ZetMapMemory(DrvPalRAM, 0xe800, 0xefff, ZET_ROM); + ZetMapMemory(DrvTxtRAM, 0xf000, 0xffff, ZET_RAM); ZetSetWriteHandler(flytiger_main_write); ZetSetReadHandler(flytiger_main_read); ZetClose(); @@ -1987,11 +1987,11 @@ static INT32 BluehawkInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvPalRAM, 0xc800, 0xcfff, MAP_ROM); - ZetMapMemory(DrvTxtRAM, 0xd000, 0xdfff, MAP_RAM); - ZetMapMemory(DrvSprRAM, 0xe000, 0xefff, MAP_RAM); - ZetMapMemory(DrvZ80RAM0, 0xf000, 0xffff, MAP_RAM); + ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvPalRAM, 0xc800, 0xcfff, ZET_ROM); + ZetMapMemory(DrvTxtRAM, 0xd000, 0xdfff, ZET_RAM); + ZetMapMemory(DrvSprRAM, 0xe000, 0xefff, ZET_RAM); + ZetMapMemory(DrvZ80RAM0, 0xf000, 0xffff, ZET_RAM); ZetSetWriteHandler(bluehawk_main_write); ZetSetReadHandler(bluehawk_main_read); ZetClose(); @@ -2075,10 +2075,10 @@ static INT32 PrimellaCommonInit(INT32 game_select) ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM0, 0xc000, 0xd3ff, MAP_RAM); - ZetMapMemory(DrvTxtRAM, 0xe000, 0xefff, MAP_RAM); - ZetMapMemory(DrvPalRAM, 0xf000, 0xf7ff, MAP_ROM); + ZetMapMemory(DrvZ80ROM0, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM0, 0xc000, 0xd3ff, ZET_RAM); + ZetMapMemory(DrvTxtRAM, 0xe000, 0xefff, ZET_RAM); + ZetMapMemory(DrvPalRAM, 0xf000, 0xf7ff, ZET_ROM); ZetSetWriteHandler(primella_main_write); ZetSetReadHandler(primella_main_read); ZetClose(); @@ -2223,18 +2223,18 @@ static INT32 RsharkCommonInit(INT32 game_select) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); if (game_select > 0) { - SekMapMemory(Drv68KRAM0, 0x040000, 0x04cfff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x04d000, 0x04dfff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x04e000, 0x04ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x0c8000, 0x0c8fff, MAP_ROM); + SekMapMemory(Drv68KRAM0, 0x040000, 0x04cfff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x04d000, 0x04dfff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x04e000, 0x04ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x0c8000, 0x0c8fff, SM_ROM); } else { - SekMapMemory(DrvPalRAM, 0x088000, 0x088fff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x0d0000, 0x0dcfff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x0dd000, 0x0ddfff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x0de000, 0x0dffff, MAP_RAM); + SekMapMemory(DrvPalRAM, 0x088000, 0x088fff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x0d0000, 0x0dcfff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x0dd000, 0x0ddfff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x0de000, 0x0dffff, SM_RAM); } SekSetWriteWordHandler(0, superx_main_write_word); diff --git a/src/burn/drv/pst90s/d_drgnmst.cpp b/src/burn/drv/pst90s/d_drgnmst.cpp index 9cba5ba3c..a7847dfd8 100644 --- a/src/burn/drv/pst90s/d_drgnmst.cpp +++ b/src/burn/drv/pst90s/d_drgnmst.cpp @@ -578,14 +578,14 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x900000, 0x903fff, MAP_ROM); - SekMapMemory(DrvMidRAM, 0x904000, 0x907fff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x908000, 0x90bfff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x90c000, 0x90ffff, MAP_RAM); - SekMapMemory(DrvRowScroll, 0x920000, 0x923fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x930000, 0x9307ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x900000, 0x903fff, SM_ROM); + SekMapMemory(DrvMidRAM, 0x904000, 0x907fff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x908000, 0x90bfff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x90c000, 0x90ffff, SM_RAM); + SekMapMemory(DrvRowScroll, 0x920000, 0x923fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x930000, 0x9307ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, SM_RAM); SekSetWriteByteHandler(0, drgnmst_write_byte); SekSetWriteWordHandler(0, drgnmst_write_word); SekSetReadByteHandler(0, drgnmst_read_byte); diff --git a/src/burn/drv/pst90s/d_drtomy.cpp b/src/burn/drv/pst90s/d_drtomy.cpp index 576a6e24f..753c52dc2 100644 --- a/src/burn/drv/pst90s/d_drtomy.cpp +++ b/src/burn/drv/pst90s/d_drtomy.cpp @@ -276,11 +276,11 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Rom, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(VidRam, 0x100000, 0x101fff, MAP_RAM); - SekMapMemory(PalRam, 0x200000, 0x1007ff, MAP_ROM); - SekMapMemory(SprRam, 0x440000, 0x440fff, MAP_RAM); - SekMapMemory(WorkRam, 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(Rom, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(VidRam, 0x100000, 0x101fff, SM_RAM); + SekMapMemory(PalRam, 0x200000, 0x1007ff, SM_ROM); + SekMapMemory(SprRam, 0x440000, 0x440fff, SM_RAM); + SekMapMemory(WorkRam, 0xffc000, 0xffffff, SM_RAM); SekSetWriteByteHandler(0, drtomy_write_byte); SekSetWriteWordHandler(0, drtomy_write_word); SekSetReadByteHandler(0, drtomy_read_byte); diff --git a/src/burn/drv/pst90s/d_esd16.cpp b/src/burn/drv/pst90s/d_esd16.cpp index 9325449d8..7806df9d4 100644 --- a/src/burn/drv/pst90s/d_esd16.cpp +++ b/src/burn/drv/pst90s/d_esd16.cpp @@ -1265,13 +1265,13 @@ static INT32 multchmpCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x200000, 0x2005ff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x300000, 0x3007ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x300800, 0x300fff, MAP_RAM); // mirror - SekMapMemory(DrvVidRAM0, 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x420000, 0x423fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x200000, 0x2005ff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x300000, 0x3007ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x300800, 0x300fff, SM_RAM); // mirror + SekMapMemory(DrvVidRAM0, 0x400000, 0x403fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x420000, 0x423fff, SM_RAM); SekSetWriteByteHandler(0, multchmp_write_byte); SekSetWriteWordHandler(0, multchmp_write_word); SekSetReadByteHandler(0, multchmp_read_byte); @@ -1384,14 +1384,14 @@ static INT32 hedpanicCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x800000, 0x8007ff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x900000, 0x9007ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x900800, 0x900fff, MAP_RAM); // mirror - SekMapMemory(DrvVidRAM0, 0xa00000, 0xa03fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0xa20000, 0xa23fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0xa24000, 0xa27fff, MAP_RAM); // mirror + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x800000, 0x8007ff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x900000, 0x9007ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x900800, 0x900fff, SM_RAM); // mirror + SekMapMemory(DrvVidRAM0, 0xa00000, 0xa03fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0xa20000, 0xa23fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0xa24000, 0xa27fff, SM_RAM); // mirror SekSetWriteByteHandler(0, hedpanic_write_byte); SekSetWriteWordHandler(0, hedpanic_write_word); SekSetReadByteHandler(0, hedpanic_read_byte); @@ -1496,14 +1496,14 @@ static INT32 mchampdxCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x300000, 0x303fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x320000, 0x323fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x324000, 0x327fff, MAP_RAM); // mirror - SekMapMemory(DrvPalRAM, 0x400000, 0x400fff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x600000, 0x6007ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x600800, 0x6007ff, MAP_RAM); // mirror + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x300000, 0x303fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x320000, 0x323fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x324000, 0x327fff, SM_RAM); // mirror + SekMapMemory(DrvPalRAM, 0x400000, 0x400fff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x600000, 0x6007ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x600800, 0x6007ff, SM_RAM); // mirror SekSetWriteByteHandler(0, mchampdx_write_byte); SekSetWriteWordHandler(0, mchampdx_write_word); SekSetReadByteHandler(0, mchampdx_read_byte); @@ -1608,14 +1608,14 @@ static INT32 tangtangCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x100000, 0x100fff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x200000, 0x2007ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x200800, 0x200fff, MAP_RAM); // mirror - SekMapMemory(DrvVidRAM0, 0x300000, 0x303fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x320000, 0x323fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x324000, 0x327fff, MAP_RAM); // mirror - SekMapMemory(Drv68KRAM, 0x700000, 0x70ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x100000, 0x100fff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x200000, 0x2007ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x200800, 0x200fff, SM_RAM); // mirror + SekMapMemory(DrvVidRAM0, 0x300000, 0x303fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x320000, 0x323fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x324000, 0x327fff, SM_RAM); // mirror + SekMapMemory(Drv68KRAM, 0x700000, 0x70ffff, SM_RAM); SekSetWriteByteHandler(0, tangtang_write_byte); SekSetWriteWordHandler(0, tangtang_write_word); SekSetReadByteHandler(0, tangtang_read_byte); @@ -1688,14 +1688,14 @@ static INT32 swatpolcCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x800000, 0x8007ff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x900000, 0x9007ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x900800, 0x900fff, MAP_RAM); // mirror - SekMapMemory(DrvVidRAM0, 0xa00000, 0xa03fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0xa20000, 0xa23fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0xa24000, 0xa27fff, MAP_RAM); // mirror + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x800000, 0x8007ff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x900000, 0x9007ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x900800, 0x900fff, SM_RAM); // mirror + SekMapMemory(DrvVidRAM0, 0xa00000, 0xa03fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0xa20000, 0xa23fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0xa24000, 0xa27fff, SM_RAM); // mirror SekSetWriteByteHandler(0, hedpanic_write_byte); SekSetWriteWordHandler(0, hedpanic_write_word); SekSetReadByteHandler(0, hedpanic_read_byte); diff --git a/src/burn/drv/pst90s/d_f1gp.cpp b/src/burn/drv/pst90s/d_f1gp.cpp index d9e978da4..5a9ed82dc 100644 --- a/src/burn/drv/pst90s/d_f1gp.cpp +++ b/src/burn/drv/pst90s/d_f1gp.cpp @@ -685,29 +685,29 @@ static INT32 DrvInit(INT32 nGame) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM0, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KROM0 + 0x100000, 0x100000, 0x2fffff, MAP_ROM); - SekMapMemory(DrvRozVidRAM, 0xd00000, 0xd01fff, MAP_ROM); - SekMapMemory(DrvRozVidRAM, 0xd02000, 0xd03fff, MAP_ROM); - SekMapMemory(DrvRozVidRAM, 0xd04000, 0xd05fff, MAP_ROM); - SekMapMemory(DrvRozVidRAM, 0xd06000, 0xd07fff, MAP_ROM); + SekMapMemory(Drv68KROM0, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KROM0 + 0x100000, 0x100000, 0x2fffff, SM_ROM); + SekMapMemory(DrvRozVidRAM, 0xd00000, 0xd01fff, SM_ROM); + SekMapMemory(DrvRozVidRAM, 0xd02000, 0xd03fff, SM_ROM); + SekMapMemory(DrvRozVidRAM, 0xd04000, 0xd05fff, SM_ROM); + SekMapMemory(DrvRozVidRAM, 0xd06000, 0xd07fff, SM_ROM); if (nGame) { - SekMapMemory(DrvSprCGRAM1, 0xa00000, 0xa07fff, MAP_RAM); - SekMapMemory(DrvSprVRAM1, 0xe00000, 0xe00fff, MAP_RAM); + SekMapMemory(DrvSprCGRAM1, 0xa00000, 0xa07fff, SM_RAM); + SekMapMemory(DrvSprVRAM1, 0xe00000, 0xe00fff, SM_RAM); } else { - SekMapMemory(Drv68KROM0 + 0x300000, 0xa00000, 0xbfffff, MAP_ROM); - SekMapMemory(DrvZoomRAM, 0xc00000, 0xc3ffff, MAP_ROM); - SekMapMemory(DrvSprCGRAM1, 0xe00000, 0xe03fff, MAP_RAM); - SekMapMemory(DrvSprCGRAM2, 0xe04000, 0xe07fff, MAP_RAM); - SekMapMemory(DrvSprVRAM1, 0xf00000, 0xf003ff, MAP_RAM); - SekMapMemory(DrvSprVRAM2, 0xf10000, 0xf103ff, MAP_RAM); + SekMapMemory(Drv68KROM0 + 0x300000, 0xa00000, 0xbfffff, SM_ROM); + SekMapMemory(DrvZoomRAM, 0xc00000, 0xc3ffff, SM_ROM); + SekMapMemory(DrvSprCGRAM1, 0xe00000, 0xe03fff, SM_RAM); + SekMapMemory(DrvSprCGRAM2, 0xe04000, 0xe07fff, SM_RAM); + SekMapMemory(DrvSprVRAM1, 0xf00000, 0xf003ff, SM_RAM); + SekMapMemory(DrvSprVRAM2, 0xf10000, 0xf103ff, SM_RAM); } - SekMapMemory(Drv68KRAM0, 0xff8000, 0xffbfff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0xffc000, 0xffcfff, MAP_RAM); - SekMapMemory(DrvVidRAM, 0xffd000, 0xffdfff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xffe000, 0xffefff, MAP_RAM); + SekMapMemory(Drv68KRAM0, 0xff8000, 0xffbfff, SM_RAM); + SekMapMemory(DrvShareRAM, 0xffc000, 0xffcfff, SM_RAM); + SekMapMemory(DrvVidRAM, 0xffd000, 0xffdfff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xffe000, 0xffefff, SM_RAM); SekSetWriteWordHandler(0, f1gp_main_write_word); SekSetWriteByteHandler(0, f1gp_main_write_byte); SekSetReadWordHandler(0, f1gp_main_read_word); @@ -716,9 +716,9 @@ static INT32 DrvInit(INT32 nGame) SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Drv68KROM1, 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(Drv68KRAM1, 0xff8000, 0xffbfff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0xffc000, 0xffcfff, MAP_RAM); + SekMapMemory(Drv68KROM1, 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(Drv68KRAM1, 0xff8000, 0xffbfff, SM_RAM); + SekMapMemory(DrvShareRAM, 0xffc000, 0xffcfff, SM_RAM); SekClose(); ZetInit(0); diff --git a/src/burn/drv/pst90s/d_fstarfrc.cpp b/src/burn/drv/pst90s/d_fstarfrc.cpp index 6a3d6254f..46af17619 100644 --- a/src/burn/drv/pst90s/d_fstarfrc.cpp +++ b/src/burn/drv/pst90s/d_fstarfrc.cpp @@ -728,31 +728,31 @@ INT32 FstarfrcInit() SekInit(0, 0x68000); SekOpen(0); if (!strncmp(BurnDrvGetTextA(DRV_NAME), "fstarfrc", 8)) { - SekMapMemory(FstarfrcRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(FstarfrcRam , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(FstarfrcCharRam , 0x110000, 0x110fff, MAP_RAM); - SekMapMemory(FstarfrcVideoRam , 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(FstarfrcColourRam , 0x120800, 0x120fff, MAP_RAM); - SekMapMemory(FstarfrcVideo2Ram , 0x121000, 0x1217ff, MAP_RAM); - SekMapMemory(FstarfrcColour2Ram , 0x121800, 0x121fff, MAP_RAM); - SekMapMemory(FstarfrcRam + 0x4000, 0x122000, 0x127fff, MAP_RAM); - SekMapMemory(FstarfrcSpriteRam , 0x130000, 0x130fff, MAP_RAM); - SekMapMemory(FstarfrcPaletteRam , 0x140000, 0x141fff, MAP_RAM); + SekMapMemory(FstarfrcRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(FstarfrcRam , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(FstarfrcCharRam , 0x110000, 0x110fff, SM_RAM); + SekMapMemory(FstarfrcVideoRam , 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(FstarfrcColourRam , 0x120800, 0x120fff, SM_RAM); + SekMapMemory(FstarfrcVideo2Ram , 0x121000, 0x1217ff, SM_RAM); + SekMapMemory(FstarfrcColour2Ram , 0x121800, 0x121fff, SM_RAM); + SekMapMemory(FstarfrcRam + 0x4000, 0x122000, 0x127fff, SM_RAM); + SekMapMemory(FstarfrcSpriteRam , 0x130000, 0x130fff, SM_RAM); + SekMapMemory(FstarfrcPaletteRam , 0x140000, 0x141fff, SM_RAM); SekSetReadWordHandler(0, FstarfrcReadWord); SekSetWriteWordHandler(0, FstarfrcWriteWord); SekSetReadByteHandler(0, FstarfrcReadByte); SekSetWriteByteHandler(0, FstarfrcWriteByte); } else { - SekMapMemory(FstarfrcRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(FstarfrcRam , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(FstarfrcCharRam , 0x110000, 0x110fff, MAP_RAM); - SekMapMemory(FstarfrcVideoRam , 0x120000, 0x120fff, MAP_RAM); - SekMapMemory(FstarfrcColourRam , 0x121000, 0x121fff, MAP_RAM); - SekMapMemory(FstarfrcVideo2Ram , 0x122000, 0x122fff, MAP_RAM); - SekMapMemory(FstarfrcColour2Ram , 0x123000, 0x123fff, MAP_RAM); - SekMapMemory(FstarfrcRam + 0x4000, 0x124000, 0x124fff, MAP_RAM); - SekMapMemory(FstarfrcSpriteRam , 0x130000, 0x130fff, MAP_RAM); - SekMapMemory(FstarfrcPaletteRam , 0x140000, 0x141fff, MAP_RAM); + SekMapMemory(FstarfrcRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(FstarfrcRam , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(FstarfrcCharRam , 0x110000, 0x110fff, SM_RAM); + SekMapMemory(FstarfrcVideoRam , 0x120000, 0x120fff, SM_RAM); + SekMapMemory(FstarfrcColourRam , 0x121000, 0x121fff, SM_RAM); + SekMapMemory(FstarfrcVideo2Ram , 0x122000, 0x122fff, SM_RAM); + SekMapMemory(FstarfrcColour2Ram , 0x123000, 0x123fff, SM_RAM); + SekMapMemory(FstarfrcRam + 0x4000, 0x124000, 0x124fff, SM_RAM); + SekMapMemory(FstarfrcSpriteRam , 0x130000, 0x130fff, SM_RAM); + SekMapMemory(FstarfrcPaletteRam , 0x140000, 0x141fff, SM_RAM); SekSetReadWordHandler(0, GinkunReadWord); SekSetWriteWordHandler(0, GinkunWriteWord); SekSetReadByteHandler(0, GinkunReadByte); diff --git a/src/burn/drv/pst90s/d_funybubl.cpp b/src/burn/drv/pst90s/d_funybubl.cpp index 265ecdf19..a9ab117a2 100644 --- a/src/burn/drv/pst90s/d_funybubl.cpp +++ b/src/burn/drv/pst90s/d_funybubl.cpp @@ -192,7 +192,7 @@ void __fastcall funybubl_out(UINT16 port, UINT8 data) ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); ZetOpen(0); return; @@ -489,7 +489,7 @@ static INT32 DrvFrame() ZetOpen(0); nSegment = (nCyclesTotal[0] - nCyclesDone[0]) / (nInterleave - i); nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetRaiseIrq(0); ZetClose(); ZetOpen(1); diff --git a/src/burn/drv/pst90s/d_fuukifg3.cpp b/src/burn/drv/pst90s/d_fuukifg3.cpp index ca332b5a2..55f543389 100644 --- a/src/burn/drv/pst90s/d_fuukifg3.cpp +++ b/src/burn/drv/pst90s/d_fuukifg3.cpp @@ -620,16 +620,16 @@ static INT32 DrvInit() SekInit(0, 0x68ec020); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x410000, 0x41ffff, MAP_RAM); - SekMapMemory(DrvBgRAM1, 0x500000, 0x501fff, MAP_RAM); - SekMapMemory(DrvBgRAM2, 0x502000, 0x503fff, MAP_RAM); - SekMapMemory(DrvFgRAM1, 0x504000, 0x505fff, MAP_RAM); - SekMapMemory(DrvFgRAM2, 0x506000, 0x507fff, MAP_RAM); - SekMapMemory(DrvFgRAM2 + 0x2000,0x508000, 0x517fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x600000, 0x601fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x700000, 0x703fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x410000, 0x41ffff, SM_RAM); + SekMapMemory(DrvBgRAM1, 0x500000, 0x501fff, SM_RAM); + SekMapMemory(DrvBgRAM2, 0x502000, 0x503fff, SM_RAM); + SekMapMemory(DrvFgRAM1, 0x504000, 0x505fff, SM_RAM); + SekMapMemory(DrvFgRAM2, 0x506000, 0x507fff, SM_RAM); + SekMapMemory(DrvFgRAM2 + 0x2000,0x508000, 0x517fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x600000, 0x601fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x700000, 0x703fff, SM_RAM); SekSetWriteLongHandler(0, fuuki32_write_long); SekSetWriteWordHandler(0, fuuki32_write_word); SekSetWriteByteHandler(0, fuuki32_write_byte); diff --git a/src/burn/drv/pst90s/d_gaelco.cpp b/src/burn/drv/pst90s/d_gaelco.cpp index 5c308aa02..e973e0341 100644 --- a/src/burn/drv/pst90s/d_gaelco.cpp +++ b/src/burn/drv/pst90s/d_gaelco.cpp @@ -826,17 +826,17 @@ static INT32 DrvInit(INT32 (*pRomLoadCallback)(), INT32 encrypted_ram, INT32 sou SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvVidRAM, 0x100000, 0x103fff, encrypted_ram ? MAP_ROM : MAP_RAM); - SekMapMemory(DrvPalRAM, 0x200000, 0x2007ff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x440000, 0x440fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvVidRAM, 0x100000, 0x103fff, encrypted_ram ? SM_ROM : SM_RAM); + SekMapMemory(DrvPalRAM, 0x200000, 0x2007ff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x440000, 0x440fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, main_write_word); SekSetWriteByteHandler(0, main_write_byte); SekSetReadWordHandler(0, main_read_word); SekSetReadByteHandler(0, main_read_byte); - SekMapHandler(1, 0x200000, 0x2007FF, MAP_WRITE); + SekMapHandler(1, 0x200000, 0x2007FF, SM_WRITE); SekSetWriteWordHandler(1, palette_write_word); SekSetWriteByteHandler(1, palette_write_byte); SekClose(); @@ -847,8 +847,8 @@ static INT32 DrvInit(INT32 (*pRomLoadCallback)(), INT32 encrypted_ram, INT32 sou { M6809Init(1); M6809Open(0); - M6809MapMemory(Drv6809RAM, 0x0000, 0x07ff, MAP_RAM); - M6809MapMemory(Drv6809ROM + 0x0c00, 0x0c00, 0xffff, MAP_ROM); + M6809MapMemory(Drv6809RAM, 0x0000, 0x07ff, M6809_RAM); + M6809MapMemory(Drv6809ROM + 0x0c00, 0x0c00, 0xffff, M6809_ROM); M6809SetReadHandler(sound_read); M6809SetWriteHandler(sound_write); M6809Close(); diff --git a/src/burn/drv/pst90s/d_gaiden.cpp b/src/burn/drv/pst90s/d_gaiden.cpp index 8e5138126..431727572 100644 --- a/src/burn/drv/pst90s/d_gaiden.cpp +++ b/src/burn/drv/pst90s/d_gaiden.cpp @@ -549,7 +549,7 @@ void __fastcall gaiden_write_byte(UINT32 address, UINT8 data) { case 0x7a00e: // Dragon Bowl soundlatch = data; - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); return; case 0x7a802: // Tecmo Knight @@ -1021,13 +1021,13 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x060000, 0x063fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x070000, 0x070fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x072000, 0x073fff, MAP_RAM); - SekMapMemory(DrvVidRAM2, 0x074000, 0x075fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x076000, 0x077fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x078000, 0x079fff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x060000, 0x063fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x070000, 0x070fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x072000, 0x073fff, SM_RAM); + SekMapMemory(DrvVidRAM2, 0x074000, 0x075fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x076000, 0x077fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x078000, 0x079fff, SM_ROM); SekSetWriteByteHandler(0, gaiden_write_byte); SekSetWriteWordHandler(0, gaiden_write_word); SekSetReadByteHandler(0, gaiden_read_byte); diff --git a/src/burn/drv/pst90s/d_galpanic.cpp b/src/burn/drv/pst90s/d_galpanic.cpp index 7a11580ab..0e8e9257b 100644 --- a/src/burn/drv/pst90s/d_galpanic.cpp +++ b/src/burn/drv/pst90s/d_galpanic.cpp @@ -1077,15 +1077,15 @@ static INT32 GalpanicInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x3FFFFF, MAP_ROM); // CPU 0 ROM + SekMapMemory(Rom68K, 0x000000, 0x3FFFFF, SM_ROM); // CPU 0 ROM SekMapMemory((UINT8 *)RamFg, - 0x500000, 0x51FFFF, MAP_RAM); // f ground + 0x500000, 0x51FFFF, SM_RAM); // f ground SekMapMemory((UINT8 *)RamBg, - 0x520000, 0x53FFFF, MAP_RAM); // b ground + 0x520000, 0x53FFFF, SM_RAM); // b ground SekMapMemory((UINT8 *)RamPal, - 0x600000, 0x6007FF, MAP_RAM); // palette + 0x600000, 0x6007FF, SM_RAM); // palette SekMapMemory((UINT8 *)RamSpr, - 0x700000, 0x7047FF, MAP_RAM); // sprites + 0x700000, 0x7047FF, SM_RAM); // sprites SekSetReadWordHandler(0, GalpanicReadWord); SekSetReadByteHandler(0, GalpanicReadByte); @@ -1141,23 +1141,23 @@ static INT32 FantasiaInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x4FFFFF, MAP_ROM); // CPU 0 ROM + SekMapMemory(Rom68K, 0x000000, 0x4FFFFF, SM_ROM); // CPU 0 ROM SekMapMemory((UINT8 *)RamFg, - 0x500000, 0x51FFFF, MAP_RAM); // f ground + 0x500000, 0x51FFFF, SM_RAM); // f ground SekMapMemory((UINT8 *)RamBg, - 0x520000, 0x53FFFF, MAP_RAM); // b ground + 0x520000, 0x53FFFF, SM_RAM); // b ground SekMapMemory((UINT8 *)RamBgM, - 0x580000, 0x583FFF, MAP_RAM); // another tilemap? + 0x580000, 0x583FFF, SM_RAM); // another tilemap? SekMapMemory((UINT8 *)RamPal, - 0x600000, 0x600FFF, MAP_RAM); // palette + 0x600000, 0x600FFF, SM_RAM); // palette SekMapMemory((UINT8 *)Ram68K, - 0x680000, 0x68001F, MAP_WRITE); // regs? + 0x680000, 0x68001F, SM_WRITE); // regs? SekMapMemory((UINT8 *)RamSpr, - 0x700000, 0x700FFF, MAP_RAM); // sprites + 0x700000, 0x700FFF, SM_RAM); // sprites SekMapMemory((UINT8 *)Ram68K+0x000020, - 0x780000, 0x78001F, MAP_WRITE); // regs? + 0x780000, 0x78001F, SM_WRITE); // regs? SekMapMemory((UINT8 *)Ram68K+0x000040, - 0xC80000, 0xC8FFFF, MAP_RAM); // work ram? + 0xC80000, 0xC8FFFF, SM_RAM); // work ram? SekSetReadWordHandler(0, GalpanicReadWord); @@ -1212,23 +1212,23 @@ static INT32 Missw96Init() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x4FFFFF, MAP_ROM); // CPU 0 ROM + SekMapMemory(Rom68K, 0x000000, 0x4FFFFF, SM_ROM); // CPU 0 ROM SekMapMemory((UINT8 *)RamFg, - 0x500000, 0x51FFFF, MAP_RAM); // f ground + 0x500000, 0x51FFFF, SM_RAM); // f ground SekMapMemory((UINT8 *)RamBg, - 0x520000, 0x53FFFF, MAP_RAM); // b ground + 0x520000, 0x53FFFF, SM_RAM); // b ground SekMapMemory((UINT8 *)RamBgM, - 0x580000, 0x583FFF, MAP_RAM); // another tilemap? + 0x580000, 0x583FFF, SM_RAM); // another tilemap? SekMapMemory((UINT8 *)RamPal, - 0x600000, 0x600FFF, MAP_RAM); // palette + 0x600000, 0x600FFF, SM_RAM); // palette SekMapMemory((UINT8 *)RamSpr, - 0x700000, 0x700FFF, MAP_RAM); // sprites + 0x700000, 0x700FFF, SM_RAM); // sprites SekMapMemory((UINT8 *)Ram68K, - 0xC00000, 0xC0FFFF, MAP_RAM); // work ram? + 0xC00000, 0xC0FFFF, SM_RAM); // work ram? SekMapMemory((UINT8 *)Ram68K+0x010000, - 0x680000, 0x68001F, MAP_RAM); // regs? + 0x680000, 0x68001F, SM_RAM); // regs? SekMapMemory((UINT8 *)Ram68K+0x010020, - 0x780000, 0x78001F, MAP_RAM); // regs? + 0x780000, 0x78001F, SM_RAM); // regs? SekSetReadWordHandler(0, GalpanicReadWord); SekSetReadByteHandler(0, ComadReadByte); @@ -1285,23 +1285,23 @@ static INT32 Fantsia2Init() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x4FFFFF, MAP_ROM); // CPU 0 ROM + SekMapMemory(Rom68K, 0x000000, 0x4FFFFF, SM_ROM); // CPU 0 ROM SekMapMemory((UINT8 *)RamFg, - 0x500000, 0x51FFFF, MAP_RAM); // f ground + 0x500000, 0x51FFFF, SM_RAM); // f ground SekMapMemory((UINT8 *)RamBg, - 0x520000, 0x53FFFF, MAP_RAM); // b ground + 0x520000, 0x53FFFF, SM_RAM); // b ground SekMapMemory((UINT8 *)RamBgM, - 0x580000, 0x583FFF, MAP_RAM); // another tilemap? + 0x580000, 0x583FFF, SM_RAM); // another tilemap? SekMapMemory((UINT8 *)RamPal, - 0x600000, 0x600FFF, MAP_RAM); // palette + 0x600000, 0x600FFF, SM_RAM); // palette SekMapMemory((UINT8 *)RamSpr, - 0x700000, 0x700FFF, MAP_RAM); // sprites + 0x700000, 0x700FFF, SM_RAM); // sprites SekMapMemory((UINT8 *)Ram68K, - 0xF80000, 0xF8FFFF, MAP_RAM); // work ram? + 0xF80000, 0xF8FFFF, SM_RAM); // work ram? SekMapMemory((UINT8 *)Ram68K+0x010000, - 0x680000, 0x68001F, MAP_RAM); // regs? + 0x680000, 0x68001F, SM_RAM); // regs? SekMapMemory((UINT8 *)Ram68K+0x010020, - 0x780000, 0x78001F, MAP_RAM); // regs? + 0x780000, 0x78001F, SM_RAM); // regs? SekSetReadWordHandler(0, GalpanicReadWord); SekSetReadByteHandler(0, ComadReadByte); @@ -1352,23 +1352,23 @@ static INT32 WownfantInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x4FFFFF, MAP_ROM); // CPU 0 ROM + SekMapMemory(Rom68K, 0x000000, 0x4FFFFF, SM_ROM); // CPU 0 ROM SekMapMemory((UINT8 *)RamFg, - 0x500000, 0x51FFFF, MAP_RAM); // f ground + 0x500000, 0x51FFFF, SM_RAM); // f ground SekMapMemory((UINT8 *)RamBg, - 0x520000, 0x53FFFF, MAP_RAM); // b ground + 0x520000, 0x53FFFF, SM_RAM); // b ground SekMapMemory((UINT8 *)RamBgM, - 0x580000, 0x583FFF, MAP_RAM); // another tilemap? + 0x580000, 0x583FFF, SM_RAM); // another tilemap? SekMapMemory((UINT8 *)RamPal, - 0x600000, 0x600FFF, MAP_RAM); // palette + 0x600000, 0x600FFF, SM_RAM); // palette SekMapMemory((UINT8 *)RamSpr, - 0x700000, 0x700FFF, MAP_RAM); // sprites + 0x700000, 0x700FFF, SM_RAM); // sprites SekMapMemory((UINT8 *)Ram68K, - 0xF80000, 0xF8FFFF, MAP_RAM); // work ram? + 0xF80000, 0xF8FFFF, SM_RAM); // work ram? SekMapMemory((UINT8 *)Ram68K+0x010000, - 0x680000, 0x68001F, MAP_RAM); // regs? + 0x680000, 0x68001F, SM_RAM); // regs? SekMapMemory((UINT8 *)Ram68K+0x010020, - 0x780000, 0x78001F, MAP_RAM); // regs? + 0x780000, 0x78001F, SM_RAM); // regs? SekSetReadWordHandler(0, GalpanicReadWord); SekSetReadByteHandler(0, ComadReadByte); @@ -1421,25 +1421,25 @@ static INT32 GalhustlInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Rom68K + 0x100000, 0x200000, 0x2fffff, MAP_ROM); // pgalvip + SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Rom68K + 0x100000, 0x200000, 0x2fffff, SM_ROM); // pgalvip SekMapMemory((UINT8 *)RamFg, - 0x500000, 0x51FFFF, MAP_RAM); // f ground + 0x500000, 0x51FFFF, SM_RAM); // f ground SekMapMemory((UINT8 *)RamBg, - 0x520000, 0x53FFFF, MAP_RAM); // b ground + 0x520000, 0x53FFFF, SM_RAM); // b ground // SekMapMemory((UINT8 *)RamBgM, -// 0x580000, 0x583FFF, MAP_RAM); // another tilemap? -// SekMapHandler(1, 0x580000, 0x583FFF, MAP_WRITE); +// 0x580000, 0x583FFF, SM_RAM); // another tilemap? +// SekMapHandler(1, 0x580000, 0x583FFF, SM_WRITE); SekMapMemory((UINT8 *)RamPal, - 0x600000, 0x600FFF, MAP_RAM); // palette + 0x600000, 0x600FFF, SM_RAM); // palette SekMapMemory((UINT8 *)RamSpr, - 0x700000, 0x700FFF, MAP_RAM); // sprites + 0x700000, 0x700FFF, SM_RAM); // sprites SekMapMemory((UINT8 *)Ram68K, - 0x680000, 0x68001F, MAP_RAM); // regs? + 0x680000, 0x68001F, SM_RAM); // regs? SekMapMemory((UINT8 *)Ram68K+0x000020, - 0x780000, 0x78001F, MAP_RAM); // regs? + 0x780000, 0x78001F, SM_RAM); // regs? SekMapMemory((UINT8 *)Ram68K+0x000040, - 0xE80000, 0xE8FFFF, MAP_RAM); // work ram? + 0xE80000, 0xE8FFFF, SM_RAM); // work ram? SekSetReadWordHandler(0, GalhustlReadWord); SekSetReadByteHandler(0, GalhustlReadByte); @@ -1499,26 +1499,26 @@ static INT32 ZipzapInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x4FFFFF, MAP_ROM); // CPU 0 ROM + SekMapMemory(Rom68K, 0x000000, 0x4FFFFF, SM_ROM); // CPU 0 ROM SekMapMemory((UINT8 *)RamFg, - 0x500000, 0x51FFFF, MAP_RAM); // f ground + 0x500000, 0x51FFFF, SM_RAM); // f ground SekMapMemory((UINT8 *)RamBg, - 0x520000, 0x53FFFF, MAP_RAM); // b ground + 0x520000, 0x53FFFF, SM_RAM); // b ground SekMapMemory((UINT8 *)RamBgM, - 0x580000, 0x583FFF, MAP_RAM); // another tilemap? -// SekMapHandler(1, 0x580000, 0x583FFF, MAP_WRITE); + 0x580000, 0x583FFF, SM_RAM); // another tilemap? +// SekMapHandler(1, 0x580000, 0x583FFF, SM_WRITE); SekMapMemory((UINT8 *)RamPal, - 0x600000, 0x600FFF, MAP_RAM); // palette + 0x600000, 0x600FFF, SM_RAM); // palette SekMapMemory((UINT8 *)RamSpr, - 0x700000, 0x700FFF, MAP_RAM); // sprites + 0x700000, 0x700FFF, SM_RAM); // sprites SekMapMemory((UINT8 *)Ram68K, - 0xC80000, 0xC8FFFF, MAP_RAM); // work ram? + 0xC80000, 0xC8FFFF, SM_RAM); // work ram? SekMapMemory((UINT8 *)Ram68K+0x010000, - 0x680000, 0x68001F, MAP_RAM); // regs? + 0x680000, 0x68001F, SM_RAM); // regs? SekMapMemory((UINT8 *)Ram68K+0x010020, - 0x780000, 0x78001F, MAP_RAM); // regs? + 0x780000, 0x78001F, SM_RAM); // regs? // SekMapMemory((UINT8 *)Ram68K+0x010040, -// 0x701000, 0x71FFFF, MAP_RAM); // work ram? +// 0x701000, 0x71FFFF, SM_RAM); // work ram? SekSetReadWordHandler(0, GalhustlReadWord); SekSetReadByteHandler(0, GalhustlReadByte); diff --git a/src/burn/drv/pst90s/d_galspnbl.cpp b/src/burn/drv/pst90s/d_galspnbl.cpp index 75b2477f3..671b64a49 100644 --- a/src/burn/drv/pst90s/d_galspnbl.cpp +++ b/src/burn/drv/pst90s/d_galspnbl.cpp @@ -338,17 +338,17 @@ static INT32 DrvInit(INT32 select) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x3fffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x700000, 0x703fff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x708000, 0x70ffff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x800000, 0x803fff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x808000, 0x80ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x880000, 0x880fff, MAP_RAM); - SekMapMemory(DrvColRAM, 0x900000, 0x900fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x904000, 0x904fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x980000, 0x9bffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xa01000, 0xa017ff, MAP_ROM); - SekMapHandler(1, 0xa01000, 0xa017ff, MAP_WRITE); + SekMapMemory(Drv68KROM, 0x000000, 0x3fffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x700000, 0x703fff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x708000, 0x70ffff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x800000, 0x803fff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x808000, 0x80ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x880000, 0x880fff, SM_RAM); + SekMapMemory(DrvColRAM, 0x900000, 0x900fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x904000, 0x904fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x980000, 0x9bffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xa01000, 0xa017ff, SM_ROM); + SekMapHandler(1, 0xa01000, 0xa017ff, SM_WRITE); // SekSetWriteWordHandler(0, galspnbl_main_write_word); SekSetWriteByteHandler(0, galspnbl_main_write_byte); // SekSetReadWordHandler(0, galspnbl_main_read_word); diff --git a/src/burn/drv/pst90s/d_gotcha.cpp b/src/burn/drv/pst90s/d_gotcha.cpp index 1ca5ce1dd..eed619474 100644 --- a/src/burn/drv/pst90s/d_gotcha.cpp +++ b/src/burn/drv/pst90s/d_gotcha.cpp @@ -357,12 +357,12 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x120000, 0x12ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x140000, 0x1407ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x160000, 0x1607ff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x320000, 0x320fff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x322000, 0x322fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x120000, 0x12ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x140000, 0x1407ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x160000, 0x1607ff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x320000, 0x320fff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x322000, 0x322fff, SM_RAM); SekSetWriteWordHandler(0, gotcha_write_word); SekSetWriteByteHandler(0, gotcha_write_byte); SekSetReadWordHandler(0, gotcha_read_word); diff --git a/src/burn/drv/pst90s/d_gumbo.cpp b/src/burn/drv/pst90s/d_gumbo.cpp index 954204876..cb77a3796 100644 --- a/src/burn/drv/pst90s/d_gumbo.cpp +++ b/src/burn/drv/pst90s/d_gumbo.cpp @@ -345,11 +345,11 @@ static INT32 GumboInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x083fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x1b0000, 0x1b03ff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x1e0000^dblpoin, 0x1e0fff^dblpoin, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x1f0000^dblpoin, 0x1f3fff^dblpoin, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x083fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x1b0000, 0x1b03ff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x1e0000^dblpoin, 0x1e0fff^dblpoin, SM_RAM); + SekMapMemory(DrvFgRAM, 0x1f0000^dblpoin, 0x1f3fff^dblpoin, SM_RAM); SekSetWriteByteHandler(0, gumbo_write_byte); SekSetReadByteHandler(0, gumbo_read_byte); SekSetWriteWordHandler(0, gumbo_write_word); @@ -399,11 +399,11 @@ static INT32 MspuzzleInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x1a0000, 0x1a03ff, MAP_RAM); - SekMapMemory(DrvFgRAM, 0x190000, 0x197fff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x1c0000, 0x1c1fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x1a0000, 0x1a03ff, SM_RAM); + SekMapMemory(DrvFgRAM, 0x190000, 0x197fff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x1c0000, 0x1c1fff, SM_RAM); SekSetWriteByteHandler(0, gumbo_write_byte); SekSetReadByteHandler(0, gumbo_read_byte); SekSetWriteWordHandler(0, gumbo_write_word); diff --git a/src/burn/drv/pst90s/d_hyperpac.cpp b/src/burn/drv/pst90s/d_hyperpac.cpp index a944676a4..8b2a46366 100644 --- a/src/burn/drv/pst90s/d_hyperpac.cpp +++ b/src/burn/drv/pst90s/d_hyperpac.cpp @@ -2032,14 +2032,14 @@ static INT32 HyperpacMachineInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(HyperpacRom , 0x000000, 0x0fffff, MAP_ROM); + SekMapMemory(HyperpacRom , 0x000000, 0x0fffff, SM_ROM); if (Finalttr) { - SekMapMemory(HyperpacRam , 0x100000, 0x103fff, MAP_RAM); + SekMapMemory(HyperpacRam , 0x100000, 0x103fff, SM_RAM); } else { - SekMapMemory(HyperpacRam , 0x100000, 0x10ffff, MAP_RAM); + SekMapMemory(HyperpacRam , 0x100000, 0x10ffff, SM_RAM); } - SekMapMemory(HyperpacPaletteRam, 0x600000, 0x6001ff, MAP_RAM); - SekMapMemory(HyperpacSpriteRam , 0x700000, 0x701fff, MAP_RAM); + SekMapMemory(HyperpacPaletteRam, 0x600000, 0x6001ff, SM_RAM); + SekMapMemory(HyperpacSpriteRam , 0x700000, 0x701fff, SM_RAM); if (Fourin1boot || Finalttr) { SekSetReadByteHandler(0, HyperpacReadByteLow); SekSetReadWordHandler(0, HyperpacReadWordLow); @@ -2534,10 +2534,10 @@ static INT32 TwinadvInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(HyperpacRom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(HyperpacRam , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(HyperpacPaletteRam, 0x600000, 0x6001ff, MAP_RAM); - SekMapMemory(HyperpacSpriteRam , 0x700000, 0x701fff, MAP_RAM); + SekMapMemory(HyperpacRom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(HyperpacRam , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(HyperpacPaletteRam, 0x600000, 0x6001ff, SM_RAM); + SekMapMemory(HyperpacSpriteRam , 0x700000, 0x701fff, SM_RAM); SekSetReadByteHandler(0, HyperpacReadByteLow); SekSetReadWordHandler(0, HyperpacReadWordLow); SekSetWriteByteHandler(0, TwinadvWriteByte); @@ -2615,10 +2615,10 @@ static INT32 HoneydolInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(HyperpacRom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(HyperpacRam , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(HyperpacPaletteRam, 0xa00000, 0xa007ff, MAP_RAM); - SekMapMemory(HyperpacSpriteRam , 0xb00000, 0xb01fff, MAP_RAM); + SekMapMemory(HyperpacRom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(HyperpacRam , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(HyperpacPaletteRam, 0xa00000, 0xa007ff, SM_RAM); + SekMapMemory(HyperpacSpriteRam , 0xb00000, 0xb01fff, SM_RAM); SekSetReadByteHandler(0, HoneydolReadByte); SekSetReadWordHandler(0, HoneydolReadWord); SekSetWriteByteHandler(0, HoneydolWriteByte); @@ -2757,10 +2757,10 @@ static INT32 SnowbrosInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(HyperpacRom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(HyperpacRam , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(HyperpacPaletteRam, 0x600000, 0x6001ff, MAP_RAM); - SekMapMemory(HyperpacSpriteRam , 0x700000, 0x701fff, MAP_RAM); + SekMapMemory(HyperpacRom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(HyperpacRam , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(HyperpacPaletteRam, 0x600000, 0x6001ff, SM_RAM); + SekMapMemory(HyperpacSpriteRam , 0x700000, 0x701fff, SM_RAM); SekSetReadWordHandler(0, SnowbrosReadWord); SekSetWriteWordHandler(0, SnowbrosWriteWord); SekSetReadByteHandler(0, SnowbrosReadByte); @@ -2857,10 +2857,10 @@ static INT32 Snowbro3Init() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(HyperpacRom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(HyperpacRam , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(HyperpacPaletteRam, 0x600000, 0x6003ff, MAP_RAM); - SekMapMemory(HyperpacSpriteRam , 0x700000, 0x7021ff, MAP_RAM); + SekMapMemory(HyperpacRom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(HyperpacRam , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(HyperpacPaletteRam, 0x600000, 0x6003ff, SM_RAM); + SekMapMemory(HyperpacSpriteRam , 0x700000, 0x7021ff, SM_RAM); SekSetReadWordHandler(0, Snowbro3ReadWord); SekSetWriteWordHandler(0, Snowbro3WriteWord); SekSetReadByteHandler(0, Snowbro3ReadByte); @@ -3717,7 +3717,7 @@ static INT32 TwinadvFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 2) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == 2) ZetRaiseIrq(0); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen / nInterleave; diff --git a/src/burn/drv/pst90s/d_jchan.cpp b/src/burn/drv/pst90s/d_jchan.cpp index de64da651..46f7c6a9b 100644 --- a/src/burn/drv/pst90s/d_jchan.cpp +++ b/src/burn/drv/pst90s/d_jchan.cpp @@ -516,42 +516,42 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM0, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM0, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvMCURAM, 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x500000, 0x503fff, MAP_RAM); - SekMapMemory(DrvSprReg0, 0x600000, 0x60003f|0x3ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x700000, 0x70ffff, MAP_RAM); + SekMapMemory(Drv68KROM0, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM0, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvMCURAM, 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(DrvShareRAM, 0x400000, 0x403fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x500000, 0x503fff, SM_RAM); + SekMapMemory(DrvSprReg0, 0x600000, 0x60003f|0x3ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x700000, 0x70ffff, SM_RAM); SekSetWriteWordHandler(0, jchan_main_write_word); SekSetWriteByteHandler(0, jchan_main_write_byte); SekSetReadWordHandler(0, jchan_main_read_word); SekSetReadByteHandler(0, jchan_main_read_byte); - SekMapHandler(1, 0x403c00, 0x403fff, MAP_WRITE); + SekMapHandler(1, 0x403c00, 0x403fff, SM_WRITE); SekSetWriteWordHandler(1, jchan_main_command_write_word); SekSetWriteByteHandler(1, jchan_main_command_write_byte); - SekMapHandler(2, 0x700000, 0x70ffff, MAP_WRITE); + SekMapHandler(2, 0x700000, 0x70ffff, SM_WRITE); SekSetWriteWordHandler(2, jchan_palette_write_word); SekSetWriteByteHandler(2, jchan_palette_write_byte); SekClose(); SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Drv68KROM1, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM1, 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(DrvVidRAM, 0x500000, 0x503fff, MAP_RAM); - SekMapMemory(DrvVidRegs, 0x600000, 0x60001f|0x3ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0x700000, 0x703fff, MAP_RAM); - SekMapMemory(DrvSprReg1, 0x780000, 0x78003f|0x3ff, MAP_RAM); + SekMapMemory(Drv68KROM1, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM1, 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(DrvShareRAM, 0x400000, 0x403fff, SM_RAM); + SekMapMemory(DrvVidRAM, 0x500000, 0x503fff, SM_RAM); + SekMapMemory(DrvVidRegs, 0x600000, 0x60001f|0x3ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0x700000, 0x703fff, SM_RAM); + SekMapMemory(DrvSprReg1, 0x780000, 0x78003f|0x3ff, SM_RAM); SekSetWriteWordHandler(0, jchan_sub_write_word); SekSetWriteByteHandler(0, jchan_sub_write_byte); SekSetReadWordHandler(0, jchan_sub_read_word); SekSetReadByteHandler(0, jchan_sub_read_byte); - SekMapHandler(1, 0x400000, 0x4003ff, MAP_WRITE); + SekMapHandler(1, 0x400000, 0x4003ff, SM_WRITE); SekSetWriteWordHandler(1, jchan_sub_command_write_word); SekSetWriteByteHandler(1, jchan_sub_command_write_byte); SekClose(); diff --git a/src/burn/drv/pst90s/d_kaneko16.cpp b/src/burn/drv/pst90s/d_kaneko16.cpp index b98042ab1..bfbcf03cd 100644 --- a/src/burn/drv/pst90s/d_kaneko16.cpp +++ b/src/burn/drv/pst90s/d_kaneko16.cpp @@ -4016,23 +4016,23 @@ static INT32 GtmrMachineInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Kaneko16Rom , 0x000000, 0x0ffffd, MAP_ROM); - SekMapMemory(Kaneko16Ram , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(Kaneko16MCURam , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(Kaneko16PaletteRam , 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(Kaneko16Ram + 0x10000, 0x310000, 0x327fff, MAP_RAM); - SekMapMemory(Kaneko16SpriteRam , 0x400000, 0x401fff, MAP_RAM); - SekMapMemory(Kaneko16Video1Ram , 0x500000, 0x500fff, MAP_RAM); - SekMapMemory(Kaneko16Video0Ram , 0x501000, 0x501fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl1Ram , 0x502000, 0x502fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl0Ram , 0x503000, 0x503fff, MAP_RAM); - SekMapMemory(Kaneko16Video3Ram , 0x580000, 0x580fff, MAP_RAM); - SekMapMemory(Kaneko16Video2Ram , 0x581000, 0x581fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl3Ram , 0x582000, 0x582fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl2Ram , 0x583000, 0x583fff, MAP_RAM); - SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x600000, 0x60001f, MAP_WRITE); - SekMapMemory((UINT8*)Kaneko16Layer1Regs , 0x680000, 0x68001f, MAP_WRITE); - SekMapMemory((UINT8*)Kaneko16SpriteRegs + 2, 0x700002, 0x70001f, MAP_WRITE); + SekMapMemory(Kaneko16Rom , 0x000000, 0x0ffffd, SM_ROM); + SekMapMemory(Kaneko16Ram , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(Kaneko16MCURam , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(Kaneko16PaletteRam , 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(Kaneko16Ram + 0x10000, 0x310000, 0x327fff, SM_RAM); + SekMapMemory(Kaneko16SpriteRam , 0x400000, 0x401fff, SM_RAM); + SekMapMemory(Kaneko16Video1Ram , 0x500000, 0x500fff, SM_RAM); + SekMapMemory(Kaneko16Video0Ram , 0x501000, 0x501fff, SM_RAM); + SekMapMemory(Kaneko16VScrl1Ram , 0x502000, 0x502fff, SM_RAM); + SekMapMemory(Kaneko16VScrl0Ram , 0x503000, 0x503fff, SM_RAM); + SekMapMemory(Kaneko16Video3Ram , 0x580000, 0x580fff, SM_RAM); + SekMapMemory(Kaneko16Video2Ram , 0x581000, 0x581fff, SM_RAM); + SekMapMemory(Kaneko16VScrl3Ram , 0x582000, 0x582fff, SM_RAM); + SekMapMemory(Kaneko16VScrl2Ram , 0x583000, 0x583fff, SM_RAM); + SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x600000, 0x60001f, SM_WRITE); + SekMapMemory((UINT8*)Kaneko16Layer1Regs , 0x680000, 0x68001f, SM_WRITE); + SekMapMemory((UINT8*)Kaneko16SpriteRegs + 2, 0x700002, 0x70001f, SM_WRITE); SekSetReadByteHandler(0, GtmrReadByte); SekSetReadWordHandler(0, GtmrReadWord); SekSetWriteByteHandler(0, GtmrWriteByte); @@ -4113,16 +4113,16 @@ static INT32 BerlwallInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Kaneko16Rom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Kaneko16Ram , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(Kaneko16SpriteRam , 0x30e000, 0x30ffff, MAP_RAM); - SekMapMemory(Kaneko16PaletteRam , 0x400000, 0x400fff, MAP_RAM); - SekMapMemory(Kaneko16Video1Ram , 0xc00000, 0xc00fff, MAP_RAM); - SekMapMemory(Kaneko16Video0Ram , 0xc01000, 0xc01fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl1Ram , 0xc02000, 0xc02fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl0Ram , 0xc03000, 0xc03fff, MAP_RAM); - SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0xd00000, 0xd0001f, MAP_WRITE); - SekMapMemory((UINT8*)Kaneko16SpriteRegs + 2, 0x600002, 0x60003f, MAP_WRITE); + SekMapMemory(Kaneko16Rom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Kaneko16Ram , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(Kaneko16SpriteRam , 0x30e000, 0x30ffff, SM_RAM); + SekMapMemory(Kaneko16PaletteRam , 0x400000, 0x400fff, SM_RAM); + SekMapMemory(Kaneko16Video1Ram , 0xc00000, 0xc00fff, SM_RAM); + SekMapMemory(Kaneko16Video0Ram , 0xc01000, 0xc01fff, SM_RAM); + SekMapMemory(Kaneko16VScrl1Ram , 0xc02000, 0xc02fff, SM_RAM); + SekMapMemory(Kaneko16VScrl0Ram , 0xc03000, 0xc03fff, SM_RAM); + SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0xd00000, 0xd0001f, SM_WRITE); + SekMapMemory((UINT8*)Kaneko16SpriteRegs + 2, 0x600002, 0x60003f, SM_WRITE); SekSetReadByteHandler(0, BerlwallReadByte); SekSetReadWordHandler(0, BerlwallReadWord); SekSetWriteByteHandler(0, BerlwallWriteByte); @@ -4197,16 +4197,16 @@ static INT32 BlazeonInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Kaneko16Rom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Kaneko16Ram , 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(Kaneko16PaletteRam , 0x500000, 0x500fff, MAP_RAM); - SekMapMemory(Kaneko16Video1Ram , 0x600000, 0x600fff, MAP_RAM); - SekMapMemory(Kaneko16Video0Ram , 0x601000, 0x601fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl1Ram , 0x602000, 0x602fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl0Ram , 0x603000, 0x603fff, MAP_RAM); - SekMapMemory(Kaneko16SpriteRam , 0x700000, 0x700fff, MAP_RAM); - SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x800000, 0x80000f, MAP_WRITE); - SekMapMemory((UINT8*)Kaneko16SpriteRegs + 2, 0x900002, 0x90001f, MAP_WRITE); + SekMapMemory(Kaneko16Rom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Kaneko16Ram , 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(Kaneko16PaletteRam , 0x500000, 0x500fff, SM_RAM); + SekMapMemory(Kaneko16Video1Ram , 0x600000, 0x600fff, SM_RAM); + SekMapMemory(Kaneko16Video0Ram , 0x601000, 0x601fff, SM_RAM); + SekMapMemory(Kaneko16VScrl1Ram , 0x602000, 0x602fff, SM_RAM); + SekMapMemory(Kaneko16VScrl0Ram , 0x603000, 0x603fff, SM_RAM); + SekMapMemory(Kaneko16SpriteRam , 0x700000, 0x700fff, SM_RAM); + SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x800000, 0x80000f, SM_WRITE); + SekMapMemory((UINT8*)Kaneko16SpriteRegs + 2, 0x900002, 0x90001f, SM_WRITE); SekSetReadByteHandler(0, BlazeonReadByte); SekSetReadWordHandler(0, BlazeonReadWord); SekSetWriteByteHandler(0, BlazeonWriteByte); @@ -4443,21 +4443,21 @@ static INT32 ExplbrkrInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Kaneko16Rom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Kaneko16Ram , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(Kaneko16Video1Ram , 0x500000, 0x500fff, MAP_RAM); - SekMapMemory(Kaneko16Video0Ram , 0x501000, 0x501fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl1Ram , 0x502000, 0x502fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl0Ram , 0x503000, 0x503fff, MAP_RAM); - SekMapMemory(Kaneko16Video3Ram , 0x580000, 0x580fff, MAP_RAM); - SekMapMemory(Kaneko16Video2Ram , 0x581000, 0x581fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl3Ram , 0x582000, 0x582fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl2Ram , 0x583000, 0x583fff, MAP_RAM); - SekMapMemory(Kaneko16SpriteRam , 0x600000, 0x601fff, MAP_RAM); - SekMapMemory(Kaneko16PaletteRam , 0x700000, 0x700fff, MAP_RAM); - SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x800000, 0x80001f, MAP_WRITE); - SekMapMemory((UINT8*)Kaneko16SpriteRegs + 2, 0x900002, 0x90001f, MAP_WRITE); - SekMapMemory((UINT8*)Kaneko16Layer1Regs , 0xb00000, 0xb0001f, MAP_WRITE); + SekMapMemory(Kaneko16Rom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Kaneko16Ram , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(Kaneko16Video1Ram , 0x500000, 0x500fff, SM_RAM); + SekMapMemory(Kaneko16Video0Ram , 0x501000, 0x501fff, SM_RAM); + SekMapMemory(Kaneko16VScrl1Ram , 0x502000, 0x502fff, SM_RAM); + SekMapMemory(Kaneko16VScrl0Ram , 0x503000, 0x503fff, SM_RAM); + SekMapMemory(Kaneko16Video3Ram , 0x580000, 0x580fff, SM_RAM); + SekMapMemory(Kaneko16Video2Ram , 0x581000, 0x581fff, SM_RAM); + SekMapMemory(Kaneko16VScrl3Ram , 0x582000, 0x582fff, SM_RAM); + SekMapMemory(Kaneko16VScrl2Ram , 0x583000, 0x583fff, SM_RAM); + SekMapMemory(Kaneko16SpriteRam , 0x600000, 0x601fff, SM_RAM); + SekMapMemory(Kaneko16PaletteRam , 0x700000, 0x700fff, SM_RAM); + SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x800000, 0x80001f, SM_WRITE); + SekMapMemory((UINT8*)Kaneko16SpriteRegs + 2, 0x900002, 0x90001f, SM_WRITE); + SekMapMemory((UINT8*)Kaneko16Layer1Regs , 0xb00000, 0xb0001f, SM_WRITE); SekSetReadByteHandler(0, ExplbrkrReadByte); SekSetReadWordHandler(0, ExplbrkrReadWord); SekSetWriteByteHandler(0, ExplbrkrWriteByte); @@ -4785,21 +4785,21 @@ static INT32 MgcrystlInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Kaneko16Rom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Kaneko16Ram , 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(Kaneko16PaletteRam , 0x500000, 0x500fff, MAP_RAM); - SekMapMemory(Kaneko16Video1Ram , 0x600000, 0x600fff, MAP_RAM); - SekMapMemory(Kaneko16Video0Ram , 0x601000, 0x601fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl1Ram , 0x602000, 0x602fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl0Ram , 0x603000, 0x603fff, MAP_RAM); - SekMapMemory(Kaneko16Video3Ram , 0x680000, 0x680fff, MAP_RAM); - SekMapMemory(Kaneko16Video2Ram , 0x681000, 0x681fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl3Ram , 0x682000, 0x682fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl2Ram , 0x683000, 0x683fff, MAP_RAM); - SekMapMemory(Kaneko16SpriteRam , 0x700000, 0x701fff, MAP_RAM); - SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x800000, 0x80001f, MAP_WRITE); - SekMapMemory((UINT8*)Kaneko16SpriteRegs + 2, 0x900002, 0x90001f, MAP_WRITE); - SekMapMemory((UINT8*)Kaneko16Layer1Regs , 0xb00000, 0xb0001f, MAP_WRITE); + SekMapMemory(Kaneko16Rom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Kaneko16Ram , 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(Kaneko16PaletteRam , 0x500000, 0x500fff, SM_RAM); + SekMapMemory(Kaneko16Video1Ram , 0x600000, 0x600fff, SM_RAM); + SekMapMemory(Kaneko16Video0Ram , 0x601000, 0x601fff, SM_RAM); + SekMapMemory(Kaneko16VScrl1Ram , 0x602000, 0x602fff, SM_RAM); + SekMapMemory(Kaneko16VScrl0Ram , 0x603000, 0x603fff, SM_RAM); + SekMapMemory(Kaneko16Video3Ram , 0x680000, 0x680fff, SM_RAM); + SekMapMemory(Kaneko16Video2Ram , 0x681000, 0x681fff, SM_RAM); + SekMapMemory(Kaneko16VScrl3Ram , 0x682000, 0x682fff, SM_RAM); + SekMapMemory(Kaneko16VScrl2Ram , 0x683000, 0x683fff, SM_RAM); + SekMapMemory(Kaneko16SpriteRam , 0x700000, 0x701fff, SM_RAM); + SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x800000, 0x80001f, SM_WRITE); + SekMapMemory((UINT8*)Kaneko16SpriteRegs + 2, 0x900002, 0x90001f, SM_WRITE); + SekMapMemory((UINT8*)Kaneko16Layer1Regs , 0xb00000, 0xb0001f, SM_WRITE); SekSetReadByteHandler(0, MgcrystlReadByte); SekSetReadWordHandler(0, ExplbrkrReadWord); SekSetWriteByteHandler(0, ExplbrkrWriteByte); @@ -4904,17 +4904,17 @@ static INT32 ShogwarrInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Kaneko16Rom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Kaneko16Ram , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(Kaneko16MCURam , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(Kaneko16PaletteRam , 0x380000, 0x380fff, MAP_RAM); - SekMapMemory(Kaneko16SpriteRam , 0x580000, 0x581fff, MAP_RAM); - SekMapMemory(Kaneko16Video1Ram , 0x600000, 0x600fff, MAP_RAM); - SekMapMemory(Kaneko16Video0Ram , 0x601000, 0x601fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl1Ram , 0x602000, 0x602fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl0Ram , 0x603000, 0x603fff, MAP_RAM); - SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x800000, 0x80001f, MAP_WRITE); - SekMapMemory((UINT8*)Kaneko16SpriteRegs , 0x900000, 0x90001f, MAP_WRITE); + SekMapMemory(Kaneko16Rom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Kaneko16Ram , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(Kaneko16MCURam , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(Kaneko16PaletteRam , 0x380000, 0x380fff, SM_RAM); + SekMapMemory(Kaneko16SpriteRam , 0x580000, 0x581fff, SM_RAM); + SekMapMemory(Kaneko16Video1Ram , 0x600000, 0x600fff, SM_RAM); + SekMapMemory(Kaneko16Video0Ram , 0x601000, 0x601fff, SM_RAM); + SekMapMemory(Kaneko16VScrl1Ram , 0x602000, 0x602fff, SM_RAM); + SekMapMemory(Kaneko16VScrl0Ram , 0x603000, 0x603fff, SM_RAM); + SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x800000, 0x80001f, SM_WRITE); + SekMapMemory((UINT8*)Kaneko16SpriteRegs , 0x900000, 0x90001f, SM_WRITE); SekSetReadByteHandler(0, ShogwarrReadByte); SekSetReadWordHandler(0, ShogwarrReadWord); SekSetWriteByteHandler(0, ShogwarrWriteByte); @@ -5010,17 +5010,17 @@ static INT32 BrapboysInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Kaneko16Rom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Kaneko16Ram , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(Kaneko16MCURam , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(Kaneko16PaletteRam , 0x380000, 0x380fff, MAP_RAM); - SekMapMemory(Kaneko16SpriteRam , 0x580000, 0x581fff, MAP_RAM); - SekMapMemory(Kaneko16Video1Ram , 0x600000, 0x600fff, MAP_RAM); - SekMapMemory(Kaneko16Video0Ram , 0x601000, 0x601fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl1Ram , 0x602000, 0x602fff, MAP_RAM); - SekMapMemory(Kaneko16VScrl0Ram , 0x603000, 0x603fff, MAP_RAM); - SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x800000, 0x80001f, MAP_WRITE); - SekMapMemory((UINT8*)Kaneko16SpriteRegs , 0x900000, 0x90001f, MAP_WRITE); + SekMapMemory(Kaneko16Rom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Kaneko16Ram , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(Kaneko16MCURam , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(Kaneko16PaletteRam , 0x380000, 0x380fff, SM_RAM); + SekMapMemory(Kaneko16SpriteRam , 0x580000, 0x581fff, SM_RAM); + SekMapMemory(Kaneko16Video1Ram , 0x600000, 0x600fff, SM_RAM); + SekMapMemory(Kaneko16Video0Ram , 0x601000, 0x601fff, SM_RAM); + SekMapMemory(Kaneko16VScrl1Ram , 0x602000, 0x602fff, SM_RAM); + SekMapMemory(Kaneko16VScrl0Ram , 0x603000, 0x603fff, SM_RAM); + SekMapMemory((UINT8*)Kaneko16Layer0Regs , 0x800000, 0x80001f, SM_WRITE); + SekMapMemory((UINT8*)Kaneko16SpriteRegs , 0x900000, 0x90001f, SM_WRITE); SekSetReadByteHandler(0, ShogwarrReadByte); SekSetReadWordHandler(0, ShogwarrReadWord); SekSetWriteByteHandler(0, ShogwarrWriteByte); diff --git a/src/burn/drv/pst90s/d_lordgun.cpp b/src/burn/drv/pst90s/d_lordgun.cpp index 1373892d5..ea76e6306 100644 --- a/src/burn/drv/pst90s/d_lordgun.cpp +++ b/src/burn/drv/pst90s/d_lordgun.cpp @@ -854,16 +854,16 @@ static INT32 DrvInit(INT32 (*pInitCallback)(), INT32 lordgun) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvPriRAM, 0x210000, 0x21ffff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x310000, 0x313fff, MAP_RAM); - SekMapMemory(DrvVidRAM2 , 0x314000, 0x317fff, MAP_RAM); - SekMapMemory(DrvVidRAM3, 0x318000, 0x319fff, MAP_RAM); - SekMapMemory(DrvScrRAM, 0x31c000, 0x31c7ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x400000, 0x4007ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x500000, 0x500fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvPriRAM, 0x210000, 0x21ffff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x310000, 0x313fff, SM_RAM); + SekMapMemory(DrvVidRAM2 , 0x314000, 0x317fff, SM_RAM); + SekMapMemory(DrvVidRAM3, 0x318000, 0x319fff, SM_RAM); + SekMapMemory(DrvScrRAM, 0x31c000, 0x31c7ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x400000, 0x4007ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x500000, 0x500fff, SM_RAM); SekSetWriteWordHandler(0, lordgun_write_word); SekSetWriteByteHandler(0, lordgun_write_byte); SekSetReadWordHandler(0, lordgun_read_word); diff --git a/src/burn/drv/pst90s/d_mcatadv.cpp b/src/burn/drv/pst90s/d_mcatadv.cpp index 9c441bd5e..370fc970e 100644 --- a/src/burn/drv/pst90s/d_mcatadv.cpp +++ b/src/burn/drv/pst90s/d_mcatadv.cpp @@ -577,12 +577,12 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x400000, 0x401fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x500000, 0x501fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x600000, 0x602fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x700000, 0x70ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x400000, 0x401fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x500000, 0x501fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x600000, 0x602fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x700000, 0x70ffff, SM_RAM); SekSetWriteByteHandler(0, mcatadv_write_byte); SekSetWriteWordHandler(0, mcatadv_write_word); SekSetReadByteHandler(0, mcatadv_read_byte); diff --git a/src/burn/drv/pst90s/d_midas.cpp b/src/burn/drv/pst90s/d_midas.cpp index bc9f44d2d..1a5ebf9ba 100644 --- a/src/burn/drv/pst90s/d_midas.cpp +++ b/src/burn/drv/pst90s/d_midas.cpp @@ -323,12 +323,12 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0xa00000, 0xa3ffff, MAP_ROM); - SekMapMemory(DrvPalRAM + 0x3ffff, 0xa40000, 0xa7ffff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0xd00000, 0xd1ffff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0xe00000, 0xe3ffff, MAP_RAM); - SekMapMemory(DrvGfxRAM, 0xf90000, 0xfaffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0xa00000, 0xa3ffff, SM_ROM); + SekMapMemory(DrvPalRAM + 0x3ffff, 0xa40000, 0xa7ffff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0xd00000, 0xd1ffff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0xe00000, 0xe3ffff, SM_RAM); + SekMapMemory(DrvGfxRAM, 0xf90000, 0xfaffff, SM_RAM); SekSetWriteByteHandler(0, midas_write_byte); SekSetWriteWordHandler(0, midas_write_word); SekSetReadByteHandler(0, midas_read_byte); diff --git a/src/burn/drv/pst90s/d_mugsmash.cpp b/src/burn/drv/pst90s/d_mugsmash.cpp index 09c599071..c2d40d643 100644 --- a/src/burn/drv/pst90s/d_mugsmash.cpp +++ b/src/burn/drv/pst90s/d_mugsmash.cpp @@ -429,12 +429,12 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvVidRAM0, 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x082000, 0x082fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x100000, 0x1005ff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x1c0000, 0x1cffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x200000, 0x203fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvVidRAM0, 0x080000, 0x080fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x082000, 0x082fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x100000, 0x1005ff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x1c0000, 0x1cffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x200000, 0x203fff, SM_RAM); SekSetWriteByteHandler(0, mugsmash_write_byte); SekSetWriteWordHandler(0, mugsmash_write_word); SekSetReadByteHandler(0, mugsmash_read_byte); diff --git a/src/burn/drv/pst90s/d_mwarr.cpp b/src/burn/drv/pst90s/d_mwarr.cpp index d106aac70..f60e9ff4a 100644 --- a/src/burn/drv/pst90s/d_mwarr.cpp +++ b/src/burn/drv/pst90s/d_mwarr.cpp @@ -541,21 +541,21 @@ static INT32 MwarrInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvBgRAM, 0x100000, 0x1007ff, MAP_RAM); - SekMapMemory(DrvMloRAM, 0x100800, 0x100fff, MAP_RAM); - SekMapMemory(DrvMhiRAM, 0x101000, 0x1017ff, MAP_RAM); - SekMapMemory(DrvTxtRAM, 0x101800, 0x1027ff, MAP_RAM); - SekMapMemory(DrvUnkRAM0, 0x102800, 0x102fff, MAP_RAM); - SekMapMemory(DrvBgScrollRAM, 0x103000, 0x1033ff, MAP_RAM); - SekMapMemory(DrvMloScrollRAM, 0x103400, 0x1037ff, MAP_RAM); - SekMapMemory(DrvMhiScrollRAM, 0x103800, 0x103bff, MAP_RAM); - SekMapMemory(DrvVidAttrRAM, 0x103c00, 0x103fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x104000, 0x104fff, MAP_ROM); // handler - SekMapMemory(DrvUnkRAM1, 0x105000, 0x107fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x108000, 0x108fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x110000, 0x1103ff, MAP_ROM); - SekMapMemory(Drv68KRAM + 0x400, 0x110400, 0x11ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvBgRAM, 0x100000, 0x1007ff, SM_RAM); + SekMapMemory(DrvMloRAM, 0x100800, 0x100fff, SM_RAM); + SekMapMemory(DrvMhiRAM, 0x101000, 0x1017ff, SM_RAM); + SekMapMemory(DrvTxtRAM, 0x101800, 0x1027ff, SM_RAM); + SekMapMemory(DrvUnkRAM0, 0x102800, 0x102fff, SM_RAM); + SekMapMemory(DrvBgScrollRAM, 0x103000, 0x1033ff, SM_RAM); + SekMapMemory(DrvMloScrollRAM, 0x103400, 0x1037ff, SM_RAM); + SekMapMemory(DrvMhiScrollRAM, 0x103800, 0x103bff, SM_RAM); + SekMapMemory(DrvVidAttrRAM, 0x103c00, 0x103fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x104000, 0x104fff, SM_ROM); // handler + SekMapMemory(DrvUnkRAM1, 0x105000, 0x107fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x108000, 0x108fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x110000, 0x1103ff, SM_ROM); + SekMapMemory(Drv68KRAM + 0x400, 0x110400, 0x11ffff, SM_RAM); SekSetWriteByteHandler(0, mwarr_write_byte); SekSetWriteWordHandler(0, mwarr_write_word); SekSetReadByteHandler(0, mwarr_read_byte); @@ -617,20 +617,20 @@ static INT32 CommonInit(INT32 select, INT32 xoffset) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvBgRAM, 0x100000, 0x1007ff, MAP_RAM); - SekMapMemory(DrvMloRAM, 0x100800, 0x100fff, MAP_RAM); - SekMapMemory(DrvMhiRAM, 0x101000, 0x1017ff, MAP_RAM); - SekMapMemory(DrvTxtRAM, 0x101800, 0x1027ff, MAP_RAM); - SekMapMemory(DrvUnkRAM0, 0x102800, 0x102fff, MAP_RAM); - SekMapMemory(DrvBgScrollRAM, 0x103000, 0x1033ff, MAP_RAM); - SekMapMemory(DrvMloScrollRAM, 0x103400, 0x1037ff, MAP_RAM); - SekMapMemory(DrvMhiScrollRAM, 0x103800, 0x103bff, MAP_RAM); - SekMapMemory(DrvVidAttrRAM, 0x103c00, 0x103fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x104000, 0x104fff, MAP_ROM); // handler - SekMapMemory(DrvUnkRAM1, 0x105000, 0x107fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x108000, 0x108fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x109000, 0x11ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvBgRAM, 0x100000, 0x1007ff, SM_RAM); + SekMapMemory(DrvMloRAM, 0x100800, 0x100fff, SM_RAM); + SekMapMemory(DrvMhiRAM, 0x101000, 0x1017ff, SM_RAM); + SekMapMemory(DrvTxtRAM, 0x101800, 0x1027ff, SM_RAM); + SekMapMemory(DrvUnkRAM0, 0x102800, 0x102fff, SM_RAM); + SekMapMemory(DrvBgScrollRAM, 0x103000, 0x1033ff, SM_RAM); + SekMapMemory(DrvMloScrollRAM, 0x103400, 0x1037ff, SM_RAM); + SekMapMemory(DrvMhiScrollRAM, 0x103800, 0x103bff, SM_RAM); + SekMapMemory(DrvVidAttrRAM, 0x103c00, 0x103fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x104000, 0x104fff, SM_ROM); // handler + SekMapMemory(DrvUnkRAM1, 0x105000, 0x107fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x108000, 0x108fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x109000, 0x11ffff, SM_RAM); SekSetWriteByteHandler(0, stlforce_write_byte); SekSetWriteWordHandler(0, stlforce_write_word); SekSetReadByteHandler(0, stlforce_read_byte); diff --git a/src/burn/drv/pst90s/d_news.cpp b/src/burn/drv/pst90s/d_news.cpp index 81b27e652..c6c981a5b 100644 --- a/src/burn/drv/pst90s/d_news.cpp +++ b/src/burn/drv/pst90s/d_news.cpp @@ -389,7 +389,7 @@ INT32 NewsFrame() ZetOpen(0); ZetRun(8000000 / 60); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); if (pBurnDraw) NewsDraw(); diff --git a/src/burn/drv/pst90s/d_nmg5.cpp b/src/burn/drv/pst90s/d_nmg5.cpp index a4fa23211..1a8aa67c2 100644 --- a/src/burn/drv/pst90s/d_nmg5.cpp +++ b/src/burn/drv/pst90s/d_nmg5.cpp @@ -1098,24 +1098,24 @@ static INT32 DrvInit(INT32 loadtype, INT32 sektype, INT32 zettype) // 0 nmg, 1 p SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvBmpRAM, 0x800000, 0x80ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvBmpRAM, 0x800000, 0x80ffff, SM_RAM); if (sektype) { - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x440000, 0x4407ff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x460000, 0x4607ff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x520000, 0x521fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x522000, 0x523fff, MAP_RAM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x440000, 0x4407ff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x460000, 0x4607ff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x520000, 0x521fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x522000, 0x523fff, SM_RAM); SekSetWriteByteHandler(0, pclubys_write_byte); SekSetWriteWordHandler(0, pclubys_write_word); SekSetReadByteHandler(0, pclubys_read_byte); SekSetReadWordHandler(0, pclubys_read_word); } else { - SekMapMemory(Drv68KRAM, 0x120000, 0x12ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x140000, 0x1407ff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x160000, 0x1607ff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x320000, 0x321fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x322000, 0x323fff, MAP_RAM); + SekMapMemory(Drv68KRAM, 0x120000, 0x12ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x140000, 0x1407ff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x160000, 0x1607ff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x320000, 0x321fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x322000, 0x323fff, SM_RAM); SekSetWriteByteHandler(0, nmg5_write_byte); SekSetWriteWordHandler(0, nmg5_write_word); SekSetReadByteHandler(0, nmg5_read_byte); diff --git a/src/burn/drv/pst90s/d_nmk16.cpp b/src/burn/drv/pst90s/d_nmk16.cpp index 8be344f27..c9c7aaabb 100644 --- a/src/burn/drv/pst90s/d_nmk16.cpp +++ b/src/burn/drv/pst90s/d_nmk16.cpp @@ -4229,11 +4229,11 @@ static INT32 BjtwinInit(INT32 (*pLoadCallback)()) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x09c000, 0x09cfff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x09d000, 0x09dfff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x09c000, 0x09cfff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x09d000, 0x09dfff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_RAM); SekSetWriteWordHandler(0, bjtwin_main_write_word); SekSetWriteByteHandler(0, bjtwin_main_write_byte); SekSetReadWordHandler(0, bjtwin_main_read_word); @@ -4292,16 +4292,16 @@ static INT32 Macross2Init() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x130000, 0x1307ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x140000, 0x143fff, MAP_RAM); - SekMapMemory(DrvBgRAM1, 0x144000, 0x147fff, MAP_RAM); - SekMapMemory(DrvBgRAM2, 0x148000, 0x14bfff, MAP_RAM); - SekMapMemory(DrvBgRAM3, 0x14c000, 0x14ffff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x170000, 0x170fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x171000, 0x171fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x1f0000, 0x1fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x130000, 0x1307ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x140000, 0x143fff, SM_RAM); + SekMapMemory(DrvBgRAM1, 0x144000, 0x147fff, SM_RAM); + SekMapMemory(DrvBgRAM2, 0x148000, 0x14bfff, SM_RAM); + SekMapMemory(DrvBgRAM3, 0x14c000, 0x14ffff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x170000, 0x170fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x171000, 0x171fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x1f0000, 0x1fffff, SM_RAM); SekSetWriteWordHandler(0, macross2_main_write_word); SekSetWriteByteHandler(0, macross2_main_write_byte); SekSetReadWordHandler(0, macross2_main_read_word); @@ -4406,20 +4406,20 @@ static INT32 SeibuSoundInit(INT32 (*pLoadCallback)(), INT32 type) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); if (type) { // mustangb - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, MAP_WRITE); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, SM_WRITE); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_ROM); } else { // tdragonb - SekMapMemory(Drv68KRAM, 0x0b0000, 0x0bffff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x0c4000, 0x0c43ff, MAP_WRITE); - SekMapMemory(DrvPalRAM, 0x0c8000, 0x0c87ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x0cc000, 0x0cffff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x0d0000, 0x0d07ff, MAP_RAM); + SekMapMemory(Drv68KRAM, 0x0b0000, 0x0bffff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x0c4000, 0x0c43ff, SM_WRITE); + SekMapMemory(DrvPalRAM, 0x0c8000, 0x0c87ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x0cc000, 0x0cffff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x0d0000, 0x0d07ff, SM_RAM); } SekSetWriteWordHandler(0, mustangb_main_write_word); SekSetWriteByteHandler(0, mustangb_main_write_byte); @@ -4455,14 +4455,14 @@ static INT32 AfegaInit(INT32 (*pLoadCallback)(), void (*pZ80Callback)(), INT32 p SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x084000, 0x0843ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0c0000, 0x0cffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x084000, 0x0843ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0c0000, 0x0cffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_ROM); SekSetWriteWordHandler(0, afega_main_write_word); SekSetWriteByteHandler(0, afega_main_write_byte); SekSetReadWordHandler(0, afega_main_read_word); @@ -6029,12 +6029,12 @@ static INT32 TharrierLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0883ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09d000, 0x09d7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0883ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09d000, 0x09d7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_ROM); SekSetWriteWordHandler(0, tharrier_main_write_word); SekSetWriteByteHandler(0, tharrier_main_write_byte); SekSetReadWordHandler(0, tharrier_main_read_word); @@ -6161,12 +6161,12 @@ static INT32 ManyblocLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0883ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x09c000, 0x09cfff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09d000, 0x09d7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0883ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x09c000, 0x09cfff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09d000, 0x09d7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_RAM); SekSetWriteWordHandler(0, manybloc_main_write_word); SekSetWriteByteHandler(0, manybloc_main_write_byte); SekSetReadWordHandler(0, manybloc_main_read_word); @@ -6247,15 +6247,15 @@ static INT32 SsmissinLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x0b0000, 0x0bffff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x0c4000, 0x0c43ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x0c8000, 0x0c87ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x0cc000, 0x0cffff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x0d0000, 0x0d07ff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x0d0800, 0x0d0fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x0d1000, 0x0d17ff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x0d1800, 0x0d1fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x0b0000, 0x0bffff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x0c4000, 0x0c43ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x0c8000, 0x0c87ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x0cc000, 0x0cffff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x0d0000, 0x0d07ff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x0d0800, 0x0d0fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x0d1000, 0x0d17ff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x0d1800, 0x0d1fff, SM_RAM); SekSetWriteWordHandler(0, ssmissin_main_write_word); SekSetWriteByteHandler(0, ssmissin_main_write_byte); SekSetReadWordHandler(0, ssmissin_main_read_word); @@ -7539,12 +7539,12 @@ static void Twinactn68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, MAP_WRITE); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, SM_WRITE); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_ROM); SekSetWriteWordHandler(0, afega_main_write_word); SekSetWriteByteHandler(0, afega_main_write_byte); SekSetReadWordHandler(0, afega_main_read_word); @@ -8037,12 +8037,12 @@ static INT32 MustangLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, MAP_WRITE); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, SM_WRITE); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_ROM); SekSetWriteWordHandler(0, mustang_main_write_word); SekSetWriteByteHandler(0, mustang_main_write_byte); SekSetReadWordHandler(0, mustang_main_read_word); @@ -8299,12 +8299,12 @@ static INT32 TdragonLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x0b0000, 0x0bffff, MAP_ROM); - SekMapMemory(DrvScrollRAM, 0x0c4000, 0x0c43ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x0c8000, 0x0c87ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x0cc000, 0x0cffff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x0d0000, 0x0d07ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x0b0000, 0x0bffff, SM_ROM); + SekMapMemory(DrvScrollRAM, 0x0c4000, 0x0c43ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x0c8000, 0x0c87ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x0cc000, 0x0cffff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x0d0000, 0x0d07ff, SM_RAM); SekSetWriteWordHandler(0, tdragon_main_write_word); SekSetWriteByteHandler(0, tdragon_main_write_byte); SekSetReadWordHandler(0, tdragon_main_read_word); @@ -8482,12 +8482,12 @@ static INT32 AcrobatmLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x08ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x0c4000, 0x0c47ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x0c8000, 0x0c83ff, MAP_WRITE); - SekMapMemory(DrvBgRAM0, 0x0cc000, 0x0cffff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x0d4000, 0x0d47ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x08ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x0c4000, 0x0c47ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x0c8000, 0x0c83ff, SM_WRITE); + SekMapMemory(DrvBgRAM0, 0x0cc000, 0x0cffff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x0d4000, 0x0d47ff, SM_RAM); SekSetWriteWordHandler(0, acrobatm_main_write_word); SekSetWriteByteHandler(0, acrobatm_main_write_byte); SekSetReadWordHandler(0, acrobatm_main_read_word); @@ -8564,12 +8564,12 @@ static INT32 MacrossLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, MAP_WRITE); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, SM_WRITE); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_ROM); SekSetWriteWordHandler(0, macross_main_write_word); SekSetWriteByteHandler(0, macross_main_write_byte); SekSetReadWordHandler(0, macross_main_read_word); @@ -8649,13 +8649,13 @@ static INT32 GunnailLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c7ff, MAP_WRITE); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09cfff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09d000, 0x09dfff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c7ff, SM_WRITE); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09cfff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09d000, 0x09dfff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_RAM); SekSetWriteWordHandler(0, macross_main_write_word); SekSetWriteByteHandler(0, macross_main_write_byte); SekSetReadWordHandler(0, macross_main_read_word); @@ -8733,12 +8733,12 @@ static INT32 BlkheartLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, MAP_WRITE); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, SM_WRITE); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_ROM); SekSetWriteWordHandler(0, macross_main_write_word); SekSetWriteByteHandler(0, macross_main_write_byte); SekSetReadWordHandler(0, macross_main_read_word); @@ -8856,13 +8856,13 @@ static INT32 VandykeLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c007, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvBgRAM1, 0x094000, 0x097fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09d000, 0x09d7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c007, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvBgRAM1, 0x094000, 0x097fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09d000, 0x09d7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_RAM); SekSetWriteWordHandler(0, macross_main_write_word); SekSetWriteByteHandler(0, macross_main_write_byte); SekSetReadWordHandler(0, macross_main_read_word); @@ -9029,12 +9029,12 @@ static INT32 VandykebLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); -// SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09d000, 0x09d7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); +// SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09d000, 0x09d7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_RAM); SekSetWriteWordHandler(0, vandykeb_main_write_word); // different scroll regs SekSetWriteByteHandler(0, vandykeb_main_write_byte); SekSetReadWordHandler(0, macross_main_read_word); @@ -9115,12 +9115,12 @@ static INT32 HachamfLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, MAP_WRITE); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, SM_WRITE); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_RAM); SekSetWriteWordHandler(0, hachamf_main_write_word); SekSetWriteByteHandler(0, hachamf_main_write_byte); SekSetReadWordHandler(0, hachamf_main_read_word); @@ -9194,12 +9194,12 @@ static INT32 HachamfbLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, MAP_WRITE); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, SM_WRITE); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_RAM); SekSetWriteWordHandler(0, hachamf_main_write_word); SekSetWriteByteHandler(0, hachamf_main_write_byte); SekSetReadWordHandler(0, hachamf_main_read_word); @@ -9286,14 +9286,14 @@ static INT32 StrahlLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvScrollRAM, 0x084000, 0x0843ff, MAP_WRITE); - SekMapMemory(DrvScrollRAM + 0x400, 0x088000, 0x0883ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x08c000, 0x08c7ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvBgRAM1, 0x094000, 0x097fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvScrollRAM, 0x084000, 0x0843ff, SM_WRITE); + SekMapMemory(DrvScrollRAM + 0x400, 0x088000, 0x0883ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x08c000, 0x08c7ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvBgRAM1, 0x094000, 0x097fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_RAM); SekSetWriteWordHandler(0, macross_main_write_word); SekSetWriteByteHandler(0, macross_main_write_byte); SekSetReadWordHandler(0, macross_main_read_word); @@ -9417,12 +9417,12 @@ static INT32 BioshipLoadCallback() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0887ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x08c000, 0x08c3ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x090000, 0x093fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x09c000, 0x09c7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0f0000, 0x0fffff, SM_RAM); SekSetWriteWordHandler(0, macross_main_write_word); SekSetWriteByteHandler(0, macross_main_write_byte); SekSetReadWordHandler(0, macross_main_read_word); @@ -9621,7 +9621,7 @@ static void raphero_sound_bankswitch(INT32 data) { INT32 nBank = ((data & 0x07) * 0x4000) + 0x10000; - tlcs90MapMemory(DrvZ80ROM + nBank, 0x8000, 0xbfff, MAP_ROM); + tlcs90MapMemory(DrvZ80ROM + nBank, 0x8000, 0xbfff, TLCS90_ROM); } static void raphero_sound_write(UINT32 address, UINT8 data) @@ -9760,16 +9760,16 @@ static INT32 RapheroInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x120000, 0x1207ff, MAP_RAM); - SekMapMemory(DrvScrollRAM, 0x130000, 0x1307ff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x140000, 0x143fff, MAP_RAM); - SekMapMemory(DrvBgRAM1, 0x144000, 0x147fff, MAP_RAM); - SekMapMemory(DrvBgRAM2, 0x148000, 0x14bfff, MAP_RAM); - SekMapMemory(DrvBgRAM3, 0x14c000, 0x14ffff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x170000, 0x170fff, MAP_RAM); - SekMapMemory(DrvTxRAM, 0x171000, 0x171fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x1f0000, 0x1fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x120000, 0x1207ff, SM_RAM); + SekMapMemory(DrvScrollRAM, 0x130000, 0x1307ff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x140000, 0x143fff, SM_RAM); + SekMapMemory(DrvBgRAM1, 0x144000, 0x147fff, SM_RAM); + SekMapMemory(DrvBgRAM2, 0x148000, 0x14bfff, SM_RAM); + SekMapMemory(DrvBgRAM3, 0x14c000, 0x14ffff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x170000, 0x170fff, SM_RAM); + SekMapMemory(DrvTxRAM, 0x171000, 0x171fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x1f0000, 0x1fffff, SM_RAM); SekSetWriteWordHandler(0, raphero_main_write_word); SekSetWriteByteHandler(0, raphero_main_write_byte); SekSetReadWordHandler(0, raphero_main_read_word); @@ -9778,8 +9778,8 @@ static INT32 RapheroInit() tlcs90Init(0, 8000000); tlcs90Open(0); - tlcs90MapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - tlcs90MapMemory(DrvZ80RAM, 0xe000, 0xffff, MAP_RAM); + tlcs90MapMemory(DrvZ80ROM, 0x0000, 0x7fff, TLCS90_ROM); + tlcs90MapMemory(DrvZ80RAM, 0xe000, 0xffff, TLCS90_RAM); tlcs90SetWriteHandler(raphero_sound_write); tlcs90SetReadHandler(raphero_sound_read); tlcs90Close(); diff --git a/src/burn/drv/pst90s/d_ohmygod.cpp b/src/burn/drv/pst90s/d_ohmygod.cpp index f28f30da5..1311ee939 100644 --- a/src/burn/drv/pst90s/d_ohmygod.cpp +++ b/src/burn/drv/pst90s/d_ohmygod.cpp @@ -483,14 +483,14 @@ INT32 OhmygodInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(OhmygodRom , 0x000000, 0x07ffff, MAP_ROM ); - SekMapMemory(OhmygodRam + 0x000000, 0x300000, 0x303fff, MAP_RAM ); - SekMapMemory(OhmygodVideoRam , 0x304000, 0x307fff, MAP_RAM ); - SekMapMemory(OhmygodRam + 0x004000, 0x308000, 0x30ffff, MAP_RAM ); - SekMapMemory(OhmygodPaletteRam , 0x600000, 0x607fff, MAP_WRITE); - SekMapMemory(OhmygodSpriteRam , 0x700000, 0x703fff, MAP_RAM ); - SekMapMemory(OhmygodRam + 0x00c000, 0x704000, 0x707fff, MAP_RAM ); - SekMapMemory(OhmygodRam + 0x010000, 0x708000, 0x70ffff, MAP_RAM ); + SekMapMemory(OhmygodRom , 0x000000, 0x07ffff, SM_ROM ); + SekMapMemory(OhmygodRam + 0x000000, 0x300000, 0x303fff, SM_RAM ); + SekMapMemory(OhmygodVideoRam , 0x304000, 0x307fff, SM_RAM ); + SekMapMemory(OhmygodRam + 0x004000, 0x308000, 0x30ffff, SM_RAM ); + SekMapMemory(OhmygodPaletteRam , 0x600000, 0x607fff, SM_WRITE); + SekMapMemory(OhmygodSpriteRam , 0x700000, 0x703fff, SM_RAM ); + SekMapMemory(OhmygodRam + 0x00c000, 0x704000, 0x707fff, SM_RAM ); + SekMapMemory(OhmygodRam + 0x010000, 0x708000, 0x70ffff, SM_RAM ); SekSetReadWordHandler(0, OhmygodReadWord); SekSetWriteWordHandler(0, OhmygodWriteWord); SekSetReadByteHandler(0, OhmygodReadByte); diff --git a/src/burn/drv/pst90s/d_pass.cpp b/src/burn/drv/pst90s/d_pass.cpp index e90e511fb..54816b379 100644 --- a/src/burn/drv/pst90s/d_pass.cpp +++ b/src/burn/drv/pst90s/d_pass.cpp @@ -251,11 +251,11 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x083fff, MAP_RAM); - SekMapMemory(DrvBgVRAM, 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(DrvFgVRAM, 0x210000, 0x213fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x220000, 0x2203ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x083fff, SM_RAM); + SekMapMemory(DrvBgVRAM, 0x200000, 0x200fff, SM_RAM); + SekMapMemory(DrvFgVRAM, 0x210000, 0x213fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x220000, 0x2203ff, SM_RAM); SekSetWriteWordHandler(0, pass_write_word); SekSetWriteByteHandler(0, pass_write_byte); SekSetReadWordHandler(0, pass_read_word); diff --git a/src/burn/drv/pst90s/d_pirates.cpp b/src/burn/drv/pst90s/d_pirates.cpp index 060faf86b..9e6935815 100644 --- a/src/burn/drv/pst90s/d_pirates.cpp +++ b/src/burn/drv/pst90s/d_pirates.cpp @@ -399,14 +399,14 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM + 0x0000, 0x100000, 0x109bff, MAP_RAM); - SekMapMemory(Drv68KRAM + 0x9c00, 0x109c00, 0x109fff, (is_genix) ? MAP_ROM : MAP_RAM); - SekMapMemory(Drv68KRAM + 0xa000, 0x10a000, 0x10ffff, MAP_RAM); -// SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x500000, 0x5007ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x800000, 0x803fff, MAP_ROM); - SekMapMemory(DrvMiscRAM, 0x900000, 0x904fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM + 0x0000, 0x100000, 0x109bff, SM_RAM); + SekMapMemory(Drv68KRAM + 0x9c00, 0x109c00, 0x109fff, (is_genix) ? SM_ROM : SM_RAM); + SekMapMemory(Drv68KRAM + 0xa000, 0x10a000, 0x10ffff, SM_RAM); +// SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x500000, 0x5007ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x800000, 0x803fff, SM_ROM); + SekMapMemory(DrvMiscRAM, 0x900000, 0x904fff, SM_RAM); SekSetWriteByteHandler(0, pirates_write_byte); SekSetWriteWordHandler(0, pirates_write_word); SekSetReadByteHandler(0, pirates_read_byte); diff --git a/src/burn/drv/pst90s/d_playmark.cpp b/src/burn/drv/pst90s/d_playmark.cpp index 645e37237..00a902699 100644 --- a/src/burn/drv/pst90s/d_playmark.cpp +++ b/src/burn/drv/pst90s/d_playmark.cpp @@ -1047,13 +1047,13 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68kRom , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvSpriteRam , 0x440000, 0x4403ff, MAP_RAM); - SekMapMemory(DrvVideo2Ram , 0x500000, 0x500fff, MAP_RAM); - SekMapMemory(DrvVideo1Ram , 0x502000, 0x503fff, MAP_RAM); - SekMapMemory(DrvBgVideoRam , 0x600000, 0x67ffff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x780000, 0x7807ff, MAP_READ); - SekMapMemory(Drv68kRam , 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68kRom , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvSpriteRam , 0x440000, 0x4403ff, SM_RAM); + SekMapMemory(DrvVideo2Ram , 0x500000, 0x500fff, SM_RAM); + SekMapMemory(DrvVideo1Ram , 0x502000, 0x503fff, SM_RAM); + SekMapMemory(DrvBgVideoRam , 0x600000, 0x67ffff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x780000, 0x7807ff, SM_READ); + SekMapMemory(Drv68kRam , 0xff0000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, DrvReadByte); SekSetReadWordHandler(0, DrvReadWord); SekSetWriteByteHandler(0, DrvWriteByte); @@ -1138,13 +1138,13 @@ static INT32 ExcelsrInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68kRom , 0x000000, 0x2fffff, MAP_ROM); - SekMapMemory(DrvSpriteRam , 0x440000, 0x440fff, MAP_RAM); - SekMapMemory(DrvVideo2Ram , 0x500000, 0x500fff, MAP_RAM); - SekMapMemory(DrvVideo1Ram , 0x501000, 0x501fff, MAP_RAM); - SekMapMemory(DrvBgVideoRam , 0x600000, 0x67ffff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x780000, 0x7807ff, MAP_READ); - SekMapMemory(Drv68kRam , 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68kRom , 0x000000, 0x2fffff, SM_ROM); + SekMapMemory(DrvSpriteRam , 0x440000, 0x440fff, SM_RAM); + SekMapMemory(DrvVideo2Ram , 0x500000, 0x500fff, SM_RAM); + SekMapMemory(DrvVideo1Ram , 0x501000, 0x501fff, SM_RAM); + SekMapMemory(DrvBgVideoRam , 0x600000, 0x67ffff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x780000, 0x7807ff, SM_READ); + SekMapMemory(Drv68kRam , 0xff0000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, ExcelsrReadByte); SekSetReadWordHandler(0, ExcelsrReadWord); SekSetWriteByteHandler(0, ExcelsrWriteByte); @@ -1240,13 +1240,13 @@ static INT32 HotmindInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68kRom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvBgVideoRam , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(DrvVideo2Ram , 0x104000, 0x107fff, MAP_RAM); - SekMapMemory(DrvVideo1Ram , 0x108000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x280000, 0x2807ff, MAP_READ); - SekMapMemory(Drv68kRam , 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68kRom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvBgVideoRam , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(DrvVideo2Ram , 0x104000, 0x107fff, SM_RAM); + SekMapMemory(DrvVideo1Ram , 0x108000, 0x10ffff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x200000, 0x200fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x280000, 0x2807ff, SM_READ); + SekMapMemory(Drv68kRam , 0xff0000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, HotmindReadByte); SekSetReadWordHandler(0, HotmindReadWord); SekSetWriteByteHandler(0, HotmindWriteByte); diff --git a/src/burn/drv/pst90s/d_powerins.cpp b/src/burn/drv/pst90s/d_powerins.cpp index 1d43843f8..3e0a34024 100644 --- a/src/burn/drv/pst90s/d_powerins.cpp +++ b/src/burn/drv/pst90s/d_powerins.cpp @@ -799,19 +799,19 @@ static INT32 powerinsInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM + SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM SekMapMemory((UINT8 *)RamPal, - 0x120000, 0x120FFF, MAP_ROM); // palette + 0x120000, 0x120FFF, SM_ROM); // palette SekMapMemory((UINT8 *)RamBg, - 0x140000, 0x143fff, MAP_RAM); // b ground + 0x140000, 0x143fff, SM_RAM); // b ground SekMapMemory((UINT8 *)RamFg, - 0x170000, 0x170fff, MAP_RAM); // f ground + 0x170000, 0x170fff, SM_RAM); // f ground SekMapMemory((UINT8 *)RamFg, - 0x171000, 0x171fff, MAP_RAM); // f ground Mirror + 0x171000, 0x171fff, SM_RAM); // f ground Mirror SekMapMemory((UINT8 *)RamSpr, - 0x180000, 0x18ffff, MAP_RAM); // sprites + 0x180000, 0x18ffff, SM_RAM); // sprites - SekMapHandler(1, 0x120000, 0x120FFF, MAP_WRITE); + SekMapHandler(1, 0x120000, 0x120FFF, SM_WRITE); SekSetReadWordHandler(0, powerinsReadWord); diff --git a/src/burn/drv/pst90s/d_pushman.cpp b/src/burn/drv/pst90s/d_pushman.cpp index 619363b25..42f8df76d 100644 --- a/src/burn/drv/pst90s/d_pushman.cpp +++ b/src/burn/drv/pst90s/d_pushman.cpp @@ -530,11 +530,11 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x0e0800, 0x0e17ff, MAP_RAM); - SekMapMemory(DrvVidRAM, 0x0ec000, 0x0ec7ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x0f8000, 0x0f87ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0fc000, 0x0fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x0e0800, 0x0e17ff, SM_RAM); + SekMapMemory(DrvVidRAM, 0x0ec000, 0x0ec7ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x0f8000, 0x0f87ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0fc000, 0x0fffff, SM_RAM); SekSetWriteWordHandler(0, pushman_main_write_word); SekSetWriteByteHandler(0, pushman_main_write_byte); SekSetReadWordHandler(0, pushman_main_read_word); @@ -554,8 +554,8 @@ static INT32 DrvInit() m6805Init(1, 0x1000); // m6805Open(0); - m6805MapMemory(DrvMcuRAM + 0x0000, 0x0010, 0x007f, MAP_RAM); - m6805MapMemory(DrvMcuROM + 0x0080, 0x0080, 0x0fff, MAP_ROM); + m6805MapMemory(DrvMcuRAM + 0x0000, 0x0010, 0x007f, M6805_RAM); + m6805MapMemory(DrvMcuROM + 0x0080, 0x0080, 0x0fff, M6805_ROM); m6805SetWriteHandler(pushman_mcu_write); m6805SetReadHandler(pushman_mcu_read); // m6805Close(); diff --git a/src/burn/drv/pst90s/d_sandscrp.cpp b/src/burn/drv/pst90s/d_sandscrp.cpp index d16a02e60..6d0fb0be6 100644 --- a/src/burn/drv/pst90s/d_sandscrp.cpp +++ b/src/burn/drv/pst90s/d_sandscrp.cpp @@ -377,7 +377,7 @@ static void bankswitch(INT32 bank) { nDrvZ80Bank = bank & 7; - ZetMapMemory(DrvZ80ROM + ((bank & 0x07) * 0x4000), 0x8000, 0xbfff, MAP_ROM); + ZetMapMemory(DrvZ80ROM + ((bank & 0x07) * 0x4000), 0x8000, 0xbfff, ZET_ROM); } static void __fastcall sandscrp_sound_write_port(UINT16 port, UINT8 data) @@ -610,30 +610,30 @@ static INT32 DrvInit(INT32 type) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvVidRegs, 0x300000, 0x30000f|0x3ff, MAP_RAM); - SekMapMemory(DrvVideoRAM, 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x500000, 0x501fff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x600000, 0x600fff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x700000, 0x70ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvVidRegs, 0x300000, 0x30000f|0x3ff, SM_RAM); + SekMapMemory(DrvVideoRAM, 0x400000, 0x403fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x500000, 0x501fff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x600000, 0x600fff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x700000, 0x70ffff, SM_RAM); SekSetWriteWordHandler(0, sandscrp_main_write_word); SekSetWriteByteHandler(0, sandscrp_main_write_byte); SekSetReadWordHandler(0, sandscrp_main_read_word); SekSetReadByteHandler(0, sandscrp_main_read_byte); - SekMapHandler(1, 0x500000, 0x501fff, MAP_WRITE); + SekMapHandler(1, 0x500000, 0x501fff, SM_WRITE); SekSetWriteWordHandler(1, sandscrp_pandora_write_word); SekSetWriteByteHandler(1, sandscrp_pandora_write_byte); - SekMapHandler(2, 0x600000, 0x600fff, MAP_WRITE); + SekMapHandler(2, 0x600000, 0x600fff, SM_WRITE); SekSetWriteWordHandler(2, sandscrp_palette_write_word); SekSetWriteByteHandler(2, sandscrp_palette_write_byte); SekClose(); ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0xbfff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0xbfff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0xc000, 0xdfff, ZET_RAM); ZetSetOutHandler(sandscrp_sound_write_port); ZetSetInHandler(sandscrp_sound_read_port); ZetClose(); diff --git a/src/burn/drv/pst90s/d_seta.cpp b/src/burn/drv/pst90s/d_seta.cpp index 804bfd82b..9a4523496 100644 --- a/src/burn/drv/pst90s/d_seta.cpp +++ b/src/burn/drv/pst90s/d_seta.cpp @@ -5547,19 +5547,19 @@ static void drgnunit68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0bffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x700000, 0x7003ff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x900000, 0x903fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xf00000, 0xf0ffff, MAP_RAM); - SekMapMemory(Drv68KRAM + 0x0010000, 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0bffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x700000, 0x7003ff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x900000, 0x903fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xf00000, 0xf0ffff, SM_RAM); + SekMapMemory(Drv68KRAM + 0x0010000, 0xffc000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, drgnunit_write_word); SekSetWriteByteHandler(0, drgnunit_write_byte); SekSetReadWordHandler(0, drgnunit_read_word); SekSetReadByteHandler(0, drgnunit_read_byte); - SekMapHandler(1, 0x100000, 0x103fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x100000, 0x103fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5571,22 +5571,22 @@ static void daioh68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(Drv68KRAM + 0x0010000, 0x700000, 0x7003ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x701000, 0x70ffff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x800000, 0x80ffff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x880000, 0x88ffff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(Drv68KRAM + 0x0020000, 0xa80000, 0xa803ff, MAP_WRITE); // nop out - SekMapMemory(DrvSprRAM1, 0xb00000, 0xb13fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(Drv68KRAM + 0x0010000, 0x700000, 0x7003ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x701000, 0x70ffff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x800000, 0x80ffff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x880000, 0x88ffff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(Drv68KRAM + 0x0020000, 0xa80000, 0xa803ff, SM_WRITE); // nop out + SekMapMemory(DrvSprRAM1, 0xb00000, 0xb13fff, SM_RAM); SekSetWriteWordHandler(0, daioh_write_word); SekSetWriteByteHandler(0, daioh_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0xc00000, 0xc03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xc00000, 0xc03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5598,22 +5598,22 @@ static void wrofaero68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x21ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x7003ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0011000, 0x701000, 0x70ffff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x800000, 0x80ffff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x880000, 0x88ffff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xb00000, 0xb13fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x21ffff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x7003ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0011000, 0x701000, 0x70ffff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x800000, 0x80ffff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x880000, 0x88ffff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xb00000, 0xb13fff, SM_RAM); SekSetWriteWordHandler(0, daioh_write_word); SekSetWriteByteHandler(0, daioh_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0xc00000, 0xc03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xc00000, 0xc03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5625,23 +5625,23 @@ static void msgundam68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); for (INT32 i = 0; i < 0x80000; i+=0x10000) // mirrored - SekMapMemory(Drv68KRAM, 0x200000+i, 0x20ffff+i, MAP_RAM); + SekMapMemory(Drv68KRAM, 0x200000+i, 0x20ffff+i, SM_RAM); - SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x800000, 0x800607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0x900000, 0x903fff, MAP_RAM); + SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x800000, 0x800607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0x900000, 0x903fff, SM_RAM); - SekMapMemory(DrvVidRAM0, 0xa00000, 0xa0ffff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0xa80000, 0xa8ffff, MAP_RAM); + SekMapMemory(DrvVidRAM0, 0xa00000, 0xa0ffff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0xa80000, 0xa8ffff, SM_RAM); SekSetWriteWordHandler(0, msgundam_write_word); SekSetWriteByteHandler(0, msgundam_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0xc00000, 0xc03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xc00000, 0xc03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5653,17 +5653,17 @@ static void umanclub68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x300000, 0x300fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xb00000, 0xb03fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x300000, 0x300fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xb00000, 0xb03fff, SM_RAM); SekSetWriteWordHandler(0, daioh_write_word); SekSetWriteByteHandler(0, daioh_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0xc00000, 0xc03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xc00000, 0xc03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5675,21 +5675,21 @@ static void kamenrid68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x7003ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0011000, 0x701000, 0x703fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x800000, 0x807fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x880000, 0x887fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xb00000, 0xb07fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x7003ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0011000, 0x701000, 0x703fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x800000, 0x807fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x880000, 0x887fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xb00000, 0xb07fff, SM_RAM); SekSetWriteWordHandler(0, madshark_write_word); SekSetWriteByteHandler(0, madshark_write_byte); SekSetReadWordHandler(0, kamenrid_read_word); SekSetReadByteHandler(0, kamenrid_read_byte); - SekMapHandler(1, 0xd00000, 0xd03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xd00000, 0xd03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5707,21 +5707,21 @@ static void madshark68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x7003ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0011000, 0x701000, 0x703fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x800000, 0x807fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x880000, 0x887fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xb00000, 0xb07fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x7003ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0011000, 0x701000, 0x703fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x800000, 0x807fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x880000, 0x887fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xb00000, 0xb07fff, SM_RAM); SekSetWriteWordHandler(0, madshark_write_word); SekSetWriteByteHandler(0, madshark_write_byte); SekSetReadWordHandler(0, madshark_read_word); SekSetReadByteHandler(0, madshark_read_byte); - SekMapHandler(1, 0xd00000, 0xd03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xd00000, 0xd03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5745,17 +5745,17 @@ static void thunderl68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x00ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x700000, 0x700fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xe00000, 0xe07fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x00ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x700000, 0x700fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xe00000, 0xe07fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, thunderl_write_word); SekSetWriteByteHandler(0, thunderl_write_byte); SekSetReadWordHandler(0, thunderl_read_word); SekSetReadByteHandler(0, thunderl_read_byte); - SekMapHandler(1, 0x100000, 0x103fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x100000, 0x103fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5767,17 +5767,17 @@ static void atehate68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x700000, 0x700fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x900000, 0x9fffff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x700000, 0x700fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x900000, 0x9fffff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, SM_RAM); SekSetWriteWordHandler(0, thunderl_write_word); SekSetWriteByteHandler(0, thunderl_write_byte); SekSetReadWordHandler(0, thunderl_read_word); SekSetReadByteHandler(0, thunderl_read_byte); - SekMapHandler(1, 0x100000, 0x103fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x100000, 0x103fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5789,17 +5789,17 @@ static void blockcar68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0xb00000, 0xb00fff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xc00000, 0xc03fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xe00000, 0xe00607 | 0x7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xf00000, 0xf05fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0xb00000, 0xb00fff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xc00000, 0xc03fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xe00000, 0xe00607 | 0x7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xf00000, 0xf05fff, SM_RAM); SekSetWriteWordHandler(0, thunderl_write_word); SekSetWriteByteHandler(0, thunderl_write_byte); SekSetReadWordHandler(0, madshark_read_word); SekSetReadByteHandler(0, madshark_read_byte); - SekMapHandler(1, 0xa00000, 0xa03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xa00000, 0xa03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5814,7 +5814,7 @@ static void zombraid68kInit() wrofaero68kInit(); SekOpen(0); - SekMapHandler(2, 0xf00000, 0xf00003, MAP_READ | MAP_WRITE); + SekMapHandler(2, 0xf00000, 0xf00003, SM_READ | SM_WRITE); SekSetReadWordHandler (2, zombraid_gun_read_word); SekSetReadByteHandler (2, zombraid_gun_read_byte); SekSetWriteWordHandler(2, zombraid_gun_write_word); @@ -5860,22 +5860,22 @@ static void blandia68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x21ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x7003ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0011000, 0x701000, 0x70ffff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x800000, 0x800607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0x900000, 0x903fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0xb00000, 0xb0ffff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0xb80000, 0xb8ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x21ffff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x7003ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0011000, 0x701000, 0x70ffff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x800000, 0x800607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0x900000, 0x903fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0xb00000, 0xb0ffff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0xb80000, 0xb8ffff, SM_RAM); SekSetWriteWordHandler(0, daioh_write_word); SekSetWriteByteHandler(0, daioh_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0xc00000, 0xc03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xc00000, 0xc03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5892,23 +5892,23 @@ static void blandiap68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x21ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x7003ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0011000, 0x701000, 0x70ffff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x800000, 0x80ffff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x880000, 0x88ffff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(Drv68KRAM + 0x0020000, 0xa80000, 0xa803ff, MAP_WRITE); //nop - SekMapMemory(DrvSprRAM1, 0xb00000, 0xb03fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x21ffff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x7003ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0011000, 0x701000, 0x70ffff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x800000, 0x80ffff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x880000, 0x88ffff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(Drv68KRAM + 0x0020000, 0xa80000, 0xa803ff, SM_WRITE); //nop + SekMapMemory(DrvSprRAM1, 0xb00000, 0xb03fff, SM_RAM); SekSetWriteWordHandler(0, daioh_write_word); SekSetWriteByteHandler(0, daioh_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0xc00000, 0xc03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xc00000, 0xc03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5942,19 +5942,19 @@ static void oisipuzl68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x800000, 0x803fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x880000, 0x883fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xb00000, 0xb03fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xc00400, 0xc00fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x800000, 0x803fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x880000, 0x883fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xb00000, 0xb03fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xc00400, 0xc00fff, SM_RAM); SekSetWriteWordHandler(0, daioh_write_word); SekSetWriteByteHandler(0, daioh_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0x700000, 0x703fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x700000, 0x703fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5966,18 +5966,18 @@ static void pairlove68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvNVRAM, 0x800000, 0x8001ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xb00000, 0xb00fff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xc00000, 0xc03fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xe00000, 0xe00607 | 0x7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xf00000, 0xf0ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvNVRAM, 0x800000, 0x8001ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xb00000, 0xb00fff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xc00000, 0xc03fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xe00000, 0xe00607 | 0x7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xf00000, 0xf0ffff, SM_RAM); SekSetWriteWordHandler(0, pairlove_write_word); SekSetWriteByteHandler(0, pairlove_write_byte); SekSetReadWordHandler(0, pairlove_read_word); SekSetReadByteHandler(0, pairlove_read_byte); - SekMapHandler(1, 0xa00000, 0xa03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xa00000, 0xa03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -5989,23 +5989,23 @@ static void jjsquawkb68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x21ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x70b3ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x70b400, 0x70bfff, MAP_RAM); - SekMapMemory(Drv68KRAM2 + 0x001c000, 0x70c000, 0x70ffff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x800000, 0x803fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x804000, 0x807fff, MAP_RAM); - SekMapMemory(DrvVidRAM1 + 0x4000, 0x884000, 0x88ffff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa0a000, 0xa0a607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xb0c000, 0xb0ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x21ffff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x0010000, 0x700000, 0x70b3ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x70b400, 0x70bfff, SM_RAM); + SekMapMemory(Drv68KRAM2 + 0x001c000, 0x70c000, 0x70ffff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x800000, 0x803fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x804000, 0x807fff, SM_RAM); + SekMapMemory(DrvVidRAM1 + 0x4000, 0x884000, 0x88ffff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa0a000, 0xa0a607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xb0c000, 0xb0ffff, SM_RAM); SekSetWriteWordHandler(0, daioh_write_word); SekSetWriteByteHandler(0, daioh_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0xc00000, 0xc03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xc00000, 0xc03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -6027,20 +6027,20 @@ static void extdwnhl68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x23ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x600400, 0x600fff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0x601000, 0x610bff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x800000, 0x80ffff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x880000, 0x88ffff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xb00000, 0xb13fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x23ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x600400, 0x600fff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0x601000, 0x610bff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x800000, 0x80ffff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x880000, 0x88ffff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xb00000, 0xb13fff, SM_RAM); SekSetWriteWordHandler(0, daioh_write_word); SekSetWriteByteHandler(0, daioh_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0xe00000, 0xe03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xe00000, 0xe03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -6056,18 +6056,18 @@ static void krzybowl68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvNVRAM, 0x800000, 0x8001ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xb00000, 0xb003ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xc00000, 0xc03fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xe00000, 0xe00607 | 0x7ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xf00000, 0xf0ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvNVRAM, 0x800000, 0x8001ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xb00000, 0xb003ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xc00000, 0xc03fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xe00000, 0xe00607 | 0x7ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xf00000, 0xf0ffff, SM_RAM); SekSetWriteWordHandler(0, thunderl_write_word); SekSetWriteByteHandler(0, thunderl_write_byte); SekSetReadWordHandler(0, madshark_read_word); SekSetReadByteHandler(0, madshark_read_byte); - SekMapHandler(1, 0xa00000, 0xa03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xa00000, 0xa03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -6092,7 +6092,7 @@ static void triplfun68kInit() oisipuzl68kInit(); SekOpen(0); - SekMapHandler(2, 0x500006, 0x500007, MAP_READ | MAP_WRITE); + SekMapHandler(2, 0x500006, 0x500007, SM_READ | SM_WRITE); // SekSetReadWordHandler (2, triplfun_sound_read_word); SekSetReadByteHandler (2, triplfun_sound_read_byte); // SekSetWriteWordHandler(2, triplfun_sound_write_word); @@ -6111,19 +6111,19 @@ static void utoukond68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x800000, 0x803fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x880000, 0x883fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xb00000, 0xb03fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x700400, 0x700fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x800000, 0x803fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x880000, 0x883fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xb00000, 0xb03fff, SM_RAM); SekSetWriteWordHandler(0, daioh_write_word); SekSetWriteByteHandler(0, daioh_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0xc00000, 0xc00001, MAP_WRITE); + SekMapHandler(1, 0xc00000, 0xc00001, SM_WRITE); SekSetWriteWordHandler(1, wiggie_sound_write_word); SekSetWriteByteHandler(1, wiggie_sound_write_byte); SekClose(); @@ -6160,9 +6160,9 @@ static void wiggie68kInit() thunderl68kInit(); SekOpen(0); - SekMapMemory(Drv68KRAM + 0x80000, 0x100000, 0x103fff, MAP_READ); // nop + SekMapMemory(Drv68KRAM + 0x80000, 0x100000, 0x103fff, SM_READ); // nop - SekMapHandler(1, 0xb00008, 0xb00009, MAP_WRITE); + SekMapHandler(1, 0xb00008, 0xb00009, SM_WRITE); SekSetWriteWordHandler(1, wiggie_sound_write_word); SekSetWriteByteHandler(1, wiggie_sound_write_byte); SekClose(); @@ -6186,29 +6186,29 @@ static void downtown68kInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x09ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x700000, 0x7003ff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x900000, 0x903fff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0xb00000, 0xb00fff, MAP_WRITE); // m65c02 not emulated, simulate instead - SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xf00000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x09ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x700000, 0x7003ff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x900000, 0x903fff, SM_RAM); + SekMapMemory(DrvShareRAM, 0xb00000, 0xb00fff, SM_WRITE); // m65c02 not emulated, simulate instead + SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xf00000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, downtown_write_word); SekSetWriteByteHandler(0, downtown_write_byte); SekSetReadWordHandler(0, daioh_read_word); SekSetReadByteHandler(0, daioh_read_byte); - SekMapHandler(1, 0x100000, 0x103fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x100000, 0x103fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); SekSetWriteByteHandler(1, setaSoundRegWriteByte); - SekMapMemory(downtown_protram, 0x200000, 0x2003ff, MAP_WRITE); - SekMapHandler(2, 0x200000, 0x2003ff, MAP_READ); + SekMapMemory(downtown_protram, 0x200000, 0x2003ff, SM_WRITE); + SekMapHandler(2, 0x200000, 0x2003ff, SM_READ); SekSetReadByteHandler (2, downtown_prot_read); - SekMapHandler(3, 0xb00000, 0xb00fff, MAP_READ); + SekMapHandler(3, 0xb00000, 0xb00fff, SM_READ); SekSetReadByteHandler (3, downtown_sharedram_read_byte); SekSetReadWordHandler (3, downtown_sharedram_read_word); SekClose(); @@ -6228,16 +6228,16 @@ static void tndrcade68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x380000, 0x3803ff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x600000, 0x600607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvShareRAM, 0xa00000, 0xa00fff, MAP_WRITE); // m65c02 not emulated, simulate instead - SekMapMemory(DrvSprRAM1, 0xc00000, 0xc03fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xe00000, 0xe03fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x380000, 0x3803ff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x600000, 0x600607 | 0x7ff, SM_RAM); + SekMapMemory(DrvShareRAM, 0xa00000, 0xa00fff, SM_WRITE); // m65c02 not emulated, simulate instead + SekMapMemory(DrvSprRAM1, 0xc00000, 0xc03fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xe00000, 0xe03fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, SM_RAM); // install simulation to make game playable - SekMapHandler(3, 0xa00000, 0xa00fff, MAP_READ); + SekMapHandler(3, 0xa00000, 0xa00fff, SM_READ); SekSetReadByteHandler (3, tndrcade_sharedram_read_byte); SekSetReadWordHandler (3, tndrcade_sharedram_read_word); SekClose(); @@ -6247,17 +6247,17 @@ static void kiwame68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0x800000, 0x803fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xb00000, 0xb003ff, MAP_RAM); - SekMapMemory(DrvNVRAM, 0xfffc00, 0xffffff, MAP_WRITE); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0x800000, 0x803fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xb00000, 0xb003ff, SM_RAM); + SekMapMemory(DrvNVRAM, 0xfffc00, 0xffffff, SM_WRITE); SekSetReadWordHandler(0, kiwame_read_word); SekSetReadByteHandler(0, kiwame_read_byte); - SekMapHandler(1, 0xc00000, 0xc03fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0xc00000, 0xc03fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -6285,11 +6285,11 @@ static void twineagle68kInit() downtown68kInit(); SekOpen(0); - SekMapMemory(DrvNVRAM, 0x200000, 0x2003ff, MAP_WRITE); - SekMapHandler(2, 0x200000, 0x2003ff, MAP_READ); + SekMapMemory(DrvNVRAM, 0x200000, 0x2003ff, SM_WRITE); + SekMapHandler(2, 0x200000, 0x2003ff, SM_READ); SekSetReadByteHandler (2, twineagle_extram_read_byte); - SekMapHandler(3, 0xb00000, 0xb00fff, MAP_READ | MAP_WRITE); + SekMapHandler(3, 0xb00000, 0xb00fff, SM_READ | SM_WRITE); SekSetReadByteHandler (3, twineagl_sharedram_read_byte); SekSetReadWordHandler (3, twineagl_sharedram_read_word); SekSetWriteWordHandler(3, twineagl_sharedram_write_word); @@ -6303,13 +6303,13 @@ static void crazyfgt68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x640400, 0x640fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x800000, 0x803fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x880000, 0x883fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xb00000, 0xb03fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x640400, 0x640fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x800000, 0x803fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x880000, 0x883fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xb00000, 0xb03fff, SM_RAM); SekSetWriteWordHandler(0, crazyfgt_write_word); SekSetWriteByteHandler(0, crazyfgt_write_byte); SekSetReadWordHandler(0, crazyfgt_read_word); @@ -6326,13 +6326,13 @@ static void usclssic68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvSprRAM0, 0x800000, 0x800607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xb00000, 0xb003ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xc00000, 0xc03fff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0xd00000, 0xd04fff, MAP_RAM); - SekMapMemory(Drv68KRAM2, 0xe00000, 0xe00fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvSprRAM0, 0x800000, 0x800607 | 0x7ff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xb00000, 0xb003ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xc00000, 0xc03fff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0xd00000, 0xd04fff, SM_RAM); + SekMapMemory(Drv68KRAM2, 0xe00000, 0xe00fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, usclssic_write_word); SekSetWriteByteHandler(0, usclssic_write_byte); SekSetReadWordHandler(0, usclssic_read_word); @@ -6346,13 +6346,13 @@ static void calibr5068kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x09ffff, MAP_ROM); - SekMapMemory(Drv68KRAM2, 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x700000, 0x7003ff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x900000, 0x904fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x09ffff, SM_ROM); + SekMapMemory(Drv68KRAM2, 0x200000, 0x200fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x700000, 0x7003ff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x900000, 0x904fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, calibr50_write_word); SekSetWriteByteHandler(0, calibr50_write_byte); SekSetReadWordHandler(0, calibr50_read_word); @@ -7673,14 +7673,14 @@ static void inttoote68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(DrvVidRAM0, 0xb00000, 0xb07fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(DrvVidRAM0, 0xb00000, 0xb07fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, SM_RAM); - SekMapHandler(1, 0x900000, 0x903fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x900000, 0x903fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); @@ -10374,17 +10374,17 @@ static void jockeyc68kInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(DrvVidRAM0, 0xb00000, 0xb07fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(DrvVidRAM0, 0xb00000, 0xb07fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xd00000, 0xd00607 | 0x7ff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xe00000, 0xe03fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xffc000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, jockeyc_write_word); SekSetWriteByteHandler(0, jockeyc_write_byte); SekSetReadWordHandler(0, jockeyc_read_word); SekSetReadByteHandler(0, jockeyc_read_byte); - SekMapHandler(1, 0x900000, 0x903fff, MAP_READ | MAP_WRITE); + SekMapHandler(1, 0x900000, 0x903fff, SM_READ | SM_WRITE); SekSetReadWordHandler (1, setaSoundRegReadWord); SekSetReadByteHandler (1, setaSoundRegReadByte); SekSetWriteWordHandler(1, setaSoundRegWriteWord); diff --git a/src/burn/drv/pst90s/d_seta2.cpp b/src/burn/drv/pst90s/d_seta2.cpp index 4d0e35655..1c1d7688b 100644 --- a/src/burn/drv/pst90s/d_seta2.cpp +++ b/src/burn/drv/pst90s/d_seta2.cpp @@ -1621,23 +1621,23 @@ static INT32 grdiansInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram68K, 0x200000, 0x20FFFF, MAP_RAM); // CPU 0 RAM - SekMapMemory(RamUnknown, 0x304000, 0x30FFFF, MAP_RAM); // ? seems tile data + SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram68K, 0x200000, 0x20FFFF, SM_RAM); // CPU 0 RAM + SekMapMemory(RamUnknown, 0x304000, 0x30FFFF, SM_RAM); // ? seems tile data SekMapMemory((UINT8 *)RamSpr, - 0xC00000, 0xC3FFFF, MAP_RAM); // sprites + 0xC00000, 0xC3FFFF, SM_RAM); // sprites SekMapMemory((UINT8 *)RamPal, - 0xC40000, 0xC4FFFF, MAP_ROM); // Palette + 0xC40000, 0xC4FFFF, SM_ROM); // Palette SekMapMemory((UINT8 *)RamVReg, - 0xC60000, 0xC6003F, MAP_RAM); // Video Registers + 0xC60000, 0xC6003F, SM_RAM); // Video Registers SekMapMemory((UINT8 *)RamTMP68301, - 0xFFFC00, 0xFFFFFF, MAP_ROM); // TMP68301 Registers + 0xFFFC00, 0xFFFFFF, SM_ROM); // TMP68301 Registers - SekMapHandler(1, 0xB00000, 0xB03FFF, MAP_READ | MAP_WRITE); - SekMapHandler(2, 0xC40000, 0xC4FFFF, MAP_WRITE); // Palette - SekMapHandler(3, 0xC50000, 0xC5FFFF, MAP_WRITE); - SekMapHandler(4, 0xFFFC00, 0xFFFFFF, MAP_WRITE); + SekMapHandler(1, 0xB00000, 0xB03FFF, SM_READ | SM_WRITE); + SekMapHandler(2, 0xC40000, 0xC4FFFF, SM_WRITE); // Palette + SekMapHandler(3, 0xC50000, 0xC5FFFF, SM_WRITE); + SekMapHandler(4, 0xFFFC00, 0xFFFFFF, SM_WRITE); SekSetReadWordHandler(0, grdiansReadWord); SekSetReadByteHandler(0, grdiansReadByte); @@ -1789,21 +1789,21 @@ static INT32 mj4simaiInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram68K, 0x200000, 0x20FFFF, MAP_RAM); // CPU 0 RAM + SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram68K, 0x200000, 0x20FFFF, SM_RAM); // CPU 0 RAM SekMapMemory((UINT8 *)RamSpr, - 0xC00000, 0xC3FFFF, MAP_RAM); // sprites + 0xC00000, 0xC3FFFF, SM_RAM); // sprites SekMapMemory((UINT8 *)RamPal, - 0xC40000, 0xC4FFFF, MAP_ROM); // Palette + 0xC40000, 0xC4FFFF, SM_ROM); // Palette SekMapMemory((UINT8 *)RamVReg, - 0xC60000, 0xC6003F, MAP_RAM); // Video Registers + 0xC60000, 0xC6003F, SM_RAM); // Video Registers SekMapMemory((UINT8 *)RamTMP68301, - 0xFFFC00, 0xFFFFFF, MAP_ROM); // TMP68301 Registers + 0xFFFC00, 0xFFFFFF, SM_ROM); // TMP68301 Registers - SekMapHandler(1, 0xB00000, 0xB03FFF, MAP_READ | MAP_WRITE); - SekMapHandler(2, 0xC40000, 0xC4FFFF, MAP_WRITE); // Palette - SekMapHandler(3, 0xFFFC00, 0xFFFFFF, MAP_WRITE); + SekMapHandler(1, 0xB00000, 0xB03FFF, SM_READ | SM_WRITE); + SekMapHandler(2, 0xC40000, 0xC4FFFF, SM_WRITE); // Palette + SekMapHandler(3, 0xFFFC00, 0xFFFFFF, SM_WRITE); SekSetReadWordHandler(0, mj4simaiReadWord); SekSetReadByteHandler(0, mj4simaiReadByte); @@ -1941,21 +1941,21 @@ static INT32 myangelInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram68K, 0x200000, 0x20FFFF, MAP_RAM); // CPU 0 RAM + SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram68K, 0x200000, 0x20FFFF, SM_RAM); // CPU 0 RAM SekMapMemory((UINT8 *)RamSpr, - 0xC00000, 0xC3FFFF, MAP_RAM); // sprites + 0xC00000, 0xC3FFFF, SM_RAM); // sprites SekMapMemory((UINT8 *)RamPal, - 0xC40000, 0xC4FFFF, MAP_ROM); // Palette + 0xC40000, 0xC4FFFF, SM_ROM); // Palette SekMapMemory((UINT8 *)RamVReg, - 0xC60000, 0xC6003F, MAP_RAM); // Video Registers + 0xC60000, 0xC6003F, SM_RAM); // Video Registers SekMapMemory((UINT8 *)RamTMP68301, - 0xFFFC00, 0xFFFFFF, MAP_ROM); // TMP68301 Registers + 0xFFFC00, 0xFFFFFF, SM_ROM); // TMP68301 Registers - SekMapHandler(1, 0xB00000, 0xB03FFF, MAP_READ | MAP_WRITE); - SekMapHandler(2, 0xC40000, 0xC4FFFF, MAP_WRITE); // Palette - SekMapHandler(3, 0xFFFC00, 0xFFFFFF, MAP_WRITE); + SekMapHandler(1, 0xB00000, 0xB03FFF, SM_READ | SM_WRITE); + SekMapHandler(2, 0xC40000, 0xC4FFFF, SM_WRITE); // Palette + SekMapHandler(3, 0xFFFC00, 0xFFFFFF, SM_WRITE); SekSetReadWordHandler(0, myangelReadWord); SekSetReadByteHandler(0, myangelReadByte); @@ -2091,21 +2091,21 @@ static INT32 myangel2Init() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram68K, 0x200000, 0x20FFFF, MAP_RAM); // CPU 0 RAM + SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram68K, 0x200000, 0x20FFFF, SM_RAM); // CPU 0 RAM SekMapMemory((UINT8 *)RamSpr, - 0xD00000, 0xD3FFFF, MAP_RAM); // sprites + 0xD00000, 0xD3FFFF, SM_RAM); // sprites SekMapMemory((UINT8 *)RamPal, - 0xD40000, 0xD4FFFF, MAP_ROM); // Palette + 0xD40000, 0xD4FFFF, SM_ROM); // Palette SekMapMemory((UINT8 *)RamVReg, - 0xD60000, 0xD6003F, MAP_RAM); // Video Registers + 0xD60000, 0xD6003F, SM_RAM); // Video Registers SekMapMemory((UINT8 *)RamTMP68301, - 0xFFFC00, 0xFFFFFF, MAP_ROM); // TMP68301 Registers + 0xFFFC00, 0xFFFFFF, SM_ROM); // TMP68301 Registers - SekMapHandler(1, 0xB00000, 0xB03FFF, MAP_READ | MAP_WRITE); - SekMapHandler(2, 0xD40000, 0xD4FFFF, MAP_WRITE); // Palette - SekMapHandler(3, 0xFFFC00, 0xFFFFFF, MAP_WRITE); + SekMapHandler(1, 0xB00000, 0xB03FFF, SM_READ | SM_WRITE); + SekMapHandler(2, 0xD40000, 0xD4FFFF, SM_WRITE); // Palette + SekMapHandler(3, 0xFFFC00, 0xFFFFFF, SM_WRITE); SekSetReadWordHandler(0, myangel2ReadWord); SekSetReadByteHandler(0, myangel2ReadByte); @@ -2249,21 +2249,21 @@ static INT32 pzlbowlInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram68K, 0x200000, 0x20FFFF, MAP_RAM); // CPU 0 RAM + SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram68K, 0x200000, 0x20FFFF, SM_RAM); // CPU 0 RAM SekMapMemory((UINT8 *)RamSpr, - 0x800000, 0x83FFFF, MAP_RAM); // sprites + 0x800000, 0x83FFFF, SM_RAM); // sprites SekMapMemory((UINT8 *)RamPal, - 0x840000, 0x84FFFF, MAP_ROM); // Palette + 0x840000, 0x84FFFF, SM_ROM); // Palette SekMapMemory((UINT8 *)RamVReg, - 0x860000, 0x86003F, MAP_RAM); // Video Registers + 0x860000, 0x86003F, SM_RAM); // Video Registers SekMapMemory((UINT8 *)RamTMP68301, - 0xFFFC00, 0xFFFFFF, MAP_ROM); // TMP68301 Registers + 0xFFFC00, 0xFFFFFF, SM_ROM); // TMP68301 Registers - SekMapHandler(1, 0x900000, 0x903FFF, MAP_READ | MAP_WRITE); - SekMapHandler(2, 0x840000, 0x84FFFF, MAP_WRITE); // Palette - SekMapHandler(3, 0xFFFC00, 0xFFFFFF, MAP_WRITE); + SekMapHandler(1, 0x900000, 0x903FFF, SM_READ | SM_WRITE); + SekMapHandler(2, 0x840000, 0x84FFFF, SM_WRITE); // Palette + SekMapHandler(3, 0xFFFC00, 0xFFFFFF, SM_WRITE); SekSetReadWordHandler(0, pzlbowlReadWord); SekSetReadByteHandler(0, pzlbowlReadByte); @@ -2395,26 +2395,26 @@ static INT32 penbrosInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram68K, 0x200000, 0x20FFFF, MAP_RAM); // CPU 0 RAM + SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram68K, 0x200000, 0x20FFFF, SM_RAM); // CPU 0 RAM SekMapMemory(RamUnknown + 0x00000, - 0x210000, 0x23FFFF, MAP_RAM); + 0x210000, 0x23FFFF, SM_RAM); SekMapMemory(RamUnknown + 0x30000, - 0x300000, 0x30FFFF, MAP_RAM); + 0x300000, 0x30FFFF, SM_RAM); SekMapMemory((UINT8 *)RamSpr, - 0xB00000, 0xB3FFFF, MAP_RAM); // sprites + 0xB00000, 0xB3FFFF, SM_RAM); // sprites SekMapMemory((UINT8 *)RamPal, - 0xB40000, 0xB4FFFF, MAP_ROM); // Palette + 0xB40000, 0xB4FFFF, SM_ROM); // Palette SekMapMemory((UINT8 *)RamVReg, - 0xB60000, 0xB6003F, MAP_RAM); // Video Registers + 0xB60000, 0xB6003F, SM_RAM); // Video Registers SekMapMemory((UINT8 *)RamTMP68301, - 0xFFFC00, 0xFFFFFF, MAP_ROM); // TMP68301 Registers + 0xFFFC00, 0xFFFFFF, SM_ROM); // TMP68301 Registers - SekMapHandler(1, 0xA00000, 0xA03FFF, MAP_READ | MAP_WRITE); - SekMapHandler(2, 0xB40000, 0xB4FFFF, MAP_WRITE); // Palette - SekMapHandler(3, 0xFFFC00, 0xFFFFFF, MAP_WRITE); + SekMapHandler(1, 0xA00000, 0xA03FFF, SM_READ | SM_WRITE); + SekMapHandler(2, 0xB40000, 0xB4FFFF, SM_WRITE); // Palette + SekMapHandler(3, 0xFFFC00, 0xFFFFFF, SM_WRITE); SekSetReadWordHandler(0, penbrosReadWord); SekSetReadByteHandler(0, penbrosReadByte); @@ -2571,17 +2571,17 @@ static INT32 gundamexInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram68K, 0x200000, 0x20FFFF, MAP_RAM); // CPU 0 RAM - SekMapMemory(Rom68K + 0x200000, 0x500000, 0x57FFFF, MAP_ROM); // CPU 0 ROM + SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram68K, 0x200000, 0x20FFFF, SM_RAM); // CPU 0 RAM + SekMapMemory(Rom68K + 0x200000, 0x500000, 0x57FFFF, SM_ROM); // CPU 0 ROM - SekMapMemory((UINT8 *)RamSpr, 0xc00000, 0xc3FFFF, MAP_RAM); // sprites - SekMapMemory((UINT8 *)RamPal, 0xc40000, 0xc4FFFF, MAP_ROM); // Palette - SekMapMemory(RamUnknown + 0x00000, 0xc50000, 0xc5FFFF, MAP_RAM); - SekMapMemory((UINT8 *)RamVReg, 0xc60000, 0xc6003F, MAP_RAM); // Video Registers + SekMapMemory((UINT8 *)RamSpr, 0xc00000, 0xc3FFFF, SM_RAM); // sprites + SekMapMemory((UINT8 *)RamPal, 0xc40000, 0xc4FFFF, SM_ROM); // Palette + SekMapMemory(RamUnknown + 0x00000, 0xc50000, 0xc5FFFF, SM_RAM); + SekMapMemory((UINT8 *)RamVReg, 0xc60000, 0xc6003F, SM_RAM); // Video Registers - SekMapHandler(1, 0xb00000, 0xb03FFF, MAP_READ | MAP_WRITE); - SekMapHandler(2, 0xc40000, 0xc4FFFF, MAP_WRITE); + SekMapHandler(1, 0xb00000, 0xb03FFF, SM_READ | SM_WRITE); + SekMapHandler(2, 0xc40000, 0xc4FFFF, SM_WRITE); SekSetReadWordHandler(0, gundamexReadWord); //SekSetReadByteHandler(0, gundamexReadByte); @@ -2705,19 +2705,19 @@ static INT32 samshootInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram68K, 0x200000, 0x20FFFF, MAP_RAM); // CPU 0 RAM + SekMapMemory(Rom68K, 0x000000, 0x1FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram68K, 0x200000, 0x20FFFF, SM_RAM); // CPU 0 RAM - SekMapMemory(RamNV + 0x00000, 0x300000, 0x30FFFF, MAP_RAM); + SekMapMemory(RamNV + 0x00000, 0x300000, 0x30FFFF, SM_RAM); - SekMapMemory((UINT8 *)RamSpr, 0x800000, 0x83FFFF, MAP_RAM); // sprites - SekMapMemory((UINT8 *)RamPal, 0x840000, 0x84FFFF, MAP_ROM); // Palette - SekMapMemory((UINT8 *)RamVReg, 0x860000, 0x86003F, MAP_RAM); // Video Registers - SekMapMemory((UINT8 *)RamTMP68301, 0xFFFC00, 0xFFFFFF, MAP_ROM); // TMP68301 Registers + SekMapMemory((UINT8 *)RamSpr, 0x800000, 0x83FFFF, SM_RAM); // sprites + SekMapMemory((UINT8 *)RamPal, 0x840000, 0x84FFFF, SM_ROM); // Palette + SekMapMemory((UINT8 *)RamVReg, 0x860000, 0x86003F, SM_RAM); // Video Registers + SekMapMemory((UINT8 *)RamTMP68301, 0xFFFC00, 0xFFFFFF, SM_ROM); // TMP68301 Registers - SekMapHandler(2, 0x840000, 0x84FFFF, MAP_WRITE); // Palette - SekMapHandler(1, 0x900000, 0x903FFF, MAP_READ | MAP_WRITE); - SekMapHandler(3, 0xFFFC00, 0xFFFFFF, MAP_WRITE); + SekMapHandler(2, 0x840000, 0x84FFFF, SM_WRITE); // Palette + SekMapHandler(1, 0x900000, 0x903FFF, SM_READ | SM_WRITE); + SekMapHandler(3, 0xFFFC00, 0xFFFFFF, SM_WRITE); SekSetReadWordHandler(0, samshootReadWord); SekSetWriteWordHandler(0, samshootWriteWord); diff --git a/src/burn/drv/pst90s/d_shadfrce.cpp b/src/burn/drv/pst90s/d_shadfrce.cpp index 0b9c37c4d..189b4ac81 100644 --- a/src/burn/drv/pst90s/d_shadfrce.cpp +++ b/src/burn/drv/pst90s/d_shadfrce.cpp @@ -443,6 +443,7 @@ void __fastcall shadfrceZWrite(UINT16 a, UINT8 d) static void shadfrceYM2151IRQHandler(INT32 nStatus) { if (nStatus) { + //ZetRaiseIrq(255); ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); ZetRun(0x0400); } else { @@ -667,21 +668,21 @@ static INT32 shadfrceInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM + SekMapMemory(Rom68K, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM SekMapMemory((UINT8 *)RamBg00, - 0x100000, 0x101FFF, MAP_RAM); // b ground 0 + 0x100000, 0x101FFF, SM_RAM); // b ground 0 SekMapMemory((UINT8 *)RamBg01, - 0x102000, 0x103FFF, MAP_RAM); // b ground 1 + 0x102000, 0x103FFF, SM_RAM); // b ground 1 SekMapMemory((UINT8 *)RamFg, - 0x140000, 0x141FFF, MAP_RAM); // f ground + 0x140000, 0x141FFF, SM_RAM); // f ground SekMapMemory((UINT8 *)RamSpr, - 0x142000, 0x143FFF, MAP_RAM); // sprites + 0x142000, 0x143FFF, SM_RAM); // sprites SekMapMemory((UINT8 *)RamPal, - 0x180000, 0x187FFF, MAP_ROM); // palette - SekMapMemory(Ram68K, 0x1F0000, 0x1FFFFF, MAP_RAM); // 68K RAM + 0x180000, 0x187FFF, SM_ROM); // palette + SekMapMemory(Ram68K, 0x1F0000, 0x1FFFFF, SM_RAM); // 68K RAM - SekMapHandler(1, 0x180000, 0x187FFF, MAP_WRITE); + SekMapHandler(1, 0x180000, 0x187FFF, SM_WRITE); SekSetReadWordHandler(0, shadfrceReadWord); diff --git a/src/burn/drv/pst90s/d_silkroad.cpp b/src/burn/drv/pst90s/d_silkroad.cpp index 5536bd4ce..ef17ec52a 100644 --- a/src/burn/drv/pst90s/d_silkroad.cpp +++ b/src/burn/drv/pst90s/d_silkroad.cpp @@ -390,11 +390,11 @@ static INT32 DrvInit() SekInit(0, 0x68EC020); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x40c000, 0x40cfff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x600000, 0x603fff, MAP_ROM); - SekMapMemory(DrvVidRAM, 0x800000, 0x80bfff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xfe0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x40c000, 0x40cfff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x600000, 0x603fff, SM_ROM); + SekMapMemory(DrvVidRAM, 0x800000, 0x80bfff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xfe0000, 0xffffff, SM_RAM); SekSetWriteByteHandler(0, silkroad_write_byte); SekSetWriteWordHandler(0, silkroad_write_word); SekSetWriteLongHandler(0, silkroad_write_long); diff --git a/src/burn/drv/pst90s/d_silvmil.cpp b/src/burn/drv/pst90s/d_silvmil.cpp index d81961a47..0334f017a 100644 --- a/src/burn/drv/pst90s/d_silvmil.cpp +++ b/src/burn/drv/pst90s/d_silvmil.cpp @@ -433,18 +433,18 @@ static INT32 DrvInit(INT32 game_select) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvFgRAM, 0x120000, 0x120fff, MAP_RAM); - SekMapMemory(DrvBgRAM, 0x122000, 0x122fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x200000, 0x2007ff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x210000, 0x2107ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x300000, 0x30ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvFgRAM, 0x120000, 0x120fff, SM_RAM); + SekMapMemory(DrvBgRAM, 0x122000, 0x122fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x200000, 0x2007ff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x210000, 0x2107ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x300000, 0x30ffff, SM_RAM); SekSetWriteByteHandler(0, silvmil_write_byte); SekSetWriteWordHandler(0, silvmil_write_word); SekSetReadByteHandler(0, silvmil_read_byte); SekSetReadWordHandler(0, silvmil_read_word); - SekMapHandler(1, 0x200000, 0x2007ff, MAP_WRITE); + SekMapHandler(1, 0x200000, 0x2007ff, SM_WRITE); SekSetWriteByteHandler(1, silvmil_palette_write_byte); SekSetWriteWordHandler(1, silvmil_palette_write_word); SekClose(); diff --git a/src/burn/drv/pst90s/d_suna16.cpp b/src/burn/drv/pst90s/d_suna16.cpp index 8f63c7406..bbdba4d3d 100644 --- a/src/burn/drv/pst90s/d_suna16.cpp +++ b/src/burn/drv/pst90s/d_suna16.cpp @@ -1467,16 +1467,16 @@ static INT32 BestbestInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KROM, 0x040000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KROM, 0x080000, 0x0bffff, MAP_ROM); - SekMapMemory(Drv68KROM, 0x0c0000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KROM + 0x100000, 0x200000, 0x2fffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x540000, 0x540fff, MAP_ROM); - SekMapMemory(DrvPalRAM2, 0x541000, 0x54ffff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x580000, 0x58ffff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x5c0000, 0x5dffff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0x5e0000, 0x5fffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KROM, 0x040000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KROM, 0x080000, 0x0bffff, SM_ROM); + SekMapMemory(Drv68KROM, 0x0c0000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KROM + 0x100000, 0x200000, 0x2fffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x540000, 0x540fff, SM_ROM); + SekMapMemory(DrvPalRAM2, 0x541000, 0x54ffff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x580000, 0x58ffff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x5c0000, 0x5dffff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0x5e0000, 0x5fffff, SM_RAM); SekSetWriteByteHandler(0, bestbest_write_byte); SekSetWriteWordHandler(0, bestbest_write_word); SekSetReadByteHandler(0, bestbest_read_byte); @@ -1544,10 +1544,10 @@ static INT32 SunaqInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvPalRAM2, 0x540400, 0x540fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x580000, 0x583fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x5c0000, 0x5dffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvPalRAM2, 0x540400, 0x540fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x580000, 0x583fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x5c0000, 0x5dffff, SM_RAM); SekSetWriteByteHandler(0, sunaq_write_byte); SekSetWriteWordHandler(0, sunaq_write_word); SekSetReadByteHandler(0, sunaq_read_byte); @@ -1609,11 +1609,11 @@ static INT32 UballoonInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvPalRAM2, 0x200400, 0x200fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x400000, 0x41ffff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x5c0000, 0x5dffff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x800000, 0x803fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvPalRAM2, 0x200400, 0x200fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x400000, 0x41ffff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x5c0000, 0x5dffff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x800000, 0x803fff, SM_RAM); SekSetWriteByteHandler(0, uballoon_write_byte); SekSetWriteWordHandler(0, uballoon_write_word); SekSetReadByteHandler(0, uballoon_read_byte); @@ -1674,10 +1674,10 @@ static INT32 BssoccerInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x203fff, MAP_RAM); - SekMapMemory(DrvPalRAM2, 0x400400, 0x400fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0x600000, 0x61ffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x203fff, SM_RAM); + SekMapMemory(DrvPalRAM2, 0x400400, 0x400fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0x600000, 0x61ffff, SM_RAM); SekSetWriteByteHandler(0, bssoccer_write_byte); SekSetWriteWordHandler(0, bssoccer_write_word); SekSetReadByteHandler(0, bssoccer_read_byte); diff --git a/src/burn/drv/pst90s/d_taotaido.cpp b/src/burn/drv/pst90s/d_taotaido.cpp index 7159931e6..189f2b1f6 100644 --- a/src/burn/drv/pst90s/d_taotaido.cpp +++ b/src/burn/drv/pst90s/d_taotaido.cpp @@ -700,13 +700,13 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvBgRAM, 0x800000, 0x803fff, MAP_RAM); - SekMapMemory(DrvSprRAM0, 0xa00000, 0xa01fff, MAP_RAM); - SekMapMemory(DrvSprRAM1, 0xc00000, 0xc0ffff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xfe0000, 0xfeffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xffc000, 0xffcfff, MAP_ROM); - SekMapMemory(DrvScrollRAM, 0xffe000, 0xffe3ff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvBgRAM, 0x800000, 0x803fff, SM_RAM); + SekMapMemory(DrvSprRAM0, 0xa00000, 0xa01fff, SM_RAM); + SekMapMemory(DrvSprRAM1, 0xc00000, 0xc0ffff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xfe0000, 0xfeffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xffc000, 0xffcfff, SM_ROM); + SekMapMemory(DrvScrollRAM, 0xffe000, 0xffe3ff, SM_RAM); SekSetWriteByteHandler(0, taotaido_write_byte); SekSetWriteWordHandler(0, taotaido_write_word); SekSetReadByteHandler(0, taotaido_read_byte); diff --git a/src/burn/drv/pst90s/d_tecmosys.cpp b/src/burn/drv/pst90s/d_tecmosys.cpp index 2426c3327..b12c27c80 100644 --- a/src/burn/drv/pst90s/d_tecmosys.cpp +++ b/src/burn/drv/pst90s/d_tecmosys.cpp @@ -622,24 +622,24 @@ static INT32 CommonInit(INT32 (*pRomLoadCallback)(), INT32 spritelen, INT32 sndl SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(DrvBgRAM0, 0x300000, 0x300fff, MAP_RAM); - SekMapMemory(DrvBgScrRAM0, 0x301000, 0x3013ff, MAP_RAM); - SekMapMemory(DrvBgRAM1, 0x400000, 0x400fff, MAP_RAM); - SekMapMemory(DrvBgScrRAM1, 0x401000, 0x4013ff, MAP_RAM); - SekMapMemory(DrvBgRAM2, 0x500000, 0x500fff, MAP_RAM); - SekMapMemory(DrvBgScrRAM2, 0x501000, 0x5013ff, MAP_RAM); - SekMapMemory(DrvTxtRAM, 0x700000, 0x703fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x800000, 0x80ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x900000, 0x907fff, MAP_ROM); - SekMapMemory(DrvPalRAM + 0x8000,0x980000, 0x980fff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(DrvBgRAM0, 0x300000, 0x300fff, SM_RAM); + SekMapMemory(DrvBgScrRAM0, 0x301000, 0x3013ff, SM_RAM); + SekMapMemory(DrvBgRAM1, 0x400000, 0x400fff, SM_RAM); + SekMapMemory(DrvBgScrRAM1, 0x401000, 0x4013ff, SM_RAM); + SekMapMemory(DrvBgRAM2, 0x500000, 0x500fff, SM_RAM); + SekMapMemory(DrvBgScrRAM2, 0x501000, 0x5013ff, SM_RAM); + SekMapMemory(DrvTxtRAM, 0x700000, 0x703fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x800000, 0x80ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x900000, 0x907fff, SM_ROM); + SekMapMemory(DrvPalRAM + 0x8000,0x980000, 0x980fff, SM_ROM); SekSetWriteWordHandler(0, tecmosys_main_write_word); SekSetWriteByteHandler(0, tecmosys_main_write_byte); SekSetReadWordHandler(0, tecmosys_main_read_word); SekSetReadByteHandler(0, tecmosys_main_read_byte); - SekMapHandler(1, 0x900000, 0x980fff, MAP_WRITE); + SekMapHandler(1, 0x900000, 0x980fff, SM_WRITE); SekSetWriteWordHandler(1, tecmosys_palette_write_word); SekSetWriteByteHandler(1, tecmosys_palette_write_byte); SekClose(); diff --git a/src/burn/drv/pst90s/d_tetrisp2.cpp b/src/burn/drv/pst90s/d_tetrisp2.cpp index 569ef148d..6e254a482 100644 --- a/src/burn/drv/pst90s/d_tetrisp2.cpp +++ b/src/burn/drv/pst90s/d_tetrisp2.cpp @@ -664,17 +664,17 @@ static int Tetrisp2Init() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x104000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x300000, 0x31ffff, MAP_ROM); // palette - SekMapMemory(DrvVFgRAM, 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(DrvVBgRAM, 0x404000, 0x409fff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x500000, 0x50ffff, MAP_RAM); - SekMapMemory(DrvRotRAM, 0x600000, 0x60ffff, MAP_RAM); - SekMapMemory(DrvRotRAM, 0x650000, 0x651fff, MAP_RAM); // mirror - SekMapMemory(DrvNvRAM, 0x900000, 0x903fff, MAP_ROM); // handler - SekMapMemory(DrvNvRAM, 0x904000, 0x907fff, MAP_ROM); // handler + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x104000, 0x10ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x300000, 0x31ffff, SM_ROM); // palette + SekMapMemory(DrvVFgRAM, 0x400000, 0x403fff, SM_RAM); + SekMapMemory(DrvVBgRAM, 0x404000, 0x409fff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x500000, 0x50ffff, SM_RAM); + SekMapMemory(DrvRotRAM, 0x600000, 0x60ffff, SM_RAM); + SekMapMemory(DrvRotRAM, 0x650000, 0x651fff, SM_RAM); // mirror + SekMapMemory(DrvNvRAM, 0x900000, 0x903fff, SM_ROM); // handler + SekMapMemory(DrvNvRAM, 0x904000, 0x907fff, SM_ROM); // handler SekSetWriteWordHandler(0, tetrisp2_write_word); SekSetWriteByteHandler(0, tetrisp2_write_byte); SekSetReadWordHandler(0, tetrisp2_read_word); @@ -744,16 +744,16 @@ static int RocknInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x104000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x300000, 0x31ffff, MAP_ROM); // palette - SekMapMemory(DrvVFgRAM, 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(DrvVBgRAM, 0x404000, 0x409fff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x500000, 0x50ffff, MAP_RAM); - SekMapMemory(DrvRotRAM, 0x600000, 0x60ffff, MAP_RAM); - SekMapMemory(DrvRotRAM, 0x650000, 0x651fff, MAP_RAM); // mirror - SekMapMemory(DrvNvRAM, 0x900000, 0x903fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x104000, 0x10ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x300000, 0x31ffff, SM_ROM); // palette + SekMapMemory(DrvVFgRAM, 0x400000, 0x403fff, SM_RAM); + SekMapMemory(DrvVBgRAM, 0x404000, 0x409fff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x500000, 0x50ffff, SM_RAM); + SekMapMemory(DrvRotRAM, 0x600000, 0x60ffff, SM_RAM); + SekMapMemory(DrvRotRAM, 0x650000, 0x651fff, SM_RAM); // mirror + SekMapMemory(DrvNvRAM, 0x900000, 0x903fff, SM_RAM); SekSetWriteWordHandler(0, tetrisp2_write_word); SekSetWriteByteHandler(0, tetrisp2_write_byte); SekSetReadWordHandler(0, tetrisp2_read_word); @@ -806,17 +806,17 @@ static int NndmsealInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x104000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x300000, 0x31ffff, MAP_ROM); // palette - SekMapMemory(DrvVFgRAM, 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(DrvVBgRAM, 0x404000, 0x409fff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x500000, 0x50ffff, MAP_RAM); - SekMapMemory(DrvRotRAM, 0x600000, 0x60ffff, MAP_RAM); - SekMapMemory(DrvRotRAM, 0x650000, 0x651fff, MAP_RAM); // mirror - SekMapMemory(DrvNvRAM, 0x900000, 0x903fff, MAP_ROM); // handler - SekMapMemory(DrvNvRAM, 0x904000, 0x907fff, MAP_ROM); // handler + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x104000, 0x10ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x300000, 0x31ffff, SM_ROM); // palette + SekMapMemory(DrvVFgRAM, 0x400000, 0x403fff, SM_RAM); + SekMapMemory(DrvVBgRAM, 0x404000, 0x409fff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x500000, 0x50ffff, SM_RAM); + SekMapMemory(DrvRotRAM, 0x600000, 0x60ffff, SM_RAM); + SekMapMemory(DrvRotRAM, 0x650000, 0x651fff, SM_RAM); // mirror + SekMapMemory(DrvNvRAM, 0x900000, 0x903fff, SM_ROM); // handler + SekMapMemory(DrvNvRAM, 0x904000, 0x907fff, SM_ROM); // handler SekSetWriteWordHandler(0, tetrisp2_write_word); SekSetWriteByteHandler(0, tetrisp2_write_byte); SekSetReadWordHandler(0, tetrisp2_read_word); @@ -864,17 +864,17 @@ static int NndmsealaInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x104000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x300000, 0x31ffff, MAP_ROM); // palette - SekMapMemory(DrvVFgRAM, 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(DrvVBgRAM, 0x404000, 0x409fff, MAP_RAM); - SekMapMemory(Drv68KRAM1, 0x500000, 0x50ffff, MAP_RAM); - SekMapMemory(DrvRotRAM, 0x600000, 0x60ffff, MAP_RAM); - SekMapMemory(DrvRotRAM, 0x650000, 0x651fff, MAP_RAM); // mirror - SekMapMemory(DrvNvRAM, 0x900000, 0x903fff, MAP_ROM); // handler - SekMapMemory(DrvNvRAM, 0x904000, 0x907fff, MAP_ROM); // handler + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x104000, 0x10ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x300000, 0x31ffff, SM_ROM); // palette + SekMapMemory(DrvVFgRAM, 0x400000, 0x403fff, SM_RAM); + SekMapMemory(DrvVBgRAM, 0x404000, 0x409fff, SM_RAM); + SekMapMemory(Drv68KRAM1, 0x500000, 0x50ffff, SM_RAM); + SekMapMemory(DrvRotRAM, 0x600000, 0x60ffff, SM_RAM); + SekMapMemory(DrvRotRAM, 0x650000, 0x651fff, SM_RAM); // mirror + SekMapMemory(DrvNvRAM, 0x900000, 0x903fff, SM_ROM); // handler + SekMapMemory(DrvNvRAM, 0x904000, 0x907fff, SM_ROM); // handler SekSetWriteWordHandler(0, tetrisp2_write_word); SekSetWriteByteHandler(0, tetrisp2_write_byte); SekSetReadWordHandler(0, tetrisp2_read_word); @@ -934,16 +934,16 @@ static int Rockn2CommonInit(INT32 nSoundRoms) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvSprRAM, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(Drv68KRAM0, 0x104000, 0x10ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x300000, 0x31ffff, MAP_ROM); // palette - SekMapMemory(Drv68KRAM1, 0x500000, 0x50ffff, MAP_RAM); - SekMapMemory(DrvRotRAM, 0x600000, 0x60ffff, MAP_RAM); - SekMapMemory(DrvRotRAM, 0x650000, 0x651fff, MAP_RAM); // mirror - SekMapMemory(DrvVFgRAM, 0x800000, 0x803fff, MAP_RAM); - SekMapMemory(DrvVBgRAM, 0x804000, 0x809fff, MAP_RAM); - SekMapMemory(DrvNvRAM, 0x900000, 0x903fff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvSprRAM, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(Drv68KRAM0, 0x104000, 0x10ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x300000, 0x31ffff, SM_ROM); // palette + SekMapMemory(Drv68KRAM1, 0x500000, 0x50ffff, SM_RAM); + SekMapMemory(DrvRotRAM, 0x600000, 0x60ffff, SM_RAM); + SekMapMemory(DrvRotRAM, 0x650000, 0x651fff, SM_RAM); // mirror + SekMapMemory(DrvVFgRAM, 0x800000, 0x803fff, SM_RAM); + SekMapMemory(DrvVBgRAM, 0x804000, 0x809fff, SM_RAM); + SekMapMemory(DrvNvRAM, 0x900000, 0x903fff, SM_RAM); SekSetWriteWordHandler(0, tetrisp2_write_word); SekSetWriteByteHandler(0, tetrisp2_write_byte); SekSetReadWordHandler(0, tetrisp2_read_word); diff --git a/src/burn/drv/pst90s/d_tumbleb.cpp b/src/burn/drv/pst90s/d_tumbleb.cpp index 39237eb86..ffea1e3a0 100644 --- a/src/burn/drv/pst90s/d_tumbleb.cpp +++ b/src/burn/drv/pst90s/d_tumbleb.cpp @@ -1925,7 +1925,7 @@ void __fastcall Tumbleb68KWriteWord(UINT32 a, UINT16 d) if (Jumpkids) { DrvSoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); return; } else { @@ -2876,13 +2876,13 @@ static void TumblebMap68k() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x120000, 0x123fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x1407ff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x160000, 0x1607ff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x4000 , 0x1a0000, 0x1a07ff, MAP_RAM); - SekMapMemory(DrvPf1Ram , 0x320000, 0x320fff, MAP_RAM); - SekMapMemory(DrvPf2Ram , 0x322000, 0x322fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x120000, 0x123fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x1407ff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x160000, 0x1607ff, SM_RAM); + SekMapMemory(Drv68KRam + 0x4000 , 0x1a0000, 0x1a07ff, SM_RAM); + SekMapMemory(DrvPf1Ram , 0x320000, 0x320fff, SM_RAM); + SekMapMemory(DrvPf2Ram , 0x322000, 0x322fff, SM_RAM); SekSetReadWordHandler(0, Tumbleb68KReadWord); SekSetWriteWordHandler(0, Tumbleb68KWriteWord); SekSetReadByteHandler(0, Tumbleb68KReadByte); @@ -2895,13 +2895,13 @@ static void PangpangMap68k() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x120000, 0x123fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x1407ff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x160000, 0x1607ff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x4000 , 0x1a0000, 0x1a07ff, MAP_RAM); - SekMapMemory(DrvPf1Ram , 0x320000, 0x321fff, MAP_RAM); - SekMapMemory(DrvPf2Ram , 0x340000, 0x341fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x120000, 0x123fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x1407ff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x160000, 0x1607ff, SM_RAM); + SekMapMemory(Drv68KRam + 0x4000 , 0x1a0000, 0x1a07ff, SM_RAM); + SekMapMemory(DrvPf1Ram , 0x320000, 0x321fff, SM_RAM); + SekMapMemory(DrvPf2Ram , 0x340000, 0x341fff, SM_RAM); SekSetReadWordHandler(0, Tumbleb68KReadWord); SekSetWriteWordHandler(0, Tumbleb68KWriteWord); SekSetReadByteHandler(0, Tumbleb68KReadByte); @@ -2914,12 +2914,12 @@ static void SuprtrioMap68k() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvSpriteRam , 0x700000, 0x7007ff, MAP_RAM); - SekMapMemory(DrvPf1Ram , 0xa20000, 0xa20fff, MAP_RAM); - SekMapMemory(DrvPf2Ram , 0xa22000, 0xa22fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0xcf0000, 0xcf05ff, MAP_RAM); - SekMapMemory(Drv68KRam , 0xf00000, 0xf07fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvSpriteRam , 0x700000, 0x7007ff, SM_RAM); + SekMapMemory(DrvPf1Ram , 0xa20000, 0xa20fff, SM_RAM); + SekMapMemory(DrvPf2Ram , 0xa22000, 0xa22fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0xcf0000, 0xcf05ff, SM_RAM); + SekMapMemory(Drv68KRam , 0xf00000, 0xf07fff, SM_RAM); SekSetReadWordHandler(0, Suprtrio68KReadWord); SekSetWriteWordHandler(0, Suprtrio68KWriteWord); SekClose(); @@ -2930,14 +2930,14 @@ static void HtchctchMap68k() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x120000, 0x123fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x1407ff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x160000, 0x160fff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x4000 , 0x1a0000, 0x1a0fff, MAP_RAM); - SekMapMemory(DrvPf1Ram , 0x320000, 0x321fff, MAP_RAM); - SekMapMemory(DrvPf2Ram , 0x322000, 0x322fff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x5000 , 0x341000, 0x342fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x120000, 0x123fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x1407ff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x160000, 0x160fff, SM_RAM); + SekMapMemory(Drv68KRam + 0x4000 , 0x1a0000, 0x1a0fff, SM_RAM); + SekMapMemory(DrvPf1Ram , 0x320000, 0x321fff, SM_RAM); + SekMapMemory(DrvPf2Ram , 0x322000, 0x322fff, SM_RAM); + SekMapMemory(Drv68KRam + 0x5000 , 0x341000, 0x342fff, SM_RAM); SekSetReadWordHandler(0, Tumbleb68KReadWord); SekSetWriteWordHandler(0, Tumbleb68KWriteWord); SekSetReadByteHandler(0, Tumbleb68KReadByte); @@ -2950,12 +2950,12 @@ static void FncywldMap68k() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x140fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x160000, 0x1607ff, MAP_RAM); - SekMapMemory(DrvPf1Ram , 0x320000, 0x321fff, MAP_RAM); - SekMapMemory(DrvPf2Ram , 0x322000, 0x323fff, MAP_RAM); - SekMapMemory(Drv68KRam , 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x140fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x160000, 0x1607ff, SM_RAM); + SekMapMemory(DrvPf1Ram , 0x320000, 0x321fff, SM_RAM); + SekMapMemory(DrvPf2Ram , 0x322000, 0x323fff, SM_RAM); + SekMapMemory(Drv68KRam , 0xff0000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, Fncywld68KReadWord); SekSetWriteWordHandler(0, Fncywld68KWriteWord); SekSetReadByteHandler(0, Fncywld68KReadByte); @@ -3489,13 +3489,13 @@ static INT32 JumppopInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Drv68KRam , 0x120000, 0x123fff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x140000, 0x1407ff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x160000, 0x160fff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x4000 , 0x1a0000, 0x1a7fff, MAP_RAM); - SekMapMemory(DrvPf1Ram , 0x320000, 0x323fff, MAP_RAM); - SekMapMemory(DrvPf2Ram , 0x300000, 0x303fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Drv68KRam , 0x120000, 0x123fff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x140000, 0x1407ff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x160000, 0x160fff, SM_RAM); + SekMapMemory(Drv68KRam + 0x4000 , 0x1a0000, 0x1a7fff, SM_RAM); + SekMapMemory(DrvPf1Ram , 0x320000, 0x323fff, SM_RAM); + SekMapMemory(DrvPf2Ram , 0x300000, 0x303fff, SM_RAM); SekSetReadWordHandler(0, Jumppop68KReadWord); SekSetWriteWordHandler(0, Jumppop68KWriteWord); SekClose(); diff --git a/src/burn/drv/pst90s/d_unico.cpp b/src/burn/drv/pst90s/d_unico.cpp index f6e645dc5..973601bcf 100644 --- a/src/burn/drv/pst90s/d_unico.cpp +++ b/src/burn/drv/pst90s/d_unico.cpp @@ -1103,14 +1103,14 @@ static INT32 BurglarxInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvVideo1Ram , 0x904000, 0x907fff, MAP_RAM); - SekMapMemory(DrvVideo2Ram , 0x908000, 0x90bfff, MAP_RAM); - SekMapMemory(DrvVideo0Ram , 0x90c000, 0x90ffff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x10000 , 0x920000, 0x923fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x930000, 0x9307ff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x940000, 0x947fff, MAP_RAM); - SekMapMemory(Drv68KRam , 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvVideo1Ram , 0x904000, 0x907fff, SM_RAM); + SekMapMemory(DrvVideo2Ram , 0x908000, 0x90bfff, SM_RAM); + SekMapMemory(DrvVideo0Ram , 0x90c000, 0x90ffff, SM_RAM); + SekMapMemory(Drv68KRam + 0x10000 , 0x920000, 0x923fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x930000, 0x9307ff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x940000, 0x947fff, SM_RAM); + SekMapMemory(Drv68KRam , 0xff0000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, Burglarx68KReadWord); SekSetWriteWordHandler(0, Burglarx68KWriteWord); SekSetReadByteHandler(0, Burglarx68KReadByte); @@ -1186,14 +1186,14 @@ static INT32 ZeropntInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvVideo1Ram , 0x904000, 0x907fff, MAP_RAM); - SekMapMemory(DrvVideo2Ram , 0x908000, 0x90bfff, MAP_RAM); - SekMapMemory(DrvVideo0Ram , 0x90c000, 0x90ffff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x10000 , 0x920000, 0x923fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x930000, 0x9307ff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x940000, 0x947fff, MAP_RAM); - SekMapMemory(Drv68KRam , 0xef0000, 0xefffff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvVideo1Ram , 0x904000, 0x907fff, SM_RAM); + SekMapMemory(DrvVideo2Ram , 0x908000, 0x90bfff, SM_RAM); + SekMapMemory(DrvVideo0Ram , 0x90c000, 0x90ffff, SM_RAM); + SekMapMemory(Drv68KRam + 0x10000 , 0x920000, 0x923fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x930000, 0x9307ff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x940000, 0x947fff, SM_RAM); + SekMapMemory(Drv68KRam , 0xef0000, 0xefffff, SM_RAM); SekSetReadWordHandler(0, Zeropnt68KReadWord); SekSetWriteWordHandler(0, Zeropnt68KWriteWord); SekSetReadByteHandler(0, Zeropnt68KReadByte); @@ -1291,14 +1291,14 @@ static INT32 Zeropnt2Init() // Setup the 68000 emulation SekInit(0, 0x68EC020); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(DrvVideo1Ram , 0x904000, 0x907fff, MAP_RAM); - SekMapMemory(DrvVideo2Ram , 0x908000, 0x90bfff, MAP_RAM); - SekMapMemory(DrvVideo0Ram , 0x90c000, 0x90ffff, MAP_RAM); - SekMapMemory(Drv68KRam + 0x10000 , 0x920000, 0x923fff, MAP_RAM); - SekMapMemory(DrvSpriteRam , 0x930000, 0x9307ff, MAP_RAM); - SekMapMemory(DrvPaletteRam , 0x940000, 0x947fff, MAP_RAM); - SekMapMemory(Drv68KRam , 0xfe0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(DrvVideo1Ram , 0x904000, 0x907fff, SM_RAM); + SekMapMemory(DrvVideo2Ram , 0x908000, 0x90bfff, SM_RAM); + SekMapMemory(DrvVideo0Ram , 0x90c000, 0x90ffff, SM_RAM); + SekMapMemory(Drv68KRam + 0x10000 , 0x920000, 0x923fff, SM_RAM); + SekMapMemory(DrvSpriteRam , 0x930000, 0x9307ff, SM_RAM); + SekMapMemory(DrvPaletteRam , 0x940000, 0x947fff, SM_RAM); + SekMapMemory(Drv68KRam , 0xfe0000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, Zeropnt268KReadWord); SekSetWriteWordHandler(0, Zeropnt268KWriteWord); SekSetReadByteHandler(0, Zeropnt268KReadByte); diff --git a/src/burn/drv/pst90s/d_vmetal.cpp b/src/burn/drv/pst90s/d_vmetal.cpp index 8f2cf1c0e..cccdb1d13 100644 --- a/src/burn/drv/pst90s/d_vmetal.cpp +++ b/src/burn/drv/pst90s/d_vmetal.cpp @@ -328,21 +328,21 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(DrvTXTRAM, 0x100000, 0x11ffff, MAP_RAM); - SekMapMemory(DrvMD1RAM, 0x120000, 0x13ffff, MAP_RAM); - SekMapMemory(DrvMD2RAM, 0x140000, 0x15ffff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x170000, 0x173fff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x174000, 0x177fff, MAP_RAM); - SekMapMemory(DrvTLUTRAM, 0x178000, 0x1787ff, MAP_RAM); - SekMapMemory(DrvVidRegs, 0x178800, 0x1797ff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(DrvTXTRAM, 0x100000, 0x11ffff, SM_RAM); + SekMapMemory(DrvMD1RAM, 0x120000, 0x13ffff, SM_RAM); + SekMapMemory(DrvMD2RAM, 0x140000, 0x15ffff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x170000, 0x173fff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x174000, 0x177fff, SM_RAM); + SekMapMemory(DrvTLUTRAM, 0x178000, 0x1787ff, SM_RAM); + SekMapMemory(DrvVidRegs, 0x178800, 0x1797ff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, SM_RAM); SekSetWriteByteHandler(0, vmetal_write_byte); SekSetWriteWordHandler(0, vmetal_write_word); SekSetReadByteHandler(0, vmetal_read_byte); SekSetReadWordHandler(0, vmetal_read_word); - SekMapHandler(1, 0x170000, 0x173fff, MAP_WRITE); + SekMapHandler(1, 0x170000, 0x173fff, SM_WRITE); SekSetWriteByteHandler(1, vmetal_palette_write_byte); SekSetWriteWordHandler(1, vmetal_palette_write_word); SekClose(); diff --git a/src/burn/drv/pst90s/d_welltris.cpp b/src/burn/drv/pst90s/d_welltris.cpp index 9fd6000e7..682739a06 100644 --- a/src/burn/drv/pst90s/d_welltris.cpp +++ b/src/burn/drv/pst90s/d_welltris.cpp @@ -558,13 +558,13 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM + 0x000000, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Drv68KROM + 0x100000, 0x100000, 0x17ffff, MAP_ROM); - SekMapMemory(DrvPxlRAM, 0x800000, 0x81ffff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xff8000, 0xffbfff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0xffc000, 0xffc3ff, MAP_ROM); - SekMapMemory(DrvVidRAM, 0xffd000, 0xffdfff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0xffe000, 0xffefff, MAP_ROM); + SekMapMemory(Drv68KROM + 0x000000, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Drv68KROM + 0x100000, 0x100000, 0x17ffff, SM_ROM); + SekMapMemory(DrvPxlRAM, 0x800000, 0x81ffff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xff8000, 0xffbfff, SM_RAM); + SekMapMemory(DrvSprRAM, 0xffc000, 0xffc3ff, SM_ROM); + SekMapMemory(DrvVidRAM, 0xffd000, 0xffdfff, SM_RAM); + SekMapMemory(DrvPalRAM, 0xffe000, 0xffefff, SM_ROM); SekSetWriteByteHandler(0, welltris_main_write_byte); SekSetWriteWordHandler(0, welltris_main_write_word); SekSetReadByteHandler(0, welltris_main_read_byte); diff --git a/src/burn/drv/pst90s/d_wwfwfest.cpp b/src/burn/drv/pst90s/d_wwfwfest.cpp index 62a7a1e2d..bd6dc0062 100644 --- a/src/burn/drv/pst90s/d_wwfwfest.cpp +++ b/src/burn/drv/pst90s/d_wwfwfest.cpp @@ -703,12 +703,12 @@ static INT32 DrvInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvBg0VideoRam , 0x080000, 0x080fff, MAP_RAM); - SekMapMemory(DrvBg1VideoRam , 0x082000, 0x082fff, MAP_RAM); - SekMapMemory(DrvCharVideoRam , 0x0c0000, 0x0c1fff, MAP_ROM); - SekMapMemory(DrvSpriteRam , 0x0c2000, 0x0c3fff, MAP_RAM); - SekMapMemory(Drv68KRam , 0x1c0000, 0x1c3fff, MAP_RAM); + SekMapMemory(Drv68KRom , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvBg0VideoRam , 0x080000, 0x080fff, SM_RAM); + SekMapMemory(DrvBg1VideoRam , 0x082000, 0x082fff, SM_RAM); + SekMapMemory(DrvCharVideoRam , 0x0c0000, 0x0c1fff, SM_ROM); + SekMapMemory(DrvSpriteRam , 0x0c2000, 0x0c3fff, SM_RAM); + SekMapMemory(Drv68KRam , 0x1c0000, 0x1c3fff, SM_RAM); SekSetReadWordHandler(0, Wwfwfest68KReadWord); SekSetWriteWordHandler(0, Wwfwfest68KWriteWord); SekSetReadByteHandler(0, Wwfwfest68KReadByte); diff --git a/src/burn/drv/pst90s/d_xorworld.cpp b/src/burn/drv/pst90s/d_xorworld.cpp index 7ce0c8623..4d35bcb5e 100644 --- a/src/burn/drv/pst90s/d_xorworld.cpp +++ b/src/burn/drv/pst90s/d_xorworld.cpp @@ -261,9 +261,9 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(DrvVidRAM, 0xffc000, 0xffc7ff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0xffc800, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(DrvVidRAM, 0xffc000, 0xffc7ff, SM_RAM); + SekMapMemory(DrvSprRAM, 0xffc800, 0xffffff, SM_RAM); SekSetWriteByteHandler(0, xorworld_write_byte); SekSetReadByteHandler(0, xorworld_read_byte); SekClose(); diff --git a/src/burn/drv/pst90s/d_yunsun16.cpp b/src/burn/drv/pst90s/d_yunsun16.cpp index 3db202fb6..f2884408b 100644 --- a/src/burn/drv/pst90s/d_yunsun16.cpp +++ b/src/burn/drv/pst90s/d_yunsun16.cpp @@ -658,12 +658,12 @@ static INT32 DrvInit(INT32 game_select) SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x900000, 0x903fff, MAP_RAM); - SekMapMemory(DrvVidRAM1, 0x908000, 0x90bfff, MAP_RAM); - SekMapMemory(DrvVidRAM0, 0x90c000, 0x90ffff, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x910000, 0x910fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x900000, 0x903fff, SM_RAM); + SekMapMemory(DrvVidRAM1, 0x908000, 0x90bfff, SM_RAM); + SekMapMemory(DrvVidRAM0, 0x90c000, 0x90ffff, SM_RAM); + SekMapMemory(DrvSprRAM, 0x910000, 0x910fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0xff0000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, magicbub_main_write_word); SekSetWriteByteHandler(0, magicbub_main_write_byte); SekSetReadWordHandler(0, magicbub_main_read_word); diff --git a/src/burn/drv/pst90s/d_zerozone.cpp b/src/burn/drv/pst90s/d_zerozone.cpp index 6e0b8f444..9d69fc27f 100644 --- a/src/burn/drv/pst90s/d_zerozone.cpp +++ b/src/burn/drv/pst90s/d_zerozone.cpp @@ -185,7 +185,7 @@ void __fastcall zerozone_write_word(UINT32 address, UINT16 data) { case 0x84000: soundlatch = data >> 8; - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0xff); return; case 0xb4000: @@ -202,7 +202,7 @@ void __fastcall zerozone_write_byte(UINT32 address, UINT8 data) { case 0x84000: soundlatch = data; - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0xff); return; case 0xb4001: @@ -333,10 +333,10 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x088000, 0x0881ff, MAP_ROM); - SekMapMemory(DrvVidRAM, 0x09ce00, 0x09ffff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x0c0000, 0x0cffff, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(DrvPalRAM, 0x088000, 0x0881ff, SM_ROM); + SekMapMemory(DrvVidRAM, 0x09ce00, 0x09ffff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x0c0000, 0x0cffff, SM_RAM); SekSetWriteByteHandler(0, zerozone_write_byte); SekSetWriteWordHandler(0, zerozone_write_word); SekSetReadByteHandler(0, zerozone_read_byte); diff --git a/src/burn/drv/sega/d_angelkds.cpp b/src/burn/drv/sega/d_angelkds.cpp index 8d5dfdd29..ea0a0bf66 100644 --- a/src/burn/drv/sega/d_angelkds.cpp +++ b/src/burn/drv/sega/d_angelkds.cpp @@ -867,7 +867,7 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetRaiseIrq(0); ZetClose(); ZetOpen(1); diff --git a/src/burn/drv/sega/d_dotrikun.cpp b/src/burn/drv/sega/d_dotrikun.cpp index 71907cfff..8131c127f 100644 --- a/src/burn/drv/sega/d_dotrikun.cpp +++ b/src/burn/drv/sega/d_dotrikun.cpp @@ -177,7 +177,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(4000000 / 60); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); if (pBurnDraw) { diff --git a/src/burn/drv/sega/d_hangon.cpp b/src/burn/drv/sega/d_hangon.cpp index 77b326ff1..7de2c8c8e 100644 --- a/src/burn/drv/sega/d_hangon.cpp +++ b/src/burn/drv/sega/d_hangon.cpp @@ -1237,15 +1237,15 @@ void SharrierMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x03ffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x03ffff, MAP_FETCH); - SekMapMemory(System16Ram , 0x040000, 0x043fff, MAP_RAM); - SekMapMemory(System16TileRam , 0x100000, 0x107fff, MAP_READ); - SekMapMemory(System16TextRam , 0x108000, 0x108fff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x110000, 0x110fff, MAP_RAM); - SekMapMemory(System16ExtraRam , 0x124000, 0x127fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x130000, 0x130fff, MAP_RAM); - SekMapMemory(System16RoadRam , 0xc68000, 0xc68fff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x03ffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x03ffff, SM_FETCH); + SekMapMemory(System16Ram , 0x040000, 0x043fff, SM_RAM); + SekMapMemory(System16TileRam , 0x100000, 0x107fff, SM_READ); + SekMapMemory(System16TextRam , 0x108000, 0x108fff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x110000, 0x110fff, SM_RAM); + SekMapMemory(System16ExtraRam , 0x124000, 0x127fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x130000, 0x130fff, SM_RAM); + SekMapMemory(System16RoadRam , 0xc68000, 0xc68fff, SM_RAM); SekSetReadWordHandler(0, SharrierReadWord); SekSetReadByteHandler(0, SharrierReadByte); diff --git a/src/burn/drv/sega/d_suprloco.cpp b/src/burn/drv/sega/d_suprloco.cpp index e54a8bc37..e90a5b9c4 100644 --- a/src/burn/drv/sega/d_suprloco.cpp +++ b/src/burn/drv/sega/d_suprloco.cpp @@ -599,12 +599,12 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nCyclesSegment); - if (i == 99) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == 99) ZetRaiseIrq(0); ZetClose(); ZetOpen(1); nCyclesDone[1] += ZetRun(nCyclesSegment); - if (i == 24 || i == 49 || i == 74 || i == 99) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == 24 || i == 49 || i == 74 || i == 99) ZetRaiseIrq(0); ZetClose(); } diff --git a/src/burn/drv/sega/d_sys1.cpp b/src/burn/drv/sega/d_sys1.cpp index 9b93eb645..b60eefd4b 100644 --- a/src/burn/drv/sega/d_sys1.cpp +++ b/src/burn/drv/sega/d_sys1.cpp @@ -5237,7 +5237,7 @@ INT32 System1Frame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 9) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == 9) ZetRaiseIrq(0); ZetClose(); nCurrentCPU = 1; @@ -5246,7 +5246,7 @@ INT32 System1Frame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 2 || i == 4 || i == 6 || i == 8) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == 2 || i == 4 || i == 6 || i == 8) ZetRaiseIrq(0); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/sega/d_sys16b.cpp b/src/burn/drv/sega/d_sys16b.cpp index fdf8aab58..848de8239 100644 --- a/src/burn/drv/sega/d_sys16b.cpp +++ b/src/burn/drv/sega/d_sys16b.cpp @@ -6511,7 +6511,7 @@ static INT32 AliensynInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xc00006, 0xc00007, MAP_WRITE); + SekMapHandler(1, 0xc00006, 0xc00007, SM_WRITE); SekSetWriteByteHandler(1, AliensynWriteByte); SekClose(); AlienSyndrome = true; @@ -6526,7 +6526,7 @@ static INT32 Aliensyn3Init() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xc00006, 0xc00007, MAP_WRITE); + SekMapHandler(1, 0xc00006, 0xc00007, SM_WRITE); SekSetWriteByteHandler(1, AliensynWriteByte); SekClose(); AlienSyndrome = true; @@ -6723,9 +6723,9 @@ static INT32 AltbeastblInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0x418000, 0x418031, MAP_WRITE); + SekMapHandler(1, 0x418000, 0x418031, SM_WRITE); SekSetWriteWordHandler(1, AltbeastblGfxWriteWord); - SekMapHandler(2, 0xc42006, 0xc42007, MAP_WRITE); + SekMapHandler(2, 0xc42006, 0xc42007, SM_WRITE); SekSetWriteByteHandler(2, AltbeastblSoundWriteByte); SekClose(); @@ -6739,12 +6739,12 @@ void AtomicpMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x01ffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x01ffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x01ffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x01ffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, System16BWriteWord); SekSetReadByteHandler(0, AtomicpReadByte); SekSetWriteByteHandler(0, AtomicpWriteByte); @@ -6771,7 +6771,7 @@ static INT32 AurailInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xfc0000, 0xfc0003, MAP_WRITE); + SekMapHandler(1, 0xfc0000, 0xfc0003, SM_WRITE); SekSetWriteByteHandler(1, AurailWriteByte); SekClose(); } @@ -6787,7 +6787,7 @@ static INT32 Aurail1Init() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xfc0000, 0xfc0003, MAP_WRITE); + SekMapHandler(1, 0xfc0000, 0xfc0003, SM_WRITE); SekSetWriteByteHandler(1, AurailWriteByte); SekClose(); } @@ -6803,7 +6803,7 @@ static INT32 AurailjInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xfc0000, 0xfc0003, MAP_WRITE); + SekMapHandler(1, 0xfc0000, 0xfc0003, SM_WRITE); SekSetWriteByteHandler(1, AurailWriteByte); SekClose(); } @@ -6815,13 +6815,13 @@ void BayrouteMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0bffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0bffff, MAP_FETCH); - SekMapMemory(System16Ram , 0x500000, 0x503fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x600000, 0x6007ff, MAP_RAM); - SekMapMemory(System16TileRam , 0x700000, 0x70ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x710000, 0x710fff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x800000, 0x800fff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0bffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0bffff, SM_FETCH); + SekMapMemory(System16Ram , 0x500000, 0x503fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x600000, 0x6007ff, SM_RAM); + SekMapMemory(System16TileRam , 0x700000, 0x70ffff, SM_READ); + SekMapMemory(System16TextRam , 0x710000, 0x710fff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x800000, 0x800fff, SM_RAM); SekSetReadByteHandler(0, BayrouteReadByte); SekSetWriteByteHandler(0, BayrouteWriteByte); SekSetWriteWordHandler(0, BayrouteWriteWord); @@ -6848,16 +6848,16 @@ void Blox16bMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, System16BWriteWord); SekSetReadByteHandler(0, System16BReadByte); SekSetWriteByteHandler(0, System16BWriteByte); - SekMapHandler(1, 0x3f0000, 0x3f0003, MAP_WRITE); + SekMapHandler(1, 0x3f0000, 0x3f0003, SM_WRITE); SekSetWriteByteHandler(1, Fantzn2xWriteByte); SekClose(); } @@ -6897,7 +6897,7 @@ static INT32 BulletInit() if (!nRet) { SekOpen(0); SekSetReadByteHandler(0, BulletReadByte); - SekMapHandler(1, 0xc00006, 0xc00007, MAP_WRITE); + SekMapHandler(1, 0xc00006, 0xc00007, SM_WRITE); SekSetWriteByteHandler(1, BulletWriteByte); SekClose(); } @@ -6908,13 +6908,13 @@ void CottonMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0fffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0fffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x300000, 0x3007ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x500000, 0x500fff, MAP_RAM); - SekMapMemory(System16Ram , 0x200000, 0x203fff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0fffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0fffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x300000, 0x3007ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x500000, 0x500fff, SM_RAM); + SekMapMemory(System16Ram , 0x200000, 0x203fff, SM_RAM); SekSetReadByteHandler(0, CottonReadByte); SekSetWriteByteHandler(0, CottonWriteByte); SekSetWriteWordHandler(0, CottonWriteWord); @@ -6950,7 +6950,7 @@ static INT32 DduxInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0x3f0000, 0x3f0003, MAP_WRITE); + SekMapHandler(1, 0x3f0000, 0x3f0003, SM_WRITE); SekSetWriteByteHandler(1, DduxWriteByte); SekClose(); } @@ -6967,7 +6967,7 @@ static INT32 Ddux1Init() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0x3f0000, 0x3f0003, MAP_WRITE); + SekMapHandler(1, 0x3f0000, 0x3f0003, SM_WRITE); SekSetWriteByteHandler(1, DduxWriteByte); SekClose(); } @@ -6988,9 +6988,9 @@ static INT32 DduxblInit() if (!nRet) { SekOpen(0); SekSetWriteByteHandler(0, DduxblWriteByte); - SekMapHandler(1, 0x3f0000, 0x3f0003, MAP_WRITE); + SekMapHandler(1, 0x3f0000, 0x3f0003, SM_WRITE); SekSetWriteByteHandler(1, DduxWriteByte); - SekMapHandler(2, 0xc46000, 0xc46027, MAP_WRITE); + SekMapHandler(2, 0xc46000, 0xc46027, SM_WRITE); SekSetWriteByteHandler(2, DduxblGfxWriteByte); SekSetWriteWordHandler(2, DduxblGfxWriteWord); SekClose(); @@ -7014,7 +7014,7 @@ static INT32 DunkshotInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xc43000, 0xc4301f, MAP_READ); + SekMapHandler(1, 0xc43000, 0xc4301f, SM_READ); SekSetReadByteHandler(1, DunkshotReadByte); SekClose(); @@ -7077,13 +7077,13 @@ void EswatMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0bffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0bffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0bffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0bffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, System16BReadByte); SekSetWriteByteHandler(0, System16BWriteByte); SekSetWriteWordHandler(0, System16BWriteWord); @@ -7101,18 +7101,18 @@ static INT32 EswatInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0x123406, 0x123407, MAP_WRITE); + SekMapHandler(1, 0x123406, 0x123407, SM_WRITE); SekSetWriteByteHandler(1, EswatSoundWriteByte); - SekMapHandler(2, 0x3e0000, 0x3e0fff, MAP_RAM); + SekMapHandler(2, 0x3e0000, 0x3e0fff, SM_RAM); SekSetReadWordHandler(2, EswatMultiply0ReadWord); SekSetWriteWordHandler(2, EswatMultiply0WriteWord); - SekMapHandler(3, 0x3e1000, 0x3e1fff, MAP_RAM); + SekMapHandler(3, 0x3e1000, 0x3e1fff, SM_RAM); SekSetReadWordHandler(3, EswatCompare0ReadWord); SekSetWriteWordHandler(3, EswatCompare0WriteWord); - SekMapHandler(4, 0x3e2000, 0x3e2003, MAP_WRITE); + SekMapHandler(4, 0x3e2000, 0x3e2003, SM_WRITE); SekSetWriteByteHandler(4, EswatWriteByte); SekClose(); @@ -7148,22 +7148,22 @@ static INT32 Eswatj1Init() if (!nRet) { SekOpen(0); - SekMapMemory(System16Rom + 0x40000 , 0x080000, 0x0bffff, MAP_READ); // mirror - SekMapMemory(System16Code + 0x40000, 0x080000, 0x0bffff, MAP_FETCH); // mirror - SekMapMemory(System16Ram , 0xff0000, 0xff3fff, MAP_RAM); + SekMapMemory(System16Rom + 0x40000 , 0x080000, 0x0bffff, SM_READ); // mirror + SekMapMemory(System16Code + 0x40000, 0x080000, 0x0bffff, SM_FETCH); // mirror + SekMapMemory(System16Ram , 0xff0000, 0xff3fff, SM_RAM); - SekMapHandler(1, 0x123406, 0x123407, MAP_WRITE); + SekMapHandler(1, 0x123406, 0x123407, SM_WRITE); SekSetWriteByteHandler(1, EswatSoundWriteByte); - SekMapHandler(2, 0x3e0000, 0x3e0fff, MAP_RAM); + SekMapHandler(2, 0x3e0000, 0x3e0fff, SM_RAM); SekSetReadWordHandler(2, EswatMultiply0ReadWord); SekSetWriteWordHandler(2, EswatMultiply0WriteWord); - SekMapHandler(3, 0x3e1000, 0x3e1fff, MAP_RAM); + SekMapHandler(3, 0x3e1000, 0x3e1fff, SM_RAM); SekSetReadWordHandler(3, EswatCompare0ReadWord); SekSetWriteWordHandler(3, EswatCompare0WriteWord); - SekMapHandler(4, 0x3f0000, 0x3f0003, MAP_WRITE); + SekMapHandler(4, 0x3f0000, 0x3f0003, SM_WRITE); SekSetWriteByteHandler(4, Eswatj1WriteByte); SekClose(); @@ -7207,14 +7207,14 @@ static INT32 EswatblInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0x418000, 0x418031, MAP_WRITE); + SekMapHandler(1, 0x418000, 0x418031, SM_WRITE); SekSetWriteWordHandler(1, EswatblGfxWriteWord); SekSetWriteByteHandler(1, EswatblGfxWriteByte); - SekMapHandler(2, 0xc42006, 0xc42007, MAP_WRITE); + SekMapHandler(2, 0xc42006, 0xc42007, SM_WRITE); SekSetWriteByteHandler(2, EswatblSoundWriteByte); - SekMapHandler(3, 0x3e2000, 0x3e2003, MAP_WRITE); + SekMapHandler(3, 0x3e2000, 0x3e2003, SM_WRITE); SekSetWriteByteHandler(3, EswatWriteByte); SekClose(); @@ -7296,17 +7296,17 @@ void Fantzn2xMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0fffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0fffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(System16Ram , 0x200000, 0x23ffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0fffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0fffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, SM_RAM); + SekMapMemory(System16Ram , 0x200000, 0x23ffff, SM_RAM); SekSetWriteWordHandler(0, System16BWriteWord); SekSetReadByteHandler(0, System16BReadByte); SekSetWriteByteHandler(0, System16BWriteByte); - SekMapHandler(1, 0x3f0000, 0x3f0003, MAP_WRITE); + SekMapHandler(1, 0x3f0000, 0x3f0003, SM_WRITE); SekSetWriteByteHandler(1, Fantzn2xWriteByte); SekClose(); } @@ -7365,16 +7365,16 @@ void FantzntaMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetWriteWordHandler(0, System16BWriteWord); SekSetReadByteHandler(0, System16BReadByte); SekSetWriteByteHandler(0, System16BWriteByte); - SekMapHandler(1, 0x3f0000, 0x3f0003, MAP_WRITE); + SekMapHandler(1, 0x3f0000, 0x3f0003, SM_WRITE); SekSetWriteByteHandler(1, Fantzn2xWriteByte); SekClose(); } @@ -7420,7 +7420,7 @@ static INT32 FpointblInit() SekSetReadByteHandler(0, FpointblReadByte); SekSetWriteByteHandler(0, FpointblWriteByte); - SekMapHandler(1, 0xc46000, 0xc46031, MAP_WRITE); + SekMapHandler(1, 0xc46000, 0xc46031, SM_WRITE); SekSetWriteWordHandler(1, FpointblGfxWriteWord); SekClose(); @@ -7434,24 +7434,24 @@ void GoldnaxeMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0bffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0bffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x100000, 0x10ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x110000, 0x110fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x200000, 0x2007ff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x300000, 0x3007ff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x400000, 0x4007ff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x500000, 0x5007ff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x700000, 0x7007ff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x800000, 0x8007ff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x900000, 0x9007ff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x600000, 0x6007ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x140000, 0x140fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0bffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0bffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x100000, 0x10ffff, SM_READ); + SekMapMemory(System16TextRam , 0x110000, 0x110fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x200000, 0x2007ff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x300000, 0x3007ff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x400000, 0x4007ff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x500000, 0x5007ff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x700000, 0x7007ff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x800000, 0x8007ff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x900000, 0x9007ff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x600000, 0x6007ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x140000, 0x140fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, System16BReadByte); SekSetWriteByteHandler(0, System16BWriteByte); - SekMapHandler(1, 0x100000, 0x10ffff, MAP_WRITE); + SekMapHandler(1, 0x100000, 0x10ffff, SM_WRITE); SekSetWriteByteHandler(1, GoldnaxeTileWriteByte); SekSetWriteWordHandler(1, GoldnaxeTileWriteWord); SekClose(); @@ -7498,19 +7498,19 @@ static INT32 GoldnaxeInit() if (!nRet) { SekOpen(0); - SekMapHandler(2, 0x1e0000, 0x1e0fff, MAP_RAM); + SekMapHandler(2, 0x1e0000, 0x1e0fff, SM_RAM); SekSetReadWordHandler(2, GoldnaxeCompare1ReadWord); SekSetWriteWordHandler(2, GoldnaxeCompare1WriteWord); - SekMapHandler(3, 0x1f0000, 0x1f0fff, MAP_RAM); + SekMapHandler(3, 0x1f0000, 0x1f0fff, SM_RAM); SekSetReadWordHandler(3, GoldnaxeMultiply0ReadWord); SekSetWriteWordHandler(3, GoldnaxeMultiply0WriteWord); - SekMapHandler(4, 0x1f1000, 0x1f1fff, MAP_RAM); + SekMapHandler(4, 0x1f1000, 0x1f1fff, SM_RAM); SekSetReadWordHandler(4, GoldnaxeCompare0ReadWord); SekSetWriteWordHandler(4, GoldnaxeCompare0WriteWord); - SekMapHandler(5, 0x1f2000, 0x1f2003, MAP_WRITE); + SekMapHandler(5, 0x1f2000, 0x1f2003, SM_WRITE); SekSetWriteByteHandler(5, Goldnaxe1WriteByte); SekClose(); @@ -7544,19 +7544,19 @@ static INT32 Goldnaxe1Init() if (!nRet) { SekOpen(0); - SekMapHandler(2, 0x1e0000, 0x1e0fff, MAP_RAM); + SekMapHandler(2, 0x1e0000, 0x1e0fff, SM_RAM); SekSetReadWordHandler(2, GoldnaxeCompare1ReadWord); SekSetWriteWordHandler(2, GoldnaxeCompare1WriteWord); - SekMapHandler(3, 0x1f0000, 0x1f0fff, MAP_RAM); + SekMapHandler(3, 0x1f0000, 0x1f0fff, SM_RAM); SekSetReadWordHandler(3, GoldnaxeMultiply0ReadWord); SekSetWriteWordHandler(3, GoldnaxeMultiply0WriteWord); - SekMapHandler(4, 0x1f1000, 0x1f1fff, MAP_RAM); + SekMapHandler(4, 0x1f1000, 0x1f1fff, SM_RAM); SekSetReadWordHandler(4, GoldnaxeCompare0ReadWord); SekSetWriteWordHandler(4, GoldnaxeCompare0WriteWord); - SekMapHandler(5, 0x1f2000, 0x1f2003, MAP_WRITE); + SekMapHandler(5, 0x1f2000, 0x1f2003, SM_WRITE); SekSetWriteByteHandler(5, Goldnaxe1WriteByte); SekClose(); @@ -7592,7 +7592,7 @@ static INT32 Goldnaxe2Init() if (!nRet) { SekOpen(0); - SekMapHandler(2, 0x1f0000, 0x1f0003, MAP_WRITE); + SekMapHandler(2, 0x1f0000, 0x1f0003, SM_WRITE); SekSetWriteByteHandler(2, Goldnaxe3WriteByte); SekClose(); @@ -7627,7 +7627,7 @@ static INT32 Goldnaxe3Init() if (!nRet) { SekOpen(0); - SekMapHandler(2, 0x1f0000, 0x1f0003, MAP_WRITE); + SekMapHandler(2, 0x1f0000, 0x1f0003, SM_WRITE); SekSetWriteByteHandler(2, Goldnaxe3WriteByte); SekClose(); @@ -7656,10 +7656,10 @@ static INT32 HwchampInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0x3f0000, 0x3f0003, MAP_WRITE); + SekMapHandler(1, 0x3f0000, 0x3f0003, SM_WRITE); SekSetWriteByteHandler(1, HwchampWriteByte); - SekMapHandler(2, 0xc43020, 0xc43025, MAP_RAM); + SekMapHandler(2, 0xc43020, 0xc43025, SM_RAM); SekSetReadWordHandler(2, HwchampCtrlReadWord); SekSetWriteWordHandler(2, HwchampCtrlWriteWord); SekClose(); @@ -7694,7 +7694,7 @@ static INT32 MvpInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0x3f2000, 0x3f2003, MAP_WRITE); + SekMapHandler(1, 0x3f2000, 0x3f2003, SM_WRITE); SekSetWriteByteHandler(1, MvpWriteByte); SekClose(); @@ -7730,7 +7730,7 @@ static INT32 MvpjInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0x3f0000, 0x3f0003, MAP_WRITE); + SekMapHandler(1, 0x3f0000, 0x3f0003, SM_WRITE); SekSetWriteByteHandler(1, MvpjWriteByte); SekClose(); @@ -7756,7 +7756,7 @@ static INT32 PassshtInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xc00006, 0xc00007, MAP_WRITE); + SekMapHandler(1, 0xc00006, 0xc00007, SM_WRITE); SekSetWriteByteHandler(1, PassshtWriteByte); SekClose(); } @@ -7770,9 +7770,9 @@ static INT32 PassshtaInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xc00006, 0xc00007, MAP_WRITE); + SekMapHandler(1, 0xc00006, 0xc00007, SM_WRITE); SekSetWriteByteHandler(1, PassshtWriteByte); - SekMapHandler(2, 0xc43000, 0xc43007, MAP_READ); + SekMapHandler(2, 0xc43000, 0xc43007, SM_READ); SekSetReadByteHandler(2, PassshtaReadByte); SekClose(); } @@ -7788,13 +7788,13 @@ static INT32 PassshtbInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xc46000, 0xc46031, MAP_WRITE); + SekMapHandler(1, 0xc46000, 0xc46031, SM_WRITE); SekSetWriteWordHandler(1, PassshtbGfxWriteWord); -// SekMapHandler(2, 0x842000, 0x842001, MAP_READ); +// SekMapHandler(2, 0x842000, 0x842001, SM_READ); // SekSetReadByteHandler(2, PassshtbReadByte); -// SekMapHandler(2, 0xc42006, 0xc42007, MAP_WRITE); +// SekMapHandler(2, 0xc42006, 0xc42007, SM_WRITE); // SekSetWriteByteHandler(2, TetrisblSndWriteByte); SekClose(); @@ -7808,13 +7808,13 @@ void RiotcityMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0bffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0bffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0xfa0000, 0xfaffff, MAP_READ); - SekMapMemory(System16TextRam , 0xfb0000, 0xfb0fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0xf40000, 0xf407ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0xf60000, 0xf60fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0bffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0bffff, SM_FETCH); + SekMapMemory(System16TileRam , 0xfa0000, 0xfaffff, SM_READ); + SekMapMemory(System16TextRam , 0xfb0000, 0xfb0fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0xf40000, 0xf407ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0xf60000, 0xf60fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, RiotcityReadByte); SekSetWriteByteHandler(0, RiotcityWriteByte); SekSetWriteWordHandler(0, RiotcityWriteWord); @@ -7855,14 +7855,14 @@ void RyukyuMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0bffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0bffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x300000, 0x3007ff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x300800, 0x300fff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x500000, 0x500fff, MAP_RAM); - SekMapMemory(System16Ram , 0x200000, 0x203fff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0bffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0bffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x300000, 0x3007ff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x300800, 0x300fff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x500000, 0x500fff, SM_RAM); + SekMapMemory(System16Ram , 0x200000, 0x203fff, SM_RAM); SekSetReadWordHandler(0, RyukyuReadWord); SekSetWriteWordHandler(0, RyukyuWriteWord); SekSetReadByteHandler(0, System16BReadByte); @@ -7886,7 +7886,7 @@ static INT32 SdibInit() if (!nRet) { SekOpen(0); SekSetReadByteHandler(0, SdibReadByte); - SekMapHandler(1, 0x123406, 0x123407, MAP_WRITE); + SekMapHandler(1, 0x123406, 0x123407, SM_WRITE); SekSetWriteByteHandler(1, SdibSoundWriteByte); SekClose(); } @@ -7903,7 +7903,7 @@ static INT32 SdiblInit() if (!nRet) { SekOpen(0); SekSetReadByteHandler(0, SdibReadByte); - SekMapHandler(1, 0x123406, 0x123407, MAP_WRITE); + SekMapHandler(1, 0x123406, 0x123407, SM_WRITE); SekSetWriteByteHandler(1, SdibSoundWriteByte); SekClose(); } @@ -7992,9 +7992,9 @@ static INT32 SonicbomInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0x123406, 0x123407, MAP_WRITE); + SekMapHandler(1, 0x123406, 0x123407, SM_WRITE); SekSetWriteByteHandler(1, SonicbomWriteByte); - SekMapHandler(2, 0xc42000, 0xc42003, MAP_READ); + SekMapHandler(2, 0xc42000, 0xc42003, SM_READ); SekSetReadWordHandler(2, SonicbomReadWord); SekClose(); } @@ -8010,10 +8010,10 @@ static INT32 TetrisblInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0x418000, 0x418031, MAP_WRITE); + SekMapHandler(1, 0x418000, 0x418031, SM_WRITE); SekSetWriteWordHandler(1, TetrisblGfxWriteWord); - SekMapHandler(2, 0xc42006, 0xc42007, MAP_WRITE); + SekMapHandler(2, 0xc42006, 0xc42007, SM_WRITE); SekSetWriteByteHandler(2, TetrisblSndWriteByte); SekClose(); @@ -8058,9 +8058,9 @@ static INT32 ToryumonInit() SekOpen(0); SekSetReadByteHandler(0, ToryumonReadByte); SekSetWriteByteHandler(0, ToryumonWriteByte); - SekMapMemory(System16Ram, 0xff0000, 0xff3fff, MAP_RAM); - SekMapMemory(System16Ram, 0xff4000, 0xff7fff, MAP_RAM); - SekMapMemory(System16Ram, 0xff8000, 0xffbfff, MAP_RAM); + SekMapMemory(System16Ram, 0xff0000, 0xff3fff, SM_RAM); + SekMapMemory(System16Ram, 0xff4000, 0xff7fff, SM_RAM); + SekMapMemory(System16Ram, 0xff8000, 0xffbfff, SM_RAM); SekClose(); } @@ -8071,13 +8071,13 @@ void TturfMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0bffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0bffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x300000, 0x3007ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x500000, 0x500fff, MAP_RAM); - SekMapMemory(System16Ram , 0x200000, 0x203fff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0bffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0bffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x300000, 0x3007ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x500000, 0x500fff, SM_RAM); + SekMapMemory(System16Ram , 0x200000, 0x203fff, SM_RAM); SekSetReadByteHandler(0, TturfReadByte); SekSetWriteByteHandler(0, TturfWriteByte); SekSetWriteWordHandler(0, System16BWriteWord); @@ -8184,7 +8184,7 @@ static INT32 Wb32Init() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xdf0006, 0xdf0007, MAP_WRITE); + SekMapHandler(1, 0xdf0006, 0xdf0007, SM_WRITE); SekSetWriteByteHandler(1, Wb3WriteByte); SekClose(); } @@ -8201,7 +8201,7 @@ static INT32 Wb33Init() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xdf0006, 0xdf0007, MAP_WRITE); + SekMapHandler(1, 0xdf0006, 0xdf0007, SM_WRITE); SekSetWriteByteHandler(1, Wb3WriteByte); SekClose(); @@ -8231,7 +8231,7 @@ static INT32 Wb3bblInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xc44000, 0xc46031, MAP_WRITE); + SekMapHandler(1, 0xc44000, 0xc46031, SM_WRITE); SekSetWriteWordHandler(1, Wb3bblGfxWriteWord); SekClose(); @@ -8258,18 +8258,18 @@ void WrestwarMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0bffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0bffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x100000, 0x10ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x110000, 0x110fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x200000, 0x2007ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x300000, 0x300fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0bffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0bffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x100000, 0x10ffff, SM_READ); + SekMapMemory(System16TextRam , 0x110000, 0x110fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x200000, 0x2007ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x300000, 0x300fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, System16BReadByte); SekSetWriteByteHandler(0, System16BWriteByte); - SekMapHandler(1, 0x400000, 0x400003, MAP_WRITE); + SekMapHandler(1, 0x400000, 0x400003, SM_WRITE); SekSetWriteByteHandler(1, WrestwarWriteByte); - SekMapHandler(2, 0x100000, 0x10ffff, MAP_WRITE); + SekMapHandler(2, 0x100000, 0x10ffff, SM_WRITE); SekSetWriteByteHandler(2, WrestwarTileWriteByte); SekSetWriteWordHandler(2, WrestwarTileWriteWord); SekClose(); @@ -9599,7 +9599,7 @@ void __fastcall IsgsmWriteByte(UINT32 a, UINT8 d) } case 0xfe000b: { - SekMapMemory(System16Rom + 0x300000, 0x000000, 0x0fffff, MAP_ROM); + SekMapMemory(System16Rom + 0x300000, 0x000000, 0x0fffff, SM_ROM); GameRomMapped = 1; return; } @@ -9683,14 +9683,14 @@ static void IsgsmMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(System16ExtraRam , 0x200000, 0x23ffff, MAP_RAM); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(System16Rom + 0x100000 , 0xee0000, 0xefffff, MAP_ROM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(System16ExtraRam , 0x200000, 0x23ffff, SM_RAM); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, SM_RAM); + SekMapMemory(System16Rom + 0x100000 , 0xee0000, 0xefffff, SM_ROM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, IsgsmReadWord); SekSetWriteWordHandler(0, IsgsmWriteWord); SekSetReadByteHandler(0, IsgsmReadByte); @@ -9870,7 +9870,7 @@ static INT32 IsgsmScan(INT32 nAction,INT32 *pnMin) if (nAction & ACB_WRITE) { if (GameRomMapped) { SekOpen(0); - SekMapMemory(System16Rom + 0x300000, 0x000000, 0x0fffff, MAP_ROM); + SekMapMemory(System16Rom + 0x300000, 0x000000, 0x0fffff, SM_ROM); SekClose(); } diff --git a/src/burn/drv/sega/d_sys18.cpp b/src/burn/drv/sega/d_sys18.cpp index 0c51236c1..f54b122e3 100644 --- a/src/burn/drv/sega/d_sys18.cpp +++ b/src/burn/drv/sega/d_sys18.cpp @@ -2218,7 +2218,7 @@ void __fastcall ShdancblWriteByte(UINT32 a, UINT8 d) case 0xc40007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO);; + ZetRaiseIrq(0); ZetClose(); return; } @@ -2377,7 +2377,7 @@ static INT32 System18Bank40000Init() if (!nRet) { SekOpen(0); - SekMapMemory(System16Rom + 0x200000, 0x200000, 0x27ffff, MAP_READ); + SekMapMemory(System16Rom + 0x200000, 0x200000, 0x27ffff, SM_READ); SekClose(); UINT8 *pTemp = (UINT8*)BurnMalloc(0x400000); @@ -2408,7 +2408,7 @@ static INT32 System18Bank80000Init() if (!nRet) { SekOpen(0); - SekMapMemory(System16Rom + 0x200000, 0x200000, 0x27ffff, MAP_READ); + SekMapMemory(System16Rom + 0x200000, 0x200000, 0x27ffff, SM_READ); SekClose(); } @@ -2419,18 +2419,18 @@ void Astorm3Map68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0bffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0bffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(System16TextRam , 0x110000, 0x110fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x200000, 0x2007ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x140000, 0x140fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0bffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0bffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(System16TextRam , 0x110000, 0x110fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x200000, 0x2007ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x140000, 0x140fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, System18ReadWord); SekSetWriteWordHandler(0, System18WriteWord); SekSetReadByteHandler(0, System18ReadByte); SekSetWriteByteHandler(0, System18WriteByte); - SekMapHandler(1, 0xa00000, 0xa03fff, MAP_RAM); + SekMapHandler(1, 0xa00000, 0xa03fff, SM_RAM); SekSetReadByteHandler(1, Astorm3ReadByte); SekSetWriteByteHandler(1, Astorm3WriteByte); SekClose(); @@ -2451,7 +2451,7 @@ static INT32 DdcrewuInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xe43020, 0xe43025, MAP_READ); + SekMapHandler(1, 0xe43020, 0xe43025, SM_READ); SekSetReadByteHandler(1, DdcrewuReadByte); SekClose(); } @@ -2463,15 +2463,15 @@ static void HamawayMap68K() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x07ffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x07ffff, MAP_FETCH); - SekMapMemory(System16Rom + 0x80000 , 0x200000, 0x27ffff, MAP_READ); - SekMapMemory(System16Code + 0x80000, 0x200000, 0x27ffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x500000, 0x5007ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x07ffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x07ffff, SM_FETCH); + SekMapMemory(System16Rom + 0x80000 , 0x200000, 0x27ffff, SM_READ); + SekMapMemory(System16Code + 0x80000, 0x200000, 0x27ffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x500000, 0x5007ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, HamawayReadByte); SekSetReadWordHandler(0, HamawayReadWord); SekSetWriteByteHandler(0, HamawayWriteByte); @@ -2502,7 +2502,7 @@ static INT32 LghostInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xe43010, 0xe43021, MAP_RAM); + SekMapHandler(1, 0xe43010, 0xe43021, SM_RAM); SekSetReadByteHandler(1, LghostReadByte); SekSetWriteByteHandler(1, LghostWriteByte); SekClose(); @@ -2557,9 +2557,9 @@ static INT32 Mwalkbl2Init() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xc40000, 0xc41009, MAP_READ); + SekMapHandler(1, 0xc40000, 0xc41009, SM_READ); SekSetReadByteHandler(1, Mwalkbl2ReadByte); - SekMapHandler(2, 0xc40006, 0xc46801, MAP_WRITE); + SekMapHandler(2, 0xc40006, 0xc46801, SM_WRITE); SekSetWriteByteHandler(2, Mwalkbl2WriteByte); SekSetWriteWordHandler(2, Mwalkbl2WriteWord); SekClose(); @@ -2594,7 +2594,7 @@ static INT32 WwallyInit() if (!nRet) { SekOpen(0); - SekMapHandler(1, 0xa43000, 0xa4300e, MAP_RAM); + SekMapHandler(1, 0xa43000, 0xa4300e, SM_RAM); SekSetReadByteHandler(1, WwallyReadByte); SekSetWriteWordHandler(1, WwallyWriteWord); SekClose(); diff --git a/src/burn/drv/sega/d_zaxxon.cpp b/src/burn/drv/sega/d_zaxxon.cpp index 833a15520..effb2a6ff 100644 --- a/src/burn/drv/sega/d_zaxxon.cpp +++ b/src/burn/drv/sega/d_zaxxon.cpp @@ -604,7 +604,7 @@ static void __fastcall zaxxon_write(UINT16 address, UINT8 data) case 0xe0f0: *interrupt_enable = data & 1; - if (~data & 1) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); + if (~data & 1) ZetLowerIrq(); return; case 0xe0f1: @@ -708,7 +708,7 @@ static void __fastcall congo_write(UINT16 address, UINT8 data) case 0xc01f: *interrupt_enable = data & 1; - if (~data & 1) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); + if (~data & 1) ZetLowerIrq(); return; case 0xc021: @@ -997,16 +997,16 @@ static INT32 DrvInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x5fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0x6000, 0x6fff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x5fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0x6000, 0x6fff, ZET_RAM); // address mirroring for (INT32 i = 0; i < 0x2000; i+= 0x400) { - ZetMapMemory(DrvVidRAM, 0x8000 + i, 0x83ff + i, MAP_RAM); + ZetMapMemory(DrvVidRAM, 0x8000 + i, 0x83ff + i, ZET_RAM); } for (INT32 i = 0; i < 0x1000; i+= 0x100) { - ZetMapMemory(DrvSprRAM, 0xa000 + i, 0xa0ff + i, MAP_RAM); + ZetMapMemory(DrvSprRAM, 0xa000 + i, 0xa0ff + i, ZET_RAM); } ZetSetWriteHandler(zaxxon_write); @@ -1091,13 +1091,13 @@ static INT32 CongoInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80RAM, 0x8000, 0x8fff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80RAM, 0x8000, 0x8fff, ZET_RAM); // address mirroring for (INT32 i = 0; i < 0x2000; i+= 0x800) { - ZetMapMemory(DrvVidRAM, 0xa000, 0xa3ff, MAP_RAM); - ZetMapMemory(DrvColRAM, 0xa400, 0xa7ff, MAP_RAM); + ZetMapMemory(DrvVidRAM, 0xa000, 0xa3ff, ZET_RAM); + ZetMapMemory(DrvColRAM, 0xa400, 0xa7ff, ZET_RAM); } ZetSetWriteHandler(congo_write); @@ -1106,10 +1106,10 @@ static INT32 CongoInit() ZetInit(1); ZetOpen(1); - ZetMapMemory(DrvZ80ROM2, 0x0000, 0x1fff, MAP_ROM); + ZetMapMemory(DrvZ80ROM2, 0x0000, 0x1fff, ZET_ROM); for (INT32 i = 0; i < 0x2000; i+= 0x800) { - ZetMapMemory(DrvZ80RAM2, 0x4000 + i, 0x47ff + i, MAP_RAM); + ZetMapMemory(DrvZ80RAM2, 0x4000 + i, 0x47ff + i, ZET_RAM); } ZetSetWriteHandler(congo_sound_write); @@ -1382,7 +1382,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(3041250 / 60); - if (*interrupt_enable) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (*interrupt_enable) ZetRaiseIrq(0); ZetClose(); if (pBurnDraw) { @@ -1425,7 +1425,7 @@ static INT32 CongoFrame() ZetOpen(0); nCyclesSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += ZetRun(nCyclesSegment); - if (i == nInterleave-1 && *interrupt_enable) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == nInterleave-1 && *interrupt_enable) ZetRaiseIrq(0); ZetClose(); ZetOpen(1); diff --git a/src/burn/drv/sega/sys16_fd1094.cpp b/src/burn/drv/sega/sys16_fd1094.cpp index 22489af82..bb80d0e81 100644 --- a/src/burn/drv/sega/sys16_fd1094.cpp +++ b/src/burn/drv/sega/sys16_fd1094.cpp @@ -60,18 +60,18 @@ static void fd1094_setstate_and_decrypt(INT32 state) INT32 nActiveCPU = SekGetActive(); if (nActiveCPU == -1) { SekOpen(nFD1094CPU); - SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, MAP_FETCH); - if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, MAP_FETCH); + SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, SM_FETCH); + if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, SM_FETCH); SekClose(); } else { if (nActiveCPU == nFD1094CPU) { - SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, MAP_FETCH); - if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, MAP_FETCH); + SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, SM_FETCH); + if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, SM_FETCH); } else { SekClose(); SekOpen(nFD1094CPU); - SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, MAP_FETCH); - if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, MAP_FETCH); + SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, SM_FETCH); + if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, SM_FETCH); SekClose(); SekOpen(nActiveCPU); } @@ -96,18 +96,18 @@ static void fd1094_setstate_and_decrypt(INT32 state) INT32 nActiveCPU = SekGetActive(); if (nActiveCPU == -1) { SekOpen(nFD1094CPU); - SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, MAP_FETCH); - if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, MAP_FETCH); + SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, SM_FETCH); + if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, SM_FETCH); SekClose(); } else { if (nActiveCPU == nFD1094CPU) { - SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, MAP_FETCH); - if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, MAP_FETCH); + SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, SM_FETCH); + if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, SM_FETCH); } else { SekClose(); SekOpen(nFD1094CPU); - SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, MAP_FETCH); - if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, MAP_FETCH); + SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, SM_FETCH); + if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, SM_FETCH); SekClose(); SekOpen(nActiveCPU); } @@ -158,8 +158,8 @@ void fd1094_kludge_reset_values(void) } SekOpen(nFD1094CPU); - SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, MAP_FETCH); - if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, MAP_FETCH); + SekMapMemory((UINT8*)fd1094_userregion, 0x000000, 0x0fffff, SM_FETCH); + if (System18Banking) SekMapMemory((UINT8*)fd1094_userregion + 0x200000, 0x200000, 0x27ffff, SM_FETCH); SekClose(); } diff --git a/src/burn/drv/sega/sys16_run.cpp b/src/burn/drv/sega/sys16_run.cpp index 6eb7a75dc..c975db830 100644 --- a/src/burn/drv/sega/sys16_run.cpp +++ b/src/burn/drv/sega/sys16_run.cpp @@ -237,7 +237,7 @@ static INT32 System16DoReset() if (BurnDrvGetHardwareCode() & HARDWARE_SEGA_ISGSM) { SekOpen(0); - SekMapMemory(System16Rom, 0x000000, 0x0fffff, MAP_ROM); + SekMapMemory(System16Rom, 0x000000, 0x0fffff, SM_ROM); SekClose(); } @@ -1857,13 +1857,13 @@ INT32 System16Init() } else { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0fffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0fffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0fffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0fffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, System16AReadWord); SekSetWriteWordHandler(0, System16AWriteWord); @@ -1930,13 +1930,13 @@ INT32 System16Init() } else { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0fffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0fffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0fffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0fffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, System16BReadByte); SekSetWriteByteHandler(0, System16BWriteByte); @@ -2001,13 +2001,13 @@ INT32 System16Init() } else { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x0fffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x0fffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, MAP_RAM); - SekMapMemory(System16Ram , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x0fffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x0fffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x440000, 0x4407ff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x840000, 0x840fff, SM_RAM); + SekMapMemory(System16Ram , 0xffc000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, System18ReadWord); SekSetWriteWordHandler(0, System18WriteWord); @@ -2067,16 +2067,16 @@ INT32 System16Init() } else { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x03ffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x03ffff, MAP_FETCH); - SekMapMemory(System16Ram , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(System16TileRam , 0x400000, 0x403fff, MAP_READ); - SekMapMemory(System16TextRam , 0x410000, 0x410fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x600000, 0x607fff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0xa00000, 0xa00fff, MAP_RAM); - SekMapMemory(System16Rom2 , 0xc00000, 0xc3ffff, MAP_READ); - SekMapMemory(System16RoadRam , 0xc68000, 0xc68fff, MAP_RAM); - SekMapMemory(System16ExtraRam , 0xc7c000, 0xc7ffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x03ffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x03ffff, SM_FETCH); + SekMapMemory(System16Ram , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(System16TileRam , 0x400000, 0x403fff, SM_READ); + SekMapMemory(System16TextRam , 0x410000, 0x410fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x600000, 0x607fff, SM_RAM); + SekMapMemory(System16PaletteRam , 0xa00000, 0xa00fff, SM_RAM); + SekMapMemory(System16Rom2 , 0xc00000, 0xc3ffff, SM_READ); + SekMapMemory(System16RoadRam , 0xc68000, 0xc68fff, SM_RAM); + SekMapMemory(System16ExtraRam , 0xc7c000, 0xc7ffff, SM_RAM); SekSetReadWordHandler(0, HangonReadWord); SekSetReadByteHandler(0, HangonReadByte); @@ -2087,10 +2087,10 @@ INT32 System16Init() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(System16Rom2 , 0x000000, 0x03ffff, MAP_READ); - SekMapMemory(System16Rom2 , 0x000000, 0x03ffff, MAP_FETCH); - SekMapMemory(System16RoadRam , 0xc68000, 0xc68fff, MAP_RAM); - SekMapMemory(System16ExtraRam , 0xc7c000, 0xc7ffff, MAP_RAM); + SekMapMemory(System16Rom2 , 0x000000, 0x03ffff, SM_READ); + SekMapMemory(System16Rom2 , 0x000000, 0x03ffff, SM_FETCH); + SekMapMemory(System16RoadRam , 0xc68000, 0xc68fff, SM_RAM); + SekMapMemory(System16ExtraRam , 0xc7c000, 0xc7ffff, SM_RAM); SekClose(); if (System16MapZ80Do) { @@ -2169,16 +2169,16 @@ INT32 System16Init() if ((BurnDrvGetHardwareCode() & HARDWARE_PUBLIC_MASK) == HARDWARE_SEGA_OUTRUN) { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x05ffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x05ffff, MAP_FETCH); - SekMapMemory(System16ExtraRam , 0x060000, 0x067fff, MAP_RAM); - SekMapMemory(System16TileRam , 0x100000, 0x10ffff, MAP_READ); - SekMapMemory(System16TextRam , 0x110000, 0x110fff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x120000, 0x121fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x130000, 0x130fff, MAP_RAM); - SekMapMemory(System16Rom2 , 0x200000, 0x23ffff, MAP_READ); - SekMapMemory(System16Ram , 0x260000, 0x267fff, MAP_RAM); - SekMapMemory(System16RoadRam , 0x280000, 0x280fff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x05ffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x05ffff, SM_FETCH); + SekMapMemory(System16ExtraRam , 0x060000, 0x067fff, SM_RAM); + SekMapMemory(System16TileRam , 0x100000, 0x10ffff, SM_READ); + SekMapMemory(System16TextRam , 0x110000, 0x110fff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x120000, 0x121fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x130000, 0x130fff, SM_RAM); + SekMapMemory(System16Rom2 , 0x200000, 0x23ffff, SM_READ); + SekMapMemory(System16Ram , 0x260000, 0x267fff, SM_RAM); + SekMapMemory(System16RoadRam , 0x280000, 0x280fff, SM_RAM); SekSetResetCallback(OutrunResetCallback); SekSetReadWordHandler(0, OutrunReadWord); SekSetWriteWordHandler(0, OutrunWriteWord); @@ -2188,10 +2188,10 @@ INT32 System16Init() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(System16Rom2 , 0x000000, 0x03ffff, MAP_READ); - SekMapMemory(System16Rom2 , 0x000000, 0x03ffff, MAP_FETCH); - SekMapMemory(System16Ram , 0x060000, 0x067fff, MAP_RAM); - SekMapMemory(System16RoadRam , 0x080000, 0x080fff, MAP_RAM); + SekMapMemory(System16Rom2 , 0x000000, 0x03ffff, SM_READ); + SekMapMemory(System16Rom2 , 0x000000, 0x03ffff, SM_FETCH); + SekMapMemory(System16Ram , 0x060000, 0x067fff, SM_RAM); + SekMapMemory(System16RoadRam , 0x080000, 0x080fff, SM_RAM); SekSetWriteWordHandler(0, Outrun2WriteWord); SekSetReadByteHandler(0, Outrun2ReadByte); SekSetWriteByteHandler(0, Outrun2WriteByte); @@ -2243,34 +2243,34 @@ INT32 System16Init() if ((BurnDrvGetHardwareCode() & HARDWARE_PUBLIC_MASK) == HARDWARE_SEGA_SYSTEMX) { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x07ffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x07ffff, MAP_FETCH); - SekMapMemory(System16TileRam , 0x0c0000, 0x0cffff, MAP_READ); - SekMapMemory(System16TextRam , 0x0d0000, 0x0d0fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x100000, 0x100fff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x101000, 0x101fff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x102000, 0x102fff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x103000, 0x103fff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x104000, 0x104fff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x105000, 0x105fff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x106000, 0x106fff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x107000, 0x107fff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x108000, 0x108fff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x109000, 0x109fff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x10a000, 0x10afff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x10b000, 0x10bfff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x10c000, 0x10cfff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x10d000, 0x10dfff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x10e000, 0x10efff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16SpriteRam , 0x10f000, 0x10ffff, MAP_RAM); // Tests past Sprite RAM in mem tests (mirror?) - SekMapMemory(System16PaletteRam , 0x120000, 0x123fff, MAP_RAM); - SekMapMemory(System16Rom2 , 0x200000, 0x27ffff, MAP_READ); - SekMapMemory(System16Ram , 0x29c000, 0x2a3fff, MAP_RAM); - SekMapMemory(System16RoadRam , 0x2ec000, 0x2ecfff, MAP_RAM); - SekMapMemory(System16RoadRam , 0x2ed000, 0x2edfff, MAP_RAM); // Tests past Road RAM in mem tests (mirror?) - SekMapMemory(System16BackupRam2 , 0xff4000, 0xff7fff, MAP_RAM); - SekMapMemory(System16BackupRam , 0xff8000, 0xffffff, MAP_RAM); - SekMapMemory(System16BackupRam2 , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x07ffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x07ffff, SM_FETCH); + SekMapMemory(System16TileRam , 0x0c0000, 0x0cffff, SM_READ); + SekMapMemory(System16TextRam , 0x0d0000, 0x0d0fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x100000, 0x100fff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x101000, 0x101fff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x102000, 0x102fff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x103000, 0x103fff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x104000, 0x104fff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x105000, 0x105fff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x106000, 0x106fff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x107000, 0x107fff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x108000, 0x108fff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x109000, 0x109fff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x10a000, 0x10afff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x10b000, 0x10bfff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x10c000, 0x10cfff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x10d000, 0x10dfff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x10e000, 0x10efff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16SpriteRam , 0x10f000, 0x10ffff, SM_RAM); // Tests past Sprite RAM in mem tests (mirror?) + SekMapMemory(System16PaletteRam , 0x120000, 0x123fff, SM_RAM); + SekMapMemory(System16Rom2 , 0x200000, 0x27ffff, SM_READ); + SekMapMemory(System16Ram , 0x29c000, 0x2a3fff, SM_RAM); + SekMapMemory(System16RoadRam , 0x2ec000, 0x2ecfff, SM_RAM); + SekMapMemory(System16RoadRam , 0x2ed000, 0x2edfff, SM_RAM); // Tests past Road RAM in mem tests (mirror?) + SekMapMemory(System16BackupRam2 , 0xff4000, 0xff7fff, SM_RAM); + SekMapMemory(System16BackupRam , 0xff8000, 0xffffff, SM_RAM); + SekMapMemory(System16BackupRam2 , 0xffc000, 0xffffff, SM_RAM); SekSetResetCallback(OutrunResetCallback); SekSetReadWordHandler(0, XBoardReadWord); SekSetWriteWordHandler(0, XBoardWriteWord); @@ -2280,12 +2280,12 @@ INT32 System16Init() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(System16Rom2 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(System16Ram , 0x09c000, 0x0a3fff, MAP_RAM); - SekMapMemory(System16RoadRam , 0x0ec000, 0x0ecfff, MAP_RAM); - SekMapMemory(System16Rom2 , 0x200000, 0x27ffff, MAP_ROM); - SekMapMemory(System16Ram , 0x29c000, 0x2a3fff, MAP_RAM); - SekMapMemory(System16RoadRam , 0x2ec000, 0x2ecfff, MAP_RAM); + SekMapMemory(System16Rom2 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(System16Ram , 0x09c000, 0x0a3fff, SM_RAM); + SekMapMemory(System16RoadRam , 0x0ec000, 0x0ecfff, SM_RAM); + SekMapMemory(System16Rom2 , 0x200000, 0x27ffff, SM_ROM); + SekMapMemory(System16Ram , 0x29c000, 0x2a3fff, SM_RAM); + SekMapMemory(System16RoadRam , 0x2ec000, 0x2ecfff, SM_RAM); SekSetReadWordHandler(0, XBoard2ReadWord); SekSetWriteWordHandler(0, XBoard2WriteWord); SekSetReadByteHandler(0, XBoard2ReadByte); @@ -2361,10 +2361,10 @@ INT32 System16Init() if ((BurnDrvGetHardwareCode() & HARDWARE_PUBLIC_MASK) == HARDWARE_SEGA_SYSTEMY) { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(System16Rom , 0x000000, 0x07ffff, MAP_READ); - SekMapMemory(System16Code , 0x000000, 0x07ffff, MAP_FETCH); - SekMapMemory(System16Ram , 0x0c0000, 0x0cffff, MAP_RAM); - SekMapMemory(System16ExtraRam , 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom , 0x000000, 0x07ffff, SM_READ); + SekMapMemory(System16Code , 0x000000, 0x07ffff, SM_FETCH); + SekMapMemory(System16Ram , 0x0c0000, 0x0cffff, SM_RAM); + SekMapMemory(System16ExtraRam , 0xff0000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, YBoardReadWord); SekSetWriteWordHandler(0, YBoardWriteWord); SekSetReadByteHandler(0, YBoardReadByte); @@ -2373,24 +2373,24 @@ INT32 System16Init() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(System16Rom2 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(System16Ram , 0x0c0000, 0x0cffff, MAP_RAM); - SekMapMemory(System16SpriteRam2 , 0x180000, 0x18ffff, MAP_RAM); - SekMapMemory(System16ExtraRam2 , 0xff0000, 0xffbfff, MAP_RAM); - SekMapMemory(System16BackupRam , 0xffc000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom2 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(System16Ram , 0x0c0000, 0x0cffff, SM_RAM); + SekMapMemory(System16SpriteRam2 , 0x180000, 0x18ffff, SM_RAM); + SekMapMemory(System16ExtraRam2 , 0xff0000, 0xffbfff, SM_RAM); + SekMapMemory(System16BackupRam , 0xffc000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, YBoard2ReadWord); SekSetWriteWordHandler(0, YBoard2WriteWord); SekClose(); SekInit(2, 0x68000); SekOpen(2); - SekMapMemory(System16Rom3 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(System16Ram , 0x0c0000, 0x0cffff, MAP_RAM); - SekMapMemory(System16RotateRam , 0x180000, 0x1807ff, MAP_RAM); - SekMapMemory(System16SpriteRam , 0x188000, 0x188fff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x190000, 0x193fff, MAP_RAM); - SekMapMemory(System16PaletteRam , 0x194000, 0x197fff, MAP_RAM); - SekMapMemory(System16ExtraRam3 , 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(System16Rom3 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(System16Ram , 0x0c0000, 0x0cffff, SM_RAM); + SekMapMemory(System16RotateRam , 0x180000, 0x1807ff, SM_RAM); + SekMapMemory(System16SpriteRam , 0x188000, 0x188fff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x190000, 0x193fff, SM_RAM); + SekMapMemory(System16PaletteRam , 0x194000, 0x197fff, SM_RAM); + SekMapMemory(System16ExtraRam3 , 0xff0000, 0xffffff, SM_RAM); SekSetReadWordHandler(0, YBoard3ReadWord); SekSetWriteWordHandler(0, YBoard3WriteWord); SekSetReadByteHandler(0, YBoard3ReadByte); diff --git a/src/burn/drv/taito/d_arkanoid.cpp b/src/burn/drv/taito/d_arkanoid.cpp index 78e89803c..5c2881afc 100644 --- a/src/burn/drv/taito/d_arkanoid.cpp +++ b/src/burn/drv/taito/d_arkanoid.cpp @@ -1236,7 +1236,7 @@ static INT32 DrvFrame() } } - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); m6805Close(); ZetClose(); diff --git a/src/burn/drv/taito/d_ashnojoe.cpp b/src/burn/drv/taito/d_ashnojoe.cpp index 0ac528957..1a4c570f1 100644 --- a/src/burn/drv/taito/d_ashnojoe.cpp +++ b/src/burn/drv/taito/d_ashnojoe.cpp @@ -383,11 +383,11 @@ static INT32 DrvInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(DrvPfRAM, 0x040000, 0x048fff, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x049000, 0x049fff, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x04c000, 0x04ffff, MAP_RAM); - SekMapMemory(Drv68KROM + 0x080000, 0x080000, 0x0bffff, MAP_ROM); + SekMapMemory(Drv68KROM, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(DrvPfRAM, 0x040000, 0x048fff, SM_RAM); + SekMapMemory(DrvPalRAM, 0x049000, 0x049fff, SM_RAM); + SekMapMemory(Drv68KRAM, 0x04c000, 0x04ffff, SM_RAM); + SekMapMemory(Drv68KROM + 0x080000, 0x080000, 0x0bffff, SM_ROM); SekSetWriteWordHandler(0, ashnojoe_write_word); SekSetWriteByteHandler(0, ashnojoe_write_byte); SekSetReadWordHandler(0, ashnojoe_read_word); diff --git a/src/burn/drv/taito/d_asuka.cpp b/src/burn/drv/taito/d_asuka.cpp index 06993c52e..51d3f1be6 100644 --- a/src/burn/drv/taito/d_asuka.cpp +++ b/src/burn/drv/taito/d_asuka.cpp @@ -1214,11 +1214,11 @@ static void Cadash68KSetup() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1, 0x100000, 0x107fff, MAP_RAM); - SekMapMemory(Taito68KRam2, 0x800000, 0x800fff, MAP_RAM); // Network RAM - SekMapMemory(PC090OJRam, 0xb00000, 0xb03fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0], 0xc00000, 0xc0ffff, MAP_READ); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1, 0x100000, 0x107fff, SM_RAM); + SekMapMemory(Taito68KRam2, 0x800000, 0x800fff, SM_RAM); // Network RAM + SekMapMemory(PC090OJRam, 0xb00000, 0xb03fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0], 0xc00000, 0xc0ffff, SM_READ); SekSetWriteByteHandler(0, cadash_write_byte); SekSetWriteWordHandler(0, cadash_write_word); SekSetReadByteHandler(0, cadash_read_byte); @@ -1230,12 +1230,12 @@ static void Eto68KSetup() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRom1 + 0x40000, 0x080000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1, 0x200000, 0x203fff, MAP_RAM); - SekMapMemory(PC090OJRam, 0xc00000, 0xc03fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] + 0x4000, 0xc04000, 0xc0ffff, MAP_READ); // mirror - SekMapMemory(TC0100SCNRam[0], 0xd00000, 0xd0ffff, MAP_READ); + SekMapMemory(Taito68KRom1, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRom1 + 0x40000, 0x080000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1, 0x200000, 0x203fff, SM_RAM); + SekMapMemory(PC090OJRam, 0xc00000, 0xc03fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] + 0x4000, 0xc04000, 0xc0ffff, SM_READ); // mirror + SekMapMemory(TC0100SCNRam[0], 0xd00000, 0xd0ffff, SM_READ); SekSetWriteByteHandler(0, eto_write_byte); SekSetWriteWordHandler(0, eto_write_word); SekSetReadByteHandler(0, eto_read_byte); @@ -1247,11 +1247,11 @@ static void Asuka68KSetup() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRom1 + 0x40000, 0x080000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0], 0xc00000, 0xc0ffff, MAP_READ); - SekMapMemory(PC090OJRam, 0xd00000, 0xd03fff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRom1 + 0x40000, 0x080000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0], 0xc00000, 0xc0ffff, SM_READ); + SekMapMemory(PC090OJRam, 0xd00000, 0xd03fff, SM_RAM); SekSetWriteByteHandler(0, asuka_write_byte); SekSetWriteWordHandler(0, asuka_write_word); SekSetReadByteHandler(0, asuka_read_byte); @@ -1263,11 +1263,11 @@ static void Bonze68KSetup() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRom1 + 0x40000, 0x080000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1, 0x10c000, 0x10ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0], 0xc00000, 0xc0ffff, MAP_READ); - SekMapMemory(PC090OJRam, 0xd00000, 0xd03fff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRom1 + 0x40000, 0x080000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1, 0x10c000, 0x10ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0], 0xc00000, 0xc0ffff, SM_READ); + SekMapMemory(PC090OJRam, 0xd00000, 0xd03fff, SM_RAM); SekSetWriteByteHandler(0, bonze_write_byte); SekSetWriteWordHandler(0, bonze_write_word); SekSetReadByteHandler(0, bonze_read_byte); diff --git a/src/burn/drv/taito/d_bublbobl.cpp b/src/burn/drv/taito/d_bublbobl.cpp index d6ee4bc83..07b806474 100644 --- a/src/burn/drv/taito/d_bublbobl.cpp +++ b/src/burn/drv/taito/d_bublbobl.cpp @@ -1867,7 +1867,7 @@ static INT32 MachineInit() if (DrvMCUInUse == 1) { M6801Init(1); - M6801MapMemory(DrvMcuRom, 0xf000, 0xffff, MAP_ROM); + M6801MapMemory(DrvMcuRom, 0xf000, 0xffff, M6801_ROM); M6801SetReadHandler(BublboblMcuReadByte); M6801SetWriteHandler(BublboblMcuWriteByte); } else if (DrvMCUInUse == 2) { diff --git a/src/burn/drv/taito/d_darius2.cpp b/src/burn/drv/taito/d_darius2.cpp index 85d2dc01a..a94e6b853 100644 --- a/src/burn/drv/taito/d_darius2.cpp +++ b/src/burn/drv/taito/d_darius2.cpp @@ -1382,13 +1382,13 @@ static INT32 Darius2Init() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0bffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x0c0000, 0x0cffff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x240000, 0x24ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x260000, 0x263fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x280000, 0x293fff, MAP_READ); - SekMapMemory(TC0100SCNRam[1] , 0x2c0000, 0x2d3fff, MAP_READ); - SekMapMemory(TC0100SCNRam[2] , 0x300000, 0x313fff, MAP_READ); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0bffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x0c0000, 0x0cffff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x240000, 0x24ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x260000, 0x263fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x280000, 0x293fff, SM_READ); + SekMapMemory(TC0100SCNRam[1] , 0x2c0000, 0x2d3fff, SM_READ); + SekMapMemory(TC0100SCNRam[2] , 0x300000, 0x313fff, SM_READ); SekSetReadByteHandler(0, Darius268K1ReadByte); SekSetWriteByteHandler(0, Darius268K1WriteByte); SekSetReadWordHandler(0, Darius268K1ReadWord); @@ -1397,11 +1397,11 @@ static INT32 Darius2Init() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x080000, 0x08ffff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x240000, 0x24ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x260000, 0x263fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x280000, 0x293fff, MAP_READ); + SekMapMemory(Taito68KRom2 , 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x080000, 0x08ffff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x240000, 0x24ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x260000, 0x263fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x280000, 0x293fff, SM_READ); SekSetReadByteHandler(0, Darius268K2ReadByte); SekSetWriteByteHandler(0, Darius268K2WriteByte); SekSetReadWordHandler(0, Darius268K2ReadWord); @@ -1494,11 +1494,11 @@ static INT32 Darius2dInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x200000, 0x213fff, MAP_READ); - SekMapMemory(TC0100SCNRam[1] , 0x240000, 0x253fff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x600000, 0x6013ff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x200000, 0x213fff, SM_READ); + SekMapMemory(TC0100SCNRam[1] , 0x240000, 0x253fff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x600000, 0x6013ff, SM_RAM); SekSetReadByteHandler(0, Darius2d68KReadByte); SekSetWriteByteHandler(0, Darius2d68KWriteByte); SekSetReadWordHandler(0, Darius2d68KReadWord); @@ -1606,11 +1606,11 @@ static INT32 WarriorbInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x1fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x200000, 0x213fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x300000, 0x313fff, MAP_READ); - SekMapMemory(TC0100SCNRam[1] , 0x340000, 0x353fff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x600000, 0x6013ff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x1fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x200000, 0x213fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x300000, 0x313fff, SM_READ); + SekMapMemory(TC0100SCNRam[1] , 0x340000, 0x353fff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x600000, 0x6013ff, SM_RAM); SekSetReadByteHandler(0, Warriorb68KReadByte); SekSetWriteByteHandler(0, Warriorb68KWriteByte); SekSetReadWordHandler(0, Warriorb68KReadWord); diff --git a/src/burn/drv/taito/d_darkmist.cpp b/src/burn/drv/taito/d_darkmist.cpp index a4f26b78d..b638b991f 100644 --- a/src/burn/drv/taito/d_darkmist.cpp +++ b/src/burn/drv/taito/d_darkmist.cpp @@ -137,7 +137,7 @@ static void bankswitch(INT32 data) INT32 nBank = (data & 0x80) ? 0x14000 : 0x10000; - ZetMapMemory(DrvZ80ROM + nBank, 0x8000, 0xbfff, MAP_ROM); + ZetMapMemory(DrvZ80ROM + nBank, 0x8000, 0xbfff, ZET_ROM); } static void __fastcall darkmist_main_write(UINT16 address, UINT8 data) @@ -498,13 +498,13 @@ static INT32 DrvInit() ZetInit(0); ZetOpen(0); - ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, MAP_ROM); - ZetMapMemory(DrvZ80ROMDec, 0x0000, 0x7fff, MAP_FETCHOP); - ZetMapMemory(DrvPalRAM, 0xd000, 0xd3ff, MAP_ROM); - ZetMapMemory(DrvScrollRAM, 0xd400, 0xd4ff, MAP_RAM); - ZetMapMemory(DrvVidRAM, 0xd800, 0xdfff, MAP_RAM); - ZetMapMemory(DrvZ80RAM, 0xe000, 0xefff, MAP_RAM); - ZetMapMemory(DrvSprRAM, 0xf000, 0xffff, MAP_RAM); + ZetMapMemory(DrvZ80ROM, 0x0000, 0x7fff, ZET_ROM); + ZetMapMemory(DrvZ80ROMDec, 0x0000, 0x7fff, ZET_FETCHOP); + ZetMapMemory(DrvPalRAM, 0xd000, 0xd3ff, ZET_ROM); + ZetMapMemory(DrvScrollRAM, 0xd400, 0xd4ff, ZET_RAM); + ZetMapMemory(DrvVidRAM, 0xd800, 0xdfff, ZET_RAM); + ZetMapMemory(DrvZ80RAM, 0xe000, 0xefff, ZET_RAM); + ZetMapMemory(DrvSprRAM, 0xf000, 0xffff, ZET_RAM); ZetSetWriteHandler(darkmist_main_write); ZetSetReadHandler(darkmist_main_read); ZetClose(); diff --git a/src/burn/drv/taito/d_lkage.cpp b/src/burn/drv/taito/d_lkage.cpp index dc92019be..f63e1f635 100644 --- a/src/burn/drv/taito/d_lkage.cpp +++ b/src/burn/drv/taito/d_lkage.cpp @@ -872,7 +872,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == 99) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == 99) ZetRaiseIrq(0); ZetClose(); // Run Z80 #2 diff --git a/src/burn/drv/taito/d_othunder.cpp b/src/burn/drv/taito/d_othunder.cpp index 361cbb45e..15253534d 100644 --- a/src/burn/drv/taito/d_othunder.cpp +++ b/src/burn/drv/taito/d_othunder.cpp @@ -815,10 +815,10 @@ static INT32 OthunderInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x080000, 0x08ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x200000, 0x20ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x400000, 0x4005ff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x080000, 0x08ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x200000, 0x20ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x400000, 0x4005ff, SM_RAM); SekSetReadWordHandler(0, Othunder68KReadWord); SekSetWriteWordHandler(0, Othunder68KWriteWord); SekSetReadByteHandler(0, Othunder68KReadByte); diff --git a/src/burn/drv/taito/d_slapshot.cpp b/src/burn/drv/taito/d_slapshot.cpp index b1b43bef4..c538b0158 100644 --- a/src/burn/drv/taito/d_slapshot.cpp +++ b/src/burn/drv/taito/d_slapshot.cpp @@ -521,12 +521,12 @@ static INT32 MachineInit() SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, Taito68KRom1Size - 1, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x500000, 0x50ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x600000, 0x60ffff, MAP_RAM); - SekMapMemory(TaitoSpriteExtension , 0x700000, 0x701fff, MAP_RAM); - SekMapMemory(TC0480SCPRam , 0x800000, 0x80ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x900000, 0x907fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, Taito68KRom1Size - 1, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x500000, 0x50ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x600000, 0x60ffff, SM_RAM); + SekMapMemory(TaitoSpriteExtension , 0x700000, 0x701fff, SM_RAM); + SekMapMemory(TC0480SCPRam , 0x800000, 0x80ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x900000, 0x907fff, SM_RAM); SekSetReadWordHandler(0, Slapshot68KReadWord); SekSetWriteWordHandler(0, Slapshot68KWriteWord); SekSetReadByteHandler(0, Slapshot68KReadByte); @@ -677,7 +677,7 @@ static INT32 Opwolf3Init() BurnFree(TempRom); SekOpen(0); - SekMapHandler(1, 0xe00000, 0xe00007, MAP_RAM); + SekMapHandler(1, 0xe00000, 0xe00007, SM_RAM); SekSetReadWordHandler(1, Opwolf3Gun68KReadWord); SekSetWriteWordHandler(1, Opwolf3Gun68KWriteWord); SekSetReadByteHandler(1, Opwolf3Gun68KReadByte); diff --git a/src/burn/drv/taito/d_superchs.cpp b/src/burn/drv/taito/d_superchs.cpp index 81bd7ffad..9c4ea028c 100644 --- a/src/burn/drv/taito/d_superchs.cpp +++ b/src/burn/drv/taito/d_superchs.cpp @@ -830,12 +830,12 @@ static INT32 SuperchsInit() SekInit(0, 0x68EC020); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x11ffff, MAP_RAM); - SekMapMemory(TC0480SCPRam , 0x180000, 0x18ffff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(TaitoF3SharedRam , 0x2c0000, 0x2c07ff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x280000, 0x287fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x11ffff, SM_RAM); + SekMapMemory(TC0480SCPRam , 0x180000, 0x18ffff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(TaitoF3SharedRam , 0x2c0000, 0x2c07ff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x280000, 0x287fff, SM_RAM); SekSetReadByteHandler(0, Superchs68K1ReadByte); SekSetWriteByteHandler(0, Superchs68K1WriteByte); SekSetReadWordHandler(0, Superchs68K1ReadWord); @@ -846,10 +846,10 @@ static INT32 SuperchsInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x800000, 0x80ffff, MAP_RAM); - SekMapMemory(Taito68KRam2 + 0x10000 , 0xa00000, 0xa001ff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x800000, 0x80ffff, SM_RAM); + SekMapMemory(Taito68KRam2 + 0x10000 , 0xa00000, 0xa001ff, SM_RAM); SekSetReadByteHandler(0, Superchs68K2ReadByte); SekSetWriteByteHandler(0, Superchs68K2WriteByte); SekSetReadWordHandler(0, Superchs68K2ReadWord); @@ -858,13 +858,13 @@ static INT32 SuperchsInit() SekInit(2, 0x68000); SekOpen(2); - SekMapMemory(TaitoF3SoundRam , 0x000000, 0x00ffff, MAP_RAM); - SekMapMemory(TaitoF3SoundRam , 0x010000, 0x01ffff, MAP_RAM); - SekMapMemory(TaitoF3SoundRam , 0x020000, 0x02ffff, MAP_RAM); - SekMapMemory(TaitoF3SoundRam , 0x030000, 0x03ffff, MAP_RAM); - SekMapMemory(Taito68KRom3 , 0xc00000, 0xc1ffff, MAP_ROM); - SekMapMemory(Taito68KRom3 + 0x20000 , 0xc20000, 0xc3ffff, MAP_ROM); - SekMapMemory(TaitoF3SoundRam , 0xff0000, 0xffffff, MAP_RAM); + SekMapMemory(TaitoF3SoundRam , 0x000000, 0x00ffff, SM_RAM); + SekMapMemory(TaitoF3SoundRam , 0x010000, 0x01ffff, SM_RAM); + SekMapMemory(TaitoF3SoundRam , 0x020000, 0x02ffff, SM_RAM); + SekMapMemory(TaitoF3SoundRam , 0x030000, 0x03ffff, SM_RAM); + SekMapMemory(Taito68KRom3 , 0xc00000, 0xc1ffff, SM_ROM); + SekMapMemory(Taito68KRom3 + 0x20000 , 0xc20000, 0xc3ffff, SM_ROM); + SekMapMemory(TaitoF3SoundRam , 0xff0000, 0xffffff, SM_RAM); SekSetReadByteHandler(0, TaitoF3Sound68KReadByte); SekSetWriteByteHandler(0, TaitoF3Sound68KWriteByte); SekSetReadWordHandler(0, TaitoF3Sound68KReadWord); diff --git a/src/burn/drv/taito/d_taitob.cpp b/src/burn/drv/taito/d_taitob.cpp index b6da17004..9ddc45053 100644 --- a/src/burn/drv/taito/d_taitob.cpp +++ b/src/burn/drv/taito/d_taitob.cpp @@ -2144,12 +2144,12 @@ static void NastarInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(TaitoPaletteRam, 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, MAP_RAM); - SekMapMemory(Taito68KRam1, 0x600000, 0x607fff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(TaitoPaletteRam, 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, SM_RAM); + SekMapMemory(Taito68KRam1, 0x600000, 0x607fff, SM_RAM); SekSetWriteByteHandler(0, rastsag2_write_byte); SekSetWriteWordHandler(0, rastsag2_write_word); SekSetReadByteHandler(0, rastsag2_read_byte); @@ -2202,12 +2202,12 @@ static void CrimecInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam, 0x800000, 0x801fff, MAP_RAM); - SekMapMemory(Taito68KRam1, 0xa00000, 0xa0ffff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, SM_RAM); + SekMapMemory(TaitoPaletteRam, 0x800000, 0x801fff, SM_RAM); + SekMapMemory(Taito68KRam1, 0xa00000, 0xa0ffff, SM_RAM); SekSetWriteByteHandler(0, crimec_write_byte); SekSetWriteWordHandler(0, crimec_write_word); SekSetReadByteHandler(0, crimec_read_byte); @@ -2319,12 +2319,12 @@ static void TetristInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, MAP_RAM); - SekMapMemory(Taito68KRam1, 0x800000, 0x807fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam, 0xa00000, 0xa01fff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, SM_RAM); + SekMapMemory(Taito68KRam1, 0x800000, 0x807fff, SM_RAM); + SekMapMemory(TaitoPaletteRam, 0xa00000, 0xa01fff, SM_RAM); SekSetWriteByteHandler(0, tetrist_write_byte); SekSetWriteWordHandler(0, tetrist_write_word); SekSetReadByteHandler(0, tetrist_read_byte); @@ -2420,12 +2420,12 @@ static void PbobbleInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam, 0x800000, 0x801fff, MAP_RAM); - SekMapMemory(Taito68KRam1, 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, SM_RAM); + SekMapMemory(TaitoPaletteRam, 0x800000, 0x801fff, SM_RAM); + SekMapMemory(Taito68KRam1, 0x900000, 0x90ffff, SM_RAM); SekSetWriteByteHandler(0, pbobble_write_byte); SekSetWriteWordHandler(0, pbobble_write_word); SekSetReadByteHandler(0, pbobble_read_byte); @@ -2483,12 +2483,12 @@ static void SelfeenaInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1, 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(TC0180VCURAM, 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x210000, 0x2137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x213800, 0x213fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam, 0x300000, 0x301fff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1, 0x100000, 0x103fff, SM_RAM); + SekMapMemory(TC0180VCURAM, 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x210000, 0x2137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x213800, 0x213fff, SM_RAM); + SekMapMemory(TaitoPaletteRam, 0x300000, 0x301fff, SM_RAM); SekSetWriteByteHandler(0, selfeena_write_byte); SekSetWriteWordHandler(0, selfeena_write_word); SekSetReadByteHandler(0, selfeena_read_byte); @@ -2545,12 +2545,12 @@ static void SbmInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1, 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam, 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0180VCURAM, 0x900000, 0x90ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x910000, 0x9137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x913800, 0x913fff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1, 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam, 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0180VCURAM, 0x900000, 0x90ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x910000, 0x9137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x913800, 0x913fff, SM_RAM); SekSetWriteByteHandler(0, sbm_write_byte); SekSetWriteWordHandler(0, sbm_write_word); SekSetReadByteHandler(0, sbm_read_byte); @@ -2612,12 +2612,12 @@ static void SilentdInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(TaitoPaletteRam, 0x300000, 0x301fff, MAP_RAM); - SekMapMemory(Taito68KRam1, 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(TC0180VCURAM, 0x500000, 0x50ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x510000, 0x5137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x513800, 0x513fff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(TaitoPaletteRam, 0x300000, 0x301fff, SM_RAM); + SekMapMemory(Taito68KRam1, 0x400000, 0x403fff, SM_RAM); + SekMapMemory(TC0180VCURAM, 0x500000, 0x50ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x510000, 0x5137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x513800, 0x513fff, SM_RAM); SekSetWriteByteHandler(0, silentd_write_byte); SekSetWriteWordHandler(0, silentd_write_word); SekSetReadByteHandler(0, silentd_read_byte); @@ -2671,12 +2671,12 @@ static void ViofightInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam, 0x600000, 0x601fff, MAP_RAM); - SekMapMemory(Taito68KRam1, 0xa00000, 0xa03fff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, SM_RAM); + SekMapMemory(TaitoPaletteRam, 0x600000, 0x601fff, SM_RAM); + SekMapMemory(Taito68KRam1, 0xa00000, 0xa03fff, SM_RAM); SekSetWriteByteHandler(0, viofight_write_byte); SekSetWriteWordHandler(0, viofight_write_word); SekSetReadByteHandler(0, viofight_read_byte); @@ -2770,13 +2770,13 @@ static void HiticeInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, MAP_RAM); - SekMapMemory(Taito68KRam1, 0x800000, 0x803fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam, 0xa00000, 0xa01fff, MAP_RAM); - SekMapMemory(DrvPxlRAM, 0xb00000, 0xb7ffff, MAP_ROM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, SM_RAM); + SekMapMemory(Taito68KRam1, 0x800000, 0x803fff, SM_RAM); + SekMapMemory(TaitoPaletteRam, 0xa00000, 0xa01fff, SM_RAM); + SekMapMemory(DrvPxlRAM, 0xb00000, 0xb7ffff, SM_ROM); SekSetWriteByteHandler(0, hitice_write_byte); SekSetWriteWordHandler(0, hitice_write_word); SekSetReadByteHandler(0, hitice_read_byte); @@ -2848,12 +2848,12 @@ static void TetristaInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(TaitoPaletteRam, 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, MAP_RAM); - SekMapMemory(Taito68KRam1, 0x800000, 0x803fff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(TaitoPaletteRam, 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, SM_RAM); + SekMapMemory(Taito68KRam1, 0x800000, 0x803fff, SM_RAM); SekSetWriteByteHandler(0, tetrista_write_byte); SekSetWriteWordHandler(0, tetrista_write_word); SekSetReadByteHandler(0, tetrista_read_byte); @@ -2865,12 +2865,12 @@ static void MasterwInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1, 0x200000, 0x203fff, MAP_RAM); - SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam, 0x600000, 0x601fff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1, 0x200000, 0x203fff, SM_RAM); + SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, SM_RAM); + SekMapMemory(TaitoPaletteRam, 0x600000, 0x601fff, SM_RAM); SekSetWriteByteHandler(0, tetrista_write_byte); SekSetWriteWordHandler(0, tetrista_write_word); SekSetReadByteHandler(0, tetrista_read_byte); @@ -2956,12 +2956,12 @@ static void QzshowbyInitCallback() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1, 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, MAP_RAM); - SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam, 0x800000, 0x801fff, MAP_RAM); - SekMapMemory(Taito68KRam1, 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1, 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(TC0180VCURAM, 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam, 0x410000, 0x4137ff, SM_RAM); + SekMapMemory(TC0180VCUScrollRAM, 0x413800, 0x413fff, SM_RAM); + SekMapMemory(TaitoPaletteRam, 0x800000, 0x801fff, SM_RAM); + SekMapMemory(Taito68KRam1, 0x900000, 0x90ffff, SM_RAM); SekSetWriteByteHandler(0, qzshowby_write_byte); SekSetWriteWordHandler(0, qzshowby_write_word); SekSetReadByteHandler(0, qzshowby_read_byte); diff --git a/src/burn/drv/taito/d_taitof2.cpp b/src/burn/drv/taito/d_taitof2.cpp index 58eeb1067..225000217 100644 --- a/src/burn/drv/taito/d_taitof2.cpp +++ b/src/burn/drv/taito/d_taitof2.cpp @@ -5257,7 +5257,7 @@ void __fastcall Driveout68KWriteByte(UINT32 a, UINT8 d) } else { TaitoSoundLatch = ((d << 4) & 0xf0) | (TaitoSoundLatch & 0x0f); ZetOpen(0); - ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0); ZetClose(); } return; @@ -7561,12 +7561,12 @@ static INT32 CameltryInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x813fff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); - SekMapMemory(TC0280GRDRam , 0xa00000, 0xa01fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x813fff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); + SekMapMemory(TC0280GRDRam , 0xa00000, 0xa01fff, SM_RAM); SekSetReadByteHandler(0, Cameltry68KReadByte); SekSetWriteByteHandler(0, Cameltry68KWriteByte); SekSetReadWordHandler(0, Cameltry68KReadWord); @@ -7628,12 +7628,12 @@ static INT32 CamltryaInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x813fff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); - SekMapMemory(TC0280GRDRam , 0xa00000, 0xa01fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x813fff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); + SekMapMemory(TC0280GRDRam , 0xa00000, 0xa01fff, SM_RAM); SekSetReadByteHandler(0, Cameltry68KReadByte); SekSetWriteByteHandler(0, Cameltry68KWriteByte); SekSetReadWordHandler(0, Cameltry68KReadWord); @@ -7723,11 +7723,11 @@ static INT32 DeadconxInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(TC0480SCPRam , 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x600000, 0x601fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(TC0480SCPRam , 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x600000, 0x601fff, SM_RAM); SekSetReadByteHandler(0, Deadconx68KReadByte); SekSetWriteByteHandler(0, Deadconx68KWriteByte); SekSetReadWordHandler(0, Deadconx68KReadWord); @@ -7776,12 +7776,12 @@ static INT32 DinorexInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x2fffff, MAP_ROM); - SekMapMemory(TaitoSpriteExtension , 0x400000, 0x400fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x500000, 0x501fff, MAP_RAM); - SekMapMemory(Taito68KRam1 , 0x600000, 0x60ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x800000, 0x80ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x900000, 0x90ffff, MAP_READ); + SekMapMemory(Taito68KRom1 , 0x000000, 0x2fffff, SM_ROM); + SekMapMemory(TaitoSpriteExtension , 0x400000, 0x400fff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x500000, 0x501fff, SM_RAM); + SekMapMemory(Taito68KRam1 , 0x600000, 0x60ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x800000, 0x80ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x900000, 0x90ffff, SM_READ); SekSetReadByteHandler(0, Dinorex68KReadByte); SekSetWriteByteHandler(0, Dinorex68KWriteByte); SekSetReadWordHandler(0, Dinorex68KReadWord); @@ -7840,12 +7840,12 @@ static INT32 DondokodInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); - SekMapMemory(TC0280GRDRam , 0xa00000, 0xa01fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); + SekMapMemory(TC0280GRDRam , 0xa00000, 0xa01fff, SM_RAM); SekSetReadByteHandler(0, Dondokod68KReadByte); SekSetWriteByteHandler(0, Dondokod68KWriteByte); SekSetReadWordHandler(0, Dondokod68KReadWord); @@ -7903,12 +7903,12 @@ static INT32 DriftoutInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(TC0430GRWRam , 0x400000, 0x401fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(TC0430GRWRam , 0x400000, 0x401fff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Driftout68KReadByte); SekSetWriteByteHandler(0, Driftout68KWriteByte); SekSetReadWordHandler(0, Driftout68KReadWord); @@ -7982,12 +7982,12 @@ static INT32 DriveoutInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(TC0430GRWRam , 0x400000, 0x401fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(TC0430GRWRam , 0x400000, 0x401fff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Driftout68KReadByte); SekSetWriteByteHandler(0, Driveout68KWriteByte); SekSetReadWordHandler(0, Driftout68KReadWord); @@ -8086,10 +8086,10 @@ static INT32 FinalbInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Finalb68KReadByte); SekSetWriteByteHandler(0, Finalb68KWriteByte); SekSetReadWordHandler(0, Finalb68KReadWord); @@ -8159,11 +8159,11 @@ static INT32 FootchmpInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(TC0480SCPRam , 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x600000, 0x601fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(TC0480SCPRam , 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x600000, 0x601fff, SM_RAM); SekSetReadByteHandler(0, Footchmp68KReadByte); SekSetWriteByteHandler(0, Footchmp68KWriteByte); SekSetReadWordHandler(0, Footchmp68KReadWord); @@ -8212,11 +8212,11 @@ static INT32 GrowlInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Growl68KReadByte); SekSetWriteByteHandler(0, Growl68KWriteByte); SekSetReadWordHandler(0, Growl68KReadWord); @@ -8264,11 +8264,11 @@ static INT32 GunfrontInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0bffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0bffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Gunfront68KReadByte); SekSetWriteByteHandler(0, Gunfront68KWriteByte); SekSetReadWordHandler(0, Gunfront68KReadWord); @@ -8316,12 +8316,12 @@ static INT32 KoshienInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRom1 + 0x40000 , 0x080000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRom1 + 0x40000 , 0x080000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Koshien68KReadByte); SekSetWriteByteHandler(0, Koshien68KWriteByte); SekSetReadWordHandler(0, Koshien68KReadWord); @@ -8368,11 +8368,11 @@ static INT32 LiquidkInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Liquidk68KReadByte); SekSetWriteByteHandler(0, Liquidk68KWriteByte); SekSetReadWordHandler(0, Liquidk68KReadWord); @@ -8420,12 +8420,12 @@ static INT32 MegablstInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x300000, 0x301fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x600000, 0x60ffff, MAP_READ); - SekMapMemory(Taito68KRam1 + 0x10000 , 0x610000, 0x61ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x800000, 0x80ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x300000, 0x301fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x600000, 0x60ffff, SM_READ); + SekMapMemory(Taito68KRam1 + 0x10000 , 0x610000, 0x61ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x800000, 0x80ffff, SM_RAM); SekSetReadByteHandler(0, Megablst68KReadByte); SekSetWriteByteHandler(0, Megablst68KWriteByte); SekSetReadWordHandler(0, Megablst68KReadWord); @@ -8484,11 +8484,11 @@ static INT32 MetalbInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0bffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(TC0480SCPRam , 0x500000, 0x50ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x700000, 0x703fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0bffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(TC0480SCPRam , 0x500000, 0x50ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x700000, 0x703fff, SM_RAM); SekSetReadByteHandler(0, Metalb68KReadByte); SekSetWriteByteHandler(0, Metalb68KWriteByte); SekSetReadWordHandler(0, Metalb68KReadWord); @@ -8550,11 +8550,11 @@ static INT32 MjnquestInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRom1 + 0x40000 , 0x080000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x110000, 0x12ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x500000, 0x50ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRom1 + 0x40000 , 0x080000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x110000, 0x12ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x500000, 0x50ffff, SM_RAM); SekSetReadByteHandler(0, Mjnquest68KReadByte); SekSetWriteByteHandler(0, Mjnquest68KWriteByte); SekSetReadWordHandler(0, Mjnquest68KReadWord); @@ -8600,11 +8600,11 @@ static INT32 NinjakInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Ninjak68KReadByte); SekSetWriteByteHandler(0, Ninjak68KWriteByte); SekSetReadWordHandler(0, Ninjak68KReadWord); @@ -8660,13 +8660,13 @@ static INT32 PulirulaInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0bffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(TC0430GRWRam , 0x400000, 0x401fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteExtension , 0x600000, 0x603fff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0bffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(TC0430GRWRam , 0x400000, 0x401fff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteExtension , 0x600000, 0x603fff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Pulirula68KReadByte); SekSetWriteByteHandler(0, Pulirula68KWriteByte); SekSetReadWordHandler(0, Pulirula68KReadWord); @@ -8716,13 +8716,13 @@ static INT32 QcrayonInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(Taito68KRom1 + 0x80000 , 0x300000, 0x3fffff, MAP_ROM); - SekMapMemory(TaitoSpriteExtension , 0x600000, 0x603fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x800000, 0x80ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x900000, 0x90ffff, MAP_READ); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(Taito68KRom1 + 0x80000 , 0x300000, 0x3fffff, SM_ROM); + SekMapMemory(TaitoSpriteExtension , 0x600000, 0x603fff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x800000, 0x80ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x900000, 0x90ffff, SM_READ); SekSetReadByteHandler(0, Qcrayon68KReadByte); SekSetWriteByteHandler(0, Qcrayon68KWriteByte); SekSetReadWordHandler(0, Qcrayon68KReadWord); @@ -8771,13 +8771,13 @@ static INT32 Qcrayon2Init() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x300000, 0x301fff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x500000, 0x50ffff, MAP_READ); - SekMapMemory(Taito68KRom1 + 0x80000 , 0x600000, 0x6fffff, MAP_ROM); - SekMapMemory(TaitoSpriteExtension , 0xb00000, 0xb017ff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x300000, 0x301fff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x500000, 0x50ffff, SM_READ); + SekMapMemory(Taito68KRom1 + 0x80000 , 0x600000, 0x6fffff, SM_ROM); + SekMapMemory(TaitoSpriteExtension , 0xb00000, 0xb017ff, SM_RAM); SekSetReadByteHandler(0, Qcrayon268KReadByte); SekSetWriteByteHandler(0, Qcrayon268KWriteByte); SekSetReadWordHandler(0, Qcrayon268KReadWord); @@ -8826,13 +8826,13 @@ static INT32 QjinseiInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRom1 + 0x80000 , 0x100000, 0x1fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(TaitoSpriteExtension , 0x600000, 0x603fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRom1 + 0x80000 , 0x100000, 0x1fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(TaitoSpriteExtension , 0x600000, 0x603fff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Qjinsei68KReadByte); SekSetWriteByteHandler(0, Qjinsei68KWriteByte); SekSetReadWordHandler(0, Qjinsei68KReadWord); @@ -8880,10 +8880,10 @@ static INT32 QtorimonInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Qtorimon68KReadByte); SekSetWriteByteHandler(0, Qtorimon68KWriteByte); SekSetReadWordHandler(0, Qtorimon68KReadWord); @@ -8935,10 +8935,10 @@ static INT32 QuizhqInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x0bffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x0bffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Quizhq68KReadByte); SekSetWriteByteHandler(0, Quizhq68KWriteByte); SekSetReadWordHandler(0, Quizhq68KReadWord); @@ -8986,12 +8986,12 @@ static INT32 QzchikyuInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRom1 + 0x40000 , 0x100000, 0x17ffff, MAP_ROM); - SekMapMemory(TaitoPaletteRam , 0x400000, 0x401fff, MAP_RAM); - SekMapMemory(Taito68KRam1 , 0x500000, 0x50ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x600000, 0x60ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x700000, 0x70ffff, MAP_READ); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRom1 + 0x40000 , 0x100000, 0x17ffff, SM_ROM); + SekMapMemory(TaitoPaletteRam , 0x400000, 0x401fff, SM_RAM); + SekMapMemory(Taito68KRam1 , 0x500000, 0x50ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x600000, 0x60ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x700000, 0x70ffff, SM_READ); SekSetReadByteHandler(0, Qzchikyu68KReadByte); SekSetWriteByteHandler(0, Qzchikyu68KWriteByte); SekSetReadWordHandler(0, Qzchikyu68KReadWord); @@ -9039,12 +9039,12 @@ static INT32 QzquestInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRom1 + 0x40000 , 0x100000, 0x1fffff, MAP_ROM); - SekMapMemory(TaitoPaletteRam , 0x400000, 0x401fff, MAP_RAM); - SekMapMemory(Taito68KRam1 , 0x500000, 0x50ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x600000, 0x60ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x700000, 0x70ffff, MAP_READ); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRom1 + 0x40000 , 0x100000, 0x1fffff, SM_ROM); + SekMapMemory(TaitoPaletteRam , 0x400000, 0x401fff, SM_RAM); + SekMapMemory(Taito68KRam1 , 0x500000, 0x50ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x600000, 0x60ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x700000, 0x70ffff, SM_READ); SekSetReadByteHandler(0, Qzquest68KReadByte); SekSetWriteByteHandler(0, Qzquest68KWriteByte); SekSetReadWordHandler(0, Qzquest68KReadWord); @@ -9092,11 +9092,11 @@ static INT32 SolfigtrInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x201fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); SekSetReadByteHandler(0, Solfigtr68KReadByte); SekSetWriteByteHandler(0, Solfigtr68KWriteByte); SekSetReadWordHandler(0, Solfigtr68KReadWord); @@ -9142,11 +9142,11 @@ static INT32 SsiInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x300000, 0x301fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x600000, 0x60ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x800000, 0x80ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x300000, 0x301fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x600000, 0x60ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x800000, 0x80ffff, SM_RAM); SekSetReadByteHandler(0, Ssi68KReadByte); SekSetWriteByteHandler(0, Ssi68KWriteByte); SekSetReadWordHandler(0, Ssi68KReadWord); @@ -9209,12 +9209,12 @@ static INT32 ThundfoxInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(TaitoPaletteRam , 0x100000, 0x101fff, MAP_RAM); - SekMapMemory(Taito68KRam1 , 0x300000, 0x30ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x400000, 0x40ffff, MAP_READ); - SekMapMemory(TC0100SCNRam[1] , 0x500000, 0x50ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x600000, 0x60ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(TaitoPaletteRam , 0x100000, 0x101fff, SM_RAM); + SekMapMemory(Taito68KRam1 , 0x300000, 0x30ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x400000, 0x40ffff, SM_READ); + SekMapMemory(TC0100SCNRam[1] , 0x500000, 0x50ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x600000, 0x60ffff, SM_RAM); SekSetReadByteHandler(0, Thundfox68KReadByte); SekSetWriteByteHandler(0, Thundfox68KWriteByte); SekSetReadWordHandler(0, Thundfox68KReadWord); @@ -9270,11 +9270,11 @@ static INT32 YesnojInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x200000, 0x20ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x500000, 0x50ffff, MAP_READ); - SekMapMemory(TaitoPaletteRam , 0x600000, 0x601fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x200000, 0x20ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x500000, 0x50ffff, SM_READ); + SekMapMemory(TaitoPaletteRam , 0x600000, 0x601fff, SM_RAM); SekSetReadByteHandler(0, Yesnoj68KReadByte); SekSetWriteByteHandler(0, Yesnoj68KWriteByte); SekSetReadWordHandler(0, Yesnoj68KReadWord); @@ -9330,13 +9330,13 @@ static INT32 YuyugogoInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0xa00000, 0xa01fff, MAP_RAM); - SekMapMemory(Taito68KRam1 , 0xb00000, 0xb10fff, MAP_RAM); - SekMapMemory(TaitoSpriteExtension , 0xc00000, 0xc01fff, MAP_RAM); - SekMapMemory(Taito68KRom1 + 0x40000 , 0xd00000, 0xdfffff, MAP_ROM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(TC0100SCNRam[0] , 0x800000, 0x80ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0x900000, 0x90ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0xa00000, 0xa01fff, SM_RAM); + SekMapMemory(Taito68KRam1 , 0xb00000, 0xb10fff, SM_RAM); + SekMapMemory(TaitoSpriteExtension , 0xc00000, 0xc01fff, SM_RAM); + SekMapMemory(Taito68KRom1 + 0x40000 , 0xd00000, 0xdfffff, SM_ROM); SekSetReadByteHandler(0, Yuyugogo68KReadByte); SekSetWriteByteHandler(0, Yuyugogo68KWriteByte); SekSetReadWordHandler(0, Yuyugogo68KReadWord); diff --git a/src/burn/drv/taito/d_taitomisc.cpp b/src/burn/drv/taito/d_taitomisc.cpp index 1f17c9761..a4f288aa4 100644 --- a/src/burn/drv/taito/d_taitomisc.cpp +++ b/src/burn/drv/taito/d_taitomisc.cpp @@ -4326,14 +4326,14 @@ static INT32 DariusInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x080000, 0x08ffff, MAP_RAM); - SekMapMemory(PC080SNRam[0] , 0xd00000, 0xd0ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0xd80000, 0xd80fff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0xe00100, 0xe00fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0xe01000, 0xe02fff, MAP_RAM); - SekMapMemory(TaitoVideoRam , 0xe08000, 0xe0ffff, MAP_RAM); - SekMapMemory(Taito68KRam1 + 0x10000 , 0xe10000, 0xe10fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x080000, 0x08ffff, SM_RAM); + SekMapMemory(PC080SNRam[0] , 0xd00000, 0xd0ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0xd80000, 0xd80fff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0xe00100, 0xe00fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0xe01000, 0xe02fff, SM_RAM); + SekMapMemory(TaitoVideoRam , 0xe08000, 0xe0ffff, SM_RAM); + SekMapMemory(Taito68KRam1 + 0x10000 , 0xe10000, 0xe10fff, SM_RAM); SekSetReadByteHandler(0, Darius68K1ReadByte); SekSetWriteByteHandler(0, Darius68K1WriteByte); SekSetReadWordHandler(0, Darius68K1ReadWord); @@ -4342,12 +4342,12 @@ static INT32 DariusInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x040000, 0x04ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0xd80000, 0xd80fff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0xe00100, 0xe00fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0xe01000, 0xe02fff, MAP_RAM); - SekMapMemory(TaitoVideoRam , 0xe08000, 0xe0ffff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x040000, 0x04ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0xd80000, 0xd80fff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0xe00100, 0xe00fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0xe01000, 0xe02fff, SM_RAM); + SekMapMemory(TaitoVideoRam , 0xe08000, 0xe0ffff, SM_RAM); SekSetReadByteHandler(0, Darius68K2ReadByte); SekSetWriteByteHandler(0, Darius68K2WriteByte); SekSetReadWordHandler(0, Darius68K2ReadWord); @@ -4450,12 +4450,12 @@ static INT32 OpwolfInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x107fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(PC080SNRam[0] , 0xc00000, 0xc0ffff, MAP_RAM); - SekMapMemory(Taito68KRam1 + 0x8000 , 0xc10000, 0xc1ffff, MAP_RAM); - SekMapMemory(PC090OJRam , 0xd00000, 0xd03fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x107fff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x200fff, SM_RAM); + SekMapMemory(PC080SNRam[0] , 0xc00000, 0xc0ffff, SM_RAM); + SekMapMemory(Taito68KRam1 + 0x8000 , 0xc10000, 0xc1ffff, SM_RAM); + SekMapMemory(PC090OJRam , 0xd00000, 0xd03fff, SM_RAM); SekSetReadByteHandler(0, Opwolf68KReadByte); SekSetWriteByteHandler(0, Opwolf68KWriteByte); SekSetReadWordHandler(0, Opwolf68KReadWord); @@ -4557,12 +4557,12 @@ static INT32 OpwolfbInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x107fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(PC080SNRam[0] , 0xc00000, 0xc0ffff, MAP_RAM); - SekMapMemory(Taito68KRam1 + 0x8000 , 0xc10000, 0xc1ffff, MAP_RAM); - SekMapMemory(PC090OJRam , 0xd00000, 0xd03fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x107fff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x200fff, SM_RAM); + SekMapMemory(PC080SNRam[0] , 0xc00000, 0xc0ffff, SM_RAM); + SekMapMemory(Taito68KRam1 + 0x8000 , 0xc10000, 0xc1ffff, SM_RAM); + SekMapMemory(PC090OJRam , 0xd00000, 0xd03fff, SM_RAM); SekSetReadByteHandler(0, Opwolfb68KReadByte); SekSetWriteByteHandler(0, Opwolfb68KWriteByte); SekSetReadWordHandler(0, Opwolfb68KReadWord); @@ -4672,12 +4672,12 @@ static INT32 RbislandInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x10c000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(Taito68KRam1 + 0x4000 , 0x201000, 0x203fff, MAP_RAM); - SekMapMemory(PC080SNRam[0] , 0xc00000, 0xc0ffff, MAP_RAM); - SekMapMemory(PC090OJRam , 0xd00000, 0xd03fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x10c000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x200fff, SM_RAM); + SekMapMemory(Taito68KRam1 + 0x4000 , 0x201000, 0x203fff, SM_RAM); + SekMapMemory(PC080SNRam[0] , 0xc00000, 0xc0ffff, SM_RAM); + SekMapMemory(PC090OJRam , 0xd00000, 0xd03fff, SM_RAM); SekSetReadByteHandler(0, Rbisland68KReadByte); SekSetWriteByteHandler(0, Rbisland68KWriteByte); SekSetReadWordHandler(0, Rbisland68KReadWord); @@ -4772,13 +4772,13 @@ static INT32 JumpingInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x09ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x10c000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(Taito68KRam1 + 0x4000 , 0x201000, 0x203fff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x440000, 0x4407ff, MAP_RAM); - SekMapMemory(PC080SNRam[0] , 0xc00000, 0xc0ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam + 0x800 , 0xd00000, 0xd01fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x09ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x10c000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x200fff, SM_RAM); + SekMapMemory(Taito68KRam1 + 0x4000 , 0x201000, 0x203fff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x440000, 0x4407ff, SM_RAM); + SekMapMemory(PC080SNRam[0] , 0xc00000, 0xc0ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam + 0x800 , 0xd00000, 0xd01fff, SM_RAM); SekSetReadByteHandler(0, Jumping68KReadByte); SekSetWriteByteHandler(0, Jumping68KWriteByte); SekSetReadWordHandler(0, Jumping68KReadWord); @@ -4867,11 +4867,11 @@ static INT32 RastanInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x05ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x10c000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x200000, 0x200fff, MAP_RAM); - SekMapMemory(PC080SNRam[0] , 0xc00000, 0xc0ffff, MAP_RAM); - SekMapMemory(PC090OJRam , 0xd00000, 0xd03fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x05ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x10c000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x200000, 0x200fff, SM_RAM); + SekMapMemory(PC080SNRam[0] , 0xc00000, 0xc0ffff, SM_RAM); + SekMapMemory(PC090OJRam , 0xd00000, 0xd03fff, SM_RAM); SekSetReadByteHandler(0, Rastan68KReadByte); SekSetWriteByteHandler(0, Rastan68KWriteByte); SekSetWriteWordHandler(0, Rastan68KWriteWord); @@ -4962,15 +4962,15 @@ static INT32 TopspeedInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(Taito68KRom1 + 0x20000 , 0x080000, 0x0fffff, MAP_ROM); - SekMapMemory(TaitoSharedRam , 0x400000, 0x40ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x500000, 0x503fff, MAP_RAM); - SekMapMemory(Taito68KRam1 , 0x800000, 0x80ffff, MAP_RAM); - SekMapMemory(PC080SNRam[0] , 0xa00000, 0xa0ffff, MAP_RAM); - SekMapMemory(PC080SNRam[1] , 0xb00000, 0xb0ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0xd00000, 0xd00fff, MAP_RAM); - SekMapMemory(TaitoVideoRam , 0xe00000, 0xe0ffff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(Taito68KRom1 + 0x20000 , 0x080000, 0x0fffff, SM_ROM); + SekMapMemory(TaitoSharedRam , 0x400000, 0x40ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x500000, 0x503fff, SM_RAM); + SekMapMemory(Taito68KRam1 , 0x800000, 0x80ffff, SM_RAM); + SekMapMemory(PC080SNRam[0] , 0xa00000, 0xa0ffff, SM_RAM); + SekMapMemory(PC080SNRam[1] , 0xb00000, 0xb0ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0xd00000, 0xd00fff, SM_RAM); + SekMapMemory(TaitoVideoRam , 0xe00000, 0xe0ffff, SM_RAM); SekSetReadByteHandler(0, Topspeed68K1ReadByte); SekSetWriteByteHandler(0, Topspeed68K1WriteByte); SekSetReadWordHandler(0, Topspeed68K1ReadWord); @@ -4979,8 +4979,8 @@ static INT32 TopspeedInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(TaitoSharedRam , 0x400000, 0x40ffff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(TaitoSharedRam , 0x400000, 0x40ffff, SM_RAM); SekSetReadByteHandler(0, Topspeed68K2ReadByte); SekSetWriteByteHandler(0, Topspeed68K2WriteByte); SekSetReadWordHandler(0, Topspeed68K2ReadWord); @@ -5063,12 +5063,12 @@ static INT32 VolfiedInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRom1 + 0x40000 , 0x080000, 0x0fffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(PC090OJRam , 0x200000, 0x203fff, MAP_RAM); - SekMapMemory(TaitoVideoRam , 0x400000, 0x47ffff, MAP_READ); - SekMapMemory(TaitoPaletteRam , 0x500000, 0x503fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRom1 + 0x40000 , 0x080000, 0x0fffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(PC090OJRam , 0x200000, 0x203fff, SM_RAM); + SekMapMemory(TaitoVideoRam , 0x400000, 0x47ffff, SM_READ); + SekMapMemory(TaitoPaletteRam , 0x500000, 0x503fff, SM_RAM); SekSetReadByteHandler(0, Volfied68KReadByte); SekSetWriteByteHandler(0, Volfied68KWriteByte); SekSetReadWordHandler(0, Volfied68KReadWord); @@ -5687,7 +5687,7 @@ static INT32 TaitoMiscFrame() nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesSegment = ZetRun(nTaitoCyclesSegment); nTaitoCyclesDone[nCurrentCPU] += nTaitoCyclesSegment; - if (i == 9) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == 9) ZetRaiseIrq(0); ZetClose(); } diff --git a/src/burn/drv/taito/d_taitox.cpp b/src/burn/drv/taito/d_taitox.cpp index 78b9233ac..7da6f4602 100644 --- a/src/burn/drv/taito/d_taitox.cpp +++ b/src/burn/drv/taito/d_taitox.cpp @@ -1158,11 +1158,11 @@ static INT32 TaitoXInit(INT32 nSoundType) // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, Taito68KRom1Size - 1, MAP_ROM); - SekMapMemory(TaitoPaletteRam , 0xb00000, 0xb00fff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0xd00000, 0xd007ff, MAP_RAM); - SekMapMemory(TaitoSpriteRam2 , 0xe00000, 0xe03fff, MAP_RAM); - SekMapMemory(Taito68KRam1 , 0xf00000, 0xf03fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, Taito68KRom1Size - 1, SM_ROM); + SekMapMemory(TaitoPaletteRam , 0xb00000, 0xb00fff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0xd00000, 0xd007ff, SM_RAM); + SekMapMemory(TaitoSpriteRam2 , 0xe00000, 0xe03fff, SM_RAM); + SekMapMemory(Taito68KRam1 , 0xf00000, 0xf03fff, SM_RAM); SekSetReadByteHandler(0, TaitoX68KReadByte); SekSetWriteByteHandler(0, TaitoX68KWriteByte); SekSetReadWordHandler(0, TaitoX68KReadWord); diff --git a/src/burn/drv/taito/d_taitoz.cpp b/src/burn/drv/taito/d_taitoz.cpp index 2fd061518..3021521a2 100644 --- a/src/burn/drv/taito/d_taitoz.cpp +++ b/src/burn/drv/taito/d_taitoz.cpp @@ -4853,21 +4853,21 @@ static INT32 AquajackInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x104000, 0x107fff, MAP_RAM); - SekMapMemory(TC0150RODRam , 0x800000, 0x801fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0xa00000, 0xa0ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0xc40000, 0xc403ff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x104000, 0x107fff, SM_RAM); + SekMapMemory(TC0150RODRam , 0x800000, 0x801fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0xa00000, 0xa0ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0xc40000, 0xc403ff, SM_RAM); SekSetWriteByteHandler(0, Aquajack68K1WriteByte); SekSetWriteWordHandler(0, Aquajack68K1WriteWord); SekClose(); SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x104000, 0x107fff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x104000, 0x107fff, SM_RAM); SekSetReadWordHandler(0, Aquajack68K2ReadWord); SekSetWriteWordHandler(0, Aquajack68K2WriteWord); SekSetReadByteHandler(0, Aquajack68K2ReadByte); @@ -4948,12 +4948,12 @@ static INT32 BsharkInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x110000, 0x113fff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0xa00000, 0xa01fff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0xc00000, 0xc00fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0xd00000, 0xd0ffff, MAP_READ); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x110000, 0x113fff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0xa00000, 0xa01fff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0xc00000, 0xc00fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0xd00000, 0xd0ffff, SM_READ); SekSetWriteWordHandler(0, Bshark68K1WriteWord); SekSetReadByteHandler(0, Bshark68K1ReadByte); SekSetWriteByteHandler(0, Bshark68K1WriteByte); @@ -4961,10 +4961,10 @@ static INT32 BsharkInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x108000, 0x10bfff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x110000, 0x113fff, MAP_RAM); - SekMapMemory(TC0150RODRam , 0x800000, 0x801fff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x108000, 0x10bfff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x110000, 0x113fff, SM_RAM); + SekMapMemory(TC0150RODRam , 0x800000, 0x801fff, SM_RAM); SekSetReadWordHandler(0, Bshark68K2ReadWord); SekSetWriteWordHandler(0, Bshark68K2WriteWord); SekClose(); @@ -5050,11 +5050,11 @@ static INT32 ChasehqInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x107fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x108000, 0x10bfff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0xc00000, 0xc0ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0xd00000, 0xd007ff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x107fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x108000, 0x10bfff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0xc00000, 0xc0ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0xd00000, 0xd007ff, SM_RAM); SekSetReadWordHandler(0, Chasehq68K1ReadWord); SekSetWriteWordHandler(0, Chasehq68K1WriteWord); SekSetReadByteHandler(0, Chasehq68K1ReadByte); @@ -5063,10 +5063,10 @@ static INT32 ChasehqInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x108000, 0x10bfff, MAP_RAM); - SekMapMemory(TC0150RODRam , 0x800000, 0x801fff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x108000, 0x10bfff, SM_RAM); + SekMapMemory(TC0150RODRam , 0x800000, 0x801fff, SM_RAM); SekClose(); TaitoZZ80Init(); @@ -5145,21 +5145,21 @@ static INT32 ContcircInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x080000, 0x083fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x084000, 0x087fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x200000, 0x20ffff, MAP_READ); - SekMapMemory(TC0150RODRam , 0x300000, 0x301fff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x400000, 0x4006ff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x080000, 0x083fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x084000, 0x087fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x200000, 0x20ffff, SM_READ); + SekMapMemory(TC0150RODRam , 0x300000, 0x301fff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x400000, 0x4006ff, SM_RAM); SekSetWriteByteHandler(0, Contcirc68K1WriteByte); SekSetWriteWordHandler(0, Contcirc68K1WriteWord); SekClose(); SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x080000, 0x083fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x084000, 0x087fff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x080000, 0x083fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x084000, 0x087fff, SM_RAM); SekSetReadWordHandler(0, Contcirc68K2ReadWord); SekSetWriteWordHandler(0, Contcirc68K2WriteWord); SekSetReadByteHandler(0, Contcirc68K2ReadByte); @@ -5239,13 +5239,13 @@ static INT32 DblaxleInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x200000, 0x203fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x210000, 0x21ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x800000, 0x801fff, MAP_RAM); - SekMapMemory(TC0480SCPRam , 0x900000, 0x90ffff, MAP_RAM); - SekMapMemory(TC0480SCPRam , 0xa00000, 0xa0ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0xc00000, 0xc03fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x200000, 0x203fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x210000, 0x21ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x800000, 0x801fff, SM_RAM); + SekMapMemory(TC0480SCPRam , 0x900000, 0x90ffff, SM_RAM); + SekMapMemory(TC0480SCPRam , 0xa00000, 0xa0ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0xc00000, 0xc03fff, SM_RAM); SekSetReadWordHandler(0, Dblaxle68K1ReadWord); SekSetWriteWordHandler(0, Dblaxle68K1WriteWord); SekSetReadByteHandler(0, Dblaxle68K1ReadByte); @@ -5254,10 +5254,10 @@ static INT32 DblaxleInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x110000, 0x11ffff, MAP_RAM); - SekMapMemory(TC0150RODRam , 0x300000, 0x301fff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x110000, 0x11ffff, SM_RAM); + SekMapMemory(TC0150RODRam , 0x300000, 0x301fff, SM_RAM); SekClose(); TaitoZZ80Init(); @@ -5338,12 +5338,12 @@ static INT32 EnforceInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x104000, 0x107fff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x300000, 0x3006ff, MAP_RAM); - SekMapMemory(TC0150RODRam , 0x400000, 0x401fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x600000, 0x60ffff, MAP_READ); + SekMapMemory(Taito68KRom1 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x104000, 0x107fff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x300000, 0x3006ff, SM_RAM); + SekMapMemory(TC0150RODRam , 0x400000, 0x401fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x600000, 0x60ffff, SM_READ); SekSetWriteByteHandler(0, Enforce68K1WriteByte); SekSetReadWordHandler(0, Enforce68K1ReadWord); SekSetWriteWordHandler(0, Enforce68K1WriteWord); @@ -5351,9 +5351,9 @@ static INT32 EnforceInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x104000, 0x107fff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x104000, 0x107fff, SM_RAM); SekSetReadWordHandler(0, Enforce68K2ReadWord); SekSetWriteWordHandler(0, Enforce68K2WriteWord); SekSetReadByteHandler(0, Enforce68K2ReadByte); @@ -5445,11 +5445,11 @@ static INT32 NightstrInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x110000, 0x113fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0xc00000, 0xc0ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0xd00000, 0xd007ff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x10ffff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x110000, 0x113fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0xc00000, 0xc0ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0xd00000, 0xd007ff, SM_RAM); SekSetReadWordHandler(0, Nightstr68K1ReadWord); SekSetWriteWordHandler(0, Nightstr68K1WriteWord); SekSetReadByteHandler(0, Nightstr68K1ReadByte); @@ -5458,10 +5458,10 @@ static INT32 NightstrInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x104000, 0x107fff, MAP_RAM); - SekMapMemory(TC0150RODRam , 0x800000, 0x801fff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x104000, 0x107fff, SM_RAM); + SekMapMemory(TC0150RODRam , 0x800000, 0x801fff, SM_RAM); SekClose(); TaitoZZ80Init(); @@ -5539,12 +5539,12 @@ static INT32 RacingbInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x103fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x110000, 0x11ffff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, MAP_RAM); - SekMapMemory(TC0480SCPRam , 0x900000, 0x90ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0xb00000, 0xb03fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x103fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x110000, 0x11ffff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x700000, 0x701fff, SM_RAM); + SekMapMemory(TC0480SCPRam , 0x900000, 0x90ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0xb00000, 0xb03fff, SM_RAM); SekSetReadWordHandler(0, Racingb68K1ReadWord); SekSetWriteWordHandler(0, Racingb68K1WriteWord); SekSetReadByteHandler(0, Racingb68K1ReadByte); @@ -5553,10 +5553,10 @@ static INT32 RacingbInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x400000, 0x403fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x410000, 0x41ffff, MAP_RAM); - SekMapMemory(TC0150RODRam , 0xa00000, 0xa01fff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x400000, 0x403fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x410000, 0x41ffff, SM_RAM); + SekMapMemory(TC0150RODRam , 0xa00000, 0xa01fff, SM_RAM); SekClose(); TaitoZZ80Init(); @@ -5638,12 +5638,12 @@ static INT32 SciInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x100000, 0x107fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x108000, 0x10bfff, MAP_RAM); - SekMapMemory(TaitoPaletteRam , 0x800000, 0x801fff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0xa00000, 0xa0ffff, MAP_READ); - SekMapMemory(TaitoSpriteRam , 0xc00000, 0xc03fff, MAP_RAM); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x100000, 0x107fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x108000, 0x10bfff, SM_RAM); + SekMapMemory(TaitoPaletteRam , 0x800000, 0x801fff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0xa00000, 0xa0ffff, SM_READ); + SekMapMemory(TaitoSpriteRam , 0xc00000, 0xc03fff, SM_RAM); SekSetWriteWordHandler(0, Sci68K1WriteWord); SekSetReadByteHandler(0, Sci68K1ReadByte); SekSetWriteByteHandler(0, Sci68K1WriteByte); @@ -5651,10 +5651,10 @@ static INT32 SciInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x01ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x200000, 0x203fff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x208000, 0x20bfff, MAP_RAM); - SekMapMemory(TC0150RODRam , 0xa00000, 0xa01fff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x01ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x200000, 0x203fff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x208000, 0x20bfff, SM_RAM); + SekMapMemory(TC0150RODRam , 0xa00000, 0xa01fff, SM_RAM); SekClose(); TaitoZZ80Init(); @@ -5730,11 +5730,11 @@ static INT32 SpacegunInit() // Setup the 68000 emulation SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, MAP_ROM); - SekMapMemory(Taito68KRam1 , 0x30c000, 0x30ffff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x310000, 0x31ffff, MAP_RAM); - SekMapMemory(TaitoSpriteRam , 0x500000, 0x5005ff, MAP_RAM); - SekMapMemory(TC0100SCNRam[0] , 0x900000, 0x90ffff, MAP_READ); + SekMapMemory(Taito68KRom1 , 0x000000, 0x07ffff, SM_ROM); + SekMapMemory(Taito68KRam1 , 0x30c000, 0x30ffff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x310000, 0x31ffff, SM_RAM); + SekMapMemory(TaitoSpriteRam , 0x500000, 0x5005ff, SM_RAM); + SekMapMemory(TC0100SCNRam[0] , 0x900000, 0x90ffff, SM_READ); SekSetReadWordHandler(0, Spacegun68K1ReadWord); SekSetWriteWordHandler(0, Spacegun68K1WriteWord); SekSetWriteByteHandler(0, Spacegun68K1WriteByte); @@ -5742,9 +5742,9 @@ static INT32 SpacegunInit() SekInit(1, 0x68000); SekOpen(1); - SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, MAP_ROM); - SekMapMemory(Taito68KRam2 , 0x20c000, 0x20ffff, MAP_RAM); - SekMapMemory(TaitoSharedRam , 0x210000, 0x21ffff, MAP_RAM); + SekMapMemory(Taito68KRom2 , 0x000000, 0x03ffff, SM_ROM); + SekMapMemory(Taito68KRam2 , 0x20c000, 0x20ffff, SM_RAM); + SekMapMemory(TaitoSharedRam , 0x210000, 0x21ffff, SM_RAM); SekSetReadWordHandler(0, Spacegun68K2ReadWord); SekSetWriteWordHandler(0, Spacegun68K2WriteWord); SekSetReadByteHandler(0, Spacegun68K2ReadByte); diff --git a/src/burn/drv/taito/taito_m68705.cpp b/src/burn/drv/taito/taito_m68705.cpp index fd7a186ec..15e3fadd2 100644 --- a/src/burn/drv/taito/taito_m68705.cpp +++ b/src/burn/drv/taito/taito_m68705.cpp @@ -123,8 +123,8 @@ void m67805_taito_init(UINT8 *rom, UINT8 *ram, m68705_interface *interface) m6805Init(1, 0x800 /*max memory range - page size is max range / 0x100*/); m6805Open(0); - m6805MapMemory(ram, 0x0010, 0x007f, MAP_RAM); - m6805MapMemory(rom + 0x80, 0x0080, 0x07ff, MAP_ROM); + m6805MapMemory(ram, 0x0010, 0x007f, M6805_RAM); + m6805MapMemory(rom + 0x80, 0x0080, 0x07ff, M6805_ROM); m6805SetWriteHandler(m67805_mcu_write); m6805SetReadHandler(m67805_mcu_read); m6805Close(); diff --git a/src/burn/drv/toaplan/d_batrider.cpp b/src/burn/drv/toaplan/d_batrider.cpp index da9116bd2..3f4c4ecf2 100644 --- a/src/burn/drv/toaplan/d_batrider.cpp +++ b/src/burn/drv/toaplan/d_batrider.cpp @@ -659,15 +659,15 @@ static void Map68KTextROM(bool bMapTextROM) { if (bMapTextROM) { if (nTextROMStatus != 1) { - SekMapMemory(ExtraTROM, 0x200000, 0x207FFF, MAP_RAM); // Extra text tile memory + SekMapMemory(ExtraTROM, 0x200000, 0x207FFF, SM_RAM); // Extra text tile memory nTextROMStatus = 1; } } else { if (nTextROMStatus != 0) { - SekMapMemory(ExtraTRAM, 0x200000, 0x201FFF, MAP_RAM); // Extra text tilemap RAM - SekMapMemory(RamPal, 0x202000, 0x202FFF, MAP_RAM); // Palette RAM - SekMapMemory(Ram01, 0x203000, 0x207FFF, MAP_RAM); // Extra text Scroll & offset; RAM + SekMapMemory(ExtraTRAM, 0x200000, 0x201FFF, SM_RAM); // Extra text tilemap RAM + SekMapMemory(RamPal, 0x202000, 0x202FFF, SM_RAM); // Palette RAM + SekMapMemory(Ram01, 0x203000, 0x207FFF, SM_RAM); // Extra text Scroll & offset; RAM nTextROMStatus = 0; } @@ -732,8 +732,8 @@ static INT32 drvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x1FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram02, 0x208000, 0x20FFFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x1FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram02, 0x208000, 0x20FFFF, SM_RAM); Map68KTextROM(true); @@ -742,12 +742,12 @@ static INT32 drvInit() SekSetWriteWordHandler(0, batriderWriteWord); SekSetWriteByteHandler(0, batriderWriteByte); - SekMapHandler(1, 0x400000, 0x400400, MAP_RAM); // GP9001 addresses + SekMapHandler(1, 0x400000, 0x400400, SM_RAM); // GP9001 addresses SekSetReadWordHandler(1, batriderReadWordGP9001); SekSetWriteWordHandler(1, batriderWriteWordGP9001); - SekMapHandler(2, 0x300000, 0x37FFFF, MAP_ROM); // Z80 ROM + SekMapHandler(2, 0x300000, 0x37FFFF, SM_ROM); // Z80 ROM SekSetReadByteHandler(2, batriderReadByteZ80ROM); SekSetReadWordHandler(2, batriderReadWordZ80ROM); diff --git a/src/burn/drv/toaplan/d_batsugun.cpp b/src/burn/drv/toaplan/d_batsugun.cpp index b6e36f942..2c582f020 100644 --- a/src/burn/drv/toaplan/d_batsugun.cpp +++ b/src/burn/drv/toaplan/d_batsugun.cpp @@ -504,9 +504,9 @@ static INT32 DrvInit() { SekInit(0, 0x68000); // Allocate 68000 SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(RamPal, 0x400000, 0x400FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(RamPal, 0x400000, 0x400FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, batsugunReadWord); SekSetReadByteHandler(0, batsugunReadByte); SekSetWriteWordHandler(0, batsugunWriteWord); diff --git a/src/burn/drv/toaplan/d_battleg.cpp b/src/burn/drv/toaplan/d_battleg.cpp index 93218b380..6c6cff8bf 100644 --- a/src/burn/drv/toaplan/d_battleg.cpp +++ b/src/burn/drv/toaplan/d_battleg.cpp @@ -658,7 +658,7 @@ void __fastcall battlegWriteByte(UINT32 sekAddress, UINT8 byteValue) nSoundCommand = byteValue; // Trigger Z80 interrupt, and allow the Z80 to process it - ZetSetIRQLine(0xff, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(255); nCyclesDone[1] += ZetRun(0x0200); break; @@ -759,13 +759,13 @@ static INT32 battlegInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(RamPal, 0x400000, 0x400FFF, MAP_RAM); // Palette RAM - SekMapMemory(Ram02, 0x401000, 0x4017FF, MAP_RAM); // Unused - SekMapMemory(ExtraTRAM, 0x500000, 0x501FFF, MAP_RAM); - SekMapMemory(ExtraTSelect, 0x502000, 0x502FFF, MAP_RAM); // 0x502000 - Scroll; 0x502200 - RAM - SekMapMemory(ExtraTScroll, 0x503000, 0x503FFF, MAP_RAM); // 0x203000 - Offset; 0x503200 - RAM + SekMapMemory(Rom01, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(RamPal, 0x400000, 0x400FFF, SM_RAM); // Palette RAM + SekMapMemory(Ram02, 0x401000, 0x4017FF, SM_RAM); // Unused + SekMapMemory(ExtraTRAM, 0x500000, 0x501FFF, SM_RAM); + SekMapMemory(ExtraTSelect, 0x502000, 0x502FFF, SM_RAM); // 0x502000 - Scroll; 0x502200 - RAM + SekMapMemory(ExtraTScroll, 0x503000, 0x503FFF, SM_RAM); // 0x203000 - Offset; 0x503200 - RAM SekSetReadWordHandler(0, battlegReadWord); SekSetReadByteHandler(0, battlegReadByte); diff --git a/src/burn/drv/toaplan/d_bbakraid.cpp b/src/burn/drv/toaplan/d_bbakraid.cpp index 4b696b74c..1f5950fd4 100644 --- a/src/burn/drv/toaplan/d_bbakraid.cpp +++ b/src/burn/drv/toaplan/d_bbakraid.cpp @@ -544,15 +544,15 @@ static void Map68KTextROM(bool bMapTextROM) { if (bMapTextROM) { if (nTextROMStatus != 1) { - SekMapMemory(ExtraTROM, 0x200000, 0x207FFF, MAP_RAM); // Extra text tile memory + SekMapMemory(ExtraTROM, 0x200000, 0x207FFF, SM_RAM); // Extra text tile memory nTextROMStatus = 1; } } else { if (nTextROMStatus != 0) { - SekMapMemory(ExtraTRAM, 0x200000, 0x201FFF, MAP_RAM); // Extra text tilemap RAM - SekMapMemory(RamPal, 0x202000, 0x202FFF, MAP_RAM); // Palette RAM - SekMapMemory(Ram01, 0x203000, 0x207FFF, MAP_RAM); // Extra text Scroll & offset; RAM + SekMapMemory(ExtraTRAM, 0x200000, 0x201FFF, SM_RAM); // Extra text tilemap RAM + SekMapMemory(RamPal, 0x202000, 0x202FFF, SM_RAM); // Palette RAM + SekMapMemory(Ram01, 0x203000, 0x207FFF, SM_RAM); // Extra text Scroll & offset; RAM nTextROMStatus = 0; } @@ -845,8 +845,8 @@ static INT32 bbakraidInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x1FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram02, 0x208000, 0x20FFFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x1FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram02, 0x208000, 0x20FFFF, SM_RAM); Map68KTextROM(true); @@ -855,12 +855,12 @@ static INT32 bbakraidInit() SekSetWriteWordHandler(0, bbakraidWriteWord); SekSetWriteByteHandler(0, bbakraidWriteByte); - SekMapHandler(1, 0x400000, 0x400400, MAP_RAM); // GP9001 addresses + SekMapHandler(1, 0x400000, 0x400400, SM_RAM); // GP9001 addresses SekSetReadWordHandler(1, bbakraidReadWordGP9001); SekSetWriteWordHandler(1, bbakraidWriteWordGP9001); - SekMapHandler(2, 0x300000, 0x37FFFF, MAP_ROM); // Z80 ROM + SekMapHandler(2, 0x300000, 0x37FFFF, SM_ROM); // Z80 ROM SekSetReadByteHandler(2, bbakraidReadByteZ80ROM); SekSetReadWordHandler(2, bbakraidReadWordZ80ROM); diff --git a/src/burn/drv/toaplan/d_demonwld.cpp b/src/burn/drv/toaplan/d_demonwld.cpp index 3bc6a9e76..c81d603f4 100644 --- a/src/burn/drv/toaplan/d_demonwld.cpp +++ b/src/burn/drv/toaplan/d_demonwld.cpp @@ -461,16 +461,16 @@ static INT32 DrvInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03FFFF, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x404000, 0x4047FF, MAP_RAM); - SekMapMemory(DrvPalRAM2, 0x406000, 0x4067FF, MAP_RAM); - SekMapMemory(Drv68KRAM, 0xc00000, 0xc03FFF, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03FFFF, SM_ROM); + SekMapMemory(DrvPalRAM, 0x404000, 0x4047FF, SM_RAM); + SekMapMemory(DrvPalRAM2, 0x406000, 0x4067FF, SM_RAM); + SekMapMemory(Drv68KRAM, 0xc00000, 0xc03FFF, SM_RAM); SekSetReadWordHandler(0, demonwldReadWord); SekSetReadByteHandler(0, demonwldReadByte); SekSetWriteWordHandler(0, demonwldWriteWord); SekSetWriteByteHandler(0, demonwldWriteByte); - SekMapHandler(1, 0x600000, 0x600FFF, MAP_RAM); + SekMapHandler(1, 0x600000, 0x600FFF, SM_RAM); SekSetReadByteHandler(1, toaplan1ReadByteZ80RAM); SekSetReadWordHandler(1, toaplan1ReadWordZ80RAM); SekSetWriteByteHandler(1, toaplan1WriteByteZ80RAM); @@ -676,7 +676,7 @@ static void map_hack(INT32 hack_off) *((UINT16*)(Drv68KROM + hack_off + 8)) = 0x600a; SekOpen(0); - SekMapMemory(Drv68KROM + 0x40000, cpy_off, cpy_off + 0x3ff, MAP_FETCH); + SekMapMemory(Drv68KROM + 0x40000, cpy_off, cpy_off + 0x3ff, SM_FETCH); SekClose(); } diff --git a/src/burn/drv/toaplan/d_dogyuun.cpp b/src/burn/drv/toaplan/d_dogyuun.cpp index 3e77e3d9b..017fab7ef 100644 --- a/src/burn/drv/toaplan/d_dogyuun.cpp +++ b/src/burn/drv/toaplan/d_dogyuun.cpp @@ -575,9 +575,9 @@ static INT32 DrvInit() { SekInit(0, 0x68000); // Allocate 68000 SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x103FFF, MAP_RAM); - SekMapMemory(RamPal, 0x400000, 0x400FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x103FFF, SM_RAM); + SekMapMemory(RamPal, 0x400000, 0x400FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, dogyuunReadWord); SekSetReadByteHandler(0, dogyuunReadByte); SekSetWriteWordHandler(0, dogyuunWriteWord); diff --git a/src/burn/drv/toaplan/d_fixeight.cpp b/src/burn/drv/toaplan/d_fixeight.cpp index d2826b8b3..f61a7b3d1 100644 --- a/src/burn/drv/toaplan/d_fixeight.cpp +++ b/src/burn/drv/toaplan/d_fixeight.cpp @@ -564,12 +564,12 @@ static INT32 DrvInit(INT32 region) { SekInit(0, 0x68000); // Allocate 68000 SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x103FFF, MAP_RAM); - SekMapMemory(RamPal, 0x400000, 0x400FFF, MAP_RAM); // Palette RAM - SekMapMemory(ExtraTRAM, 0x500000, 0x501FFF, MAP_RAM); - SekMapMemory(ExtraTSelect, 0x502000, 0x502FFF, MAP_RAM); // 0x502000 - Scroll; 0x502200 - RAM - SekMapMemory(ExtraTScroll, 0x503000, 0x503FFF, MAP_RAM); // 0x203000 - Offset; 0x503200 - RAM + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x103FFF, SM_RAM); + SekMapMemory(RamPal, 0x400000, 0x400FFF, SM_RAM); // Palette RAM + SekMapMemory(ExtraTRAM, 0x500000, 0x501FFF, SM_RAM); + SekMapMemory(ExtraTSelect, 0x502000, 0x502FFF, SM_RAM); // 0x502000 - Scroll; 0x502200 - RAM + SekMapMemory(ExtraTScroll, 0x503000, 0x503FFF, SM_RAM); // 0x203000 - Offset; 0x503200 - RAM SekSetReadWordHandler(0, fixeightReadWord); SekSetReadByteHandler(0, fixeightReadByte); SekSetWriteWordHandler(0, fixeightWriteWord); diff --git a/src/burn/drv/toaplan/d_ghox.cpp b/src/burn/drv/toaplan/d_ghox.cpp index f758b4356..c92a1eaec 100644 --- a/src/burn/drv/toaplan/d_ghox.cpp +++ b/src/burn/drv/toaplan/d_ghox.cpp @@ -591,9 +591,9 @@ static INT32 DrvInit() { SekInit(0, 0x68000); // Allocate 68000 SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x03FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x080000, 0x083FFF, MAP_RAM); - SekMapMemory(RamPal, 0x0c0000, 0x0c0FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x03FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x080000, 0x083FFF, SM_RAM); + SekMapMemory(RamPal, 0x0c0000, 0x0c0FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, ghoxReadWord); SekSetReadByteHandler(0, ghoxReadByte); SekSetWriteWordHandler(0, ghoxWriteWord); diff --git a/src/burn/drv/toaplan/d_hellfire.cpp b/src/burn/drv/toaplan/d_hellfire.cpp index 737b40a3e..6b0a88549 100644 --- a/src/burn/drv/toaplan/d_hellfire.cpp +++ b/src/burn/drv/toaplan/d_hellfire.cpp @@ -620,17 +620,17 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x03FFFF, MAP_ROM); // 68K ROM - SekMapMemory(Ram01, 0x040000, 0x047FFF, MAP_RAM); // 68K RAM - SekMapMemory(RamPal, 0x084000, 0x0847FF, MAP_RAM); // BCU-2 palette RAM - SekMapMemory(RamPal2, 0x086000, 0x0867FF, MAP_RAM); // FCU-2 palette RAM + SekMapMemory(Rom01, 0x000000, 0x03FFFF, SM_ROM); // 68K ROM + SekMapMemory(Ram01, 0x040000, 0x047FFF, SM_RAM); // 68K RAM + SekMapMemory(RamPal, 0x084000, 0x0847FF, SM_RAM); // BCU-2 palette RAM + SekMapMemory(RamPal2, 0x086000, 0x0867FF, SM_RAM); // FCU-2 palette RAM SekSetReadWordHandler(0, hellfireReadWord); SekSetReadByteHandler(0, hellfireReadByte); SekSetWriteWordHandler(0, hellfireWriteWord); SekSetWriteByteHandler(0, hellfireWriteByte); - SekMapHandler(1, 0x0c0000, 0x0c0FFF, MAP_RAM); // Z80 RAM + SekMapHandler(1, 0x0c0000, 0x0c0FFF, SM_RAM); // Z80 RAM SekSetReadByteHandler(1, toaplan1ReadByteZ80RAM); SekSetReadWordHandler(1, toaplan1ReadWordZ80RAM); diff --git a/src/burn/drv/toaplan/d_kbash.cpp b/src/burn/drv/toaplan/d_kbash.cpp index 844a68501..696af7845 100644 --- a/src/burn/drv/toaplan/d_kbash.cpp +++ b/src/burn/drv/toaplan/d_kbash.cpp @@ -425,9 +425,9 @@ static INT32 DrvInit() { SekInit(0, 0x68000); // Allocate 68000 SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x103FFF, MAP_RAM); - SekMapMemory(RamPal, 0x400000, 0x400FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x103FFF, SM_RAM); + SekMapMemory(RamPal, 0x400000, 0x400FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, kbashReadWord); SekSetReadByteHandler(0, kbashReadByte); SekSetWriteWordHandler(0, kbashWriteWord); diff --git a/src/burn/drv/toaplan/d_kbash2.cpp b/src/burn/drv/toaplan/d_kbash2.cpp index 0e476250b..759c79a73 100644 --- a/src/burn/drv/toaplan/d_kbash2.cpp +++ b/src/burn/drv/toaplan/d_kbash2.cpp @@ -391,9 +391,9 @@ static INT32 DrvInit() { SekInit(0, 0x68000); // Allocate 68000 SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); - SekMapMemory(Ram01, 0x100000, 0x103FFF, MAP_RAM); - SekMapMemory(RamPal, 0x400000, 0x400FFF, MAP_RAM); + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); + SekMapMemory(Ram01, 0x100000, 0x103FFF, SM_RAM); + SekMapMemory(RamPal, 0x400000, 0x400FFF, SM_RAM); SekSetReadWordHandler(0, kbash2ReadWord); SekSetReadByteHandler(0, kbash2ReadByte); SekSetWriteWordHandler(0, kbash2WriteWord); diff --git a/src/burn/drv/toaplan/d_mahoudai.cpp b/src/burn/drv/toaplan/d_mahoudai.cpp index a4fb6719c..4da7d04d7 100644 --- a/src/burn/drv/toaplan/d_mahoudai.cpp +++ b/src/burn/drv/toaplan/d_mahoudai.cpp @@ -482,13 +482,13 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(RamPal, 0x400000, 0x400FFF, MAP_RAM); // Palette RAM - SekMapMemory(Ram02, 0x401000, 0x4017FF, MAP_RAM); // Unused - SekMapMemory(ExtraTRAM, 0x500000, 0x502FFF, MAP_RAM); - SekMapMemory(ExtraTSelect, 0x502000, 0x502FFF, MAP_RAM); // 0x502000 - Scroll; 0x502200 - RAM - SekMapMemory(ExtraTScroll, 0x503000, 0x503FFF, MAP_RAM); // 0x203000 - Offset; 0x503200 - RAM + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(RamPal, 0x400000, 0x400FFF, SM_RAM); // Palette RAM + SekMapMemory(Ram02, 0x401000, 0x4017FF, SM_RAM); // Unused + SekMapMemory(ExtraTRAM, 0x500000, 0x502FFF, SM_RAM); + SekMapMemory(ExtraTSelect, 0x502000, 0x502FFF, SM_RAM); // 0x502000 - Scroll; 0x502200 - RAM + SekMapMemory(ExtraTScroll, 0x503000, 0x503FFF, SM_RAM); // 0x203000 - Offset; 0x503200 - RAM SekSetReadWordHandler(0, mahoudaiReadWord); SekSetReadByteHandler(0, mahoudaiReadByte); diff --git a/src/burn/drv/toaplan/d_outzone.cpp b/src/burn/drv/toaplan/d_outzone.cpp index 455437ec9..985555f38 100644 --- a/src/burn/drv/toaplan/d_outzone.cpp +++ b/src/burn/drv/toaplan/d_outzone.cpp @@ -808,17 +808,17 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x03FFFF, MAP_ROM); // 68K ROM - SekMapMemory(Ram01, 0x240000, 0x243FFF, MAP_RAM); // 68K RAM - SekMapMemory(RamPal, 0x304000, 0x3047FF, MAP_RAM); // BCU-2 palette RAM - SekMapMemory(RamPal2, 0x306000, 0x3067FF, MAP_RAM); // FCU-2 palette RAM + SekMapMemory(Rom01, 0x000000, 0x03FFFF, SM_ROM); // 68K ROM + SekMapMemory(Ram01, 0x240000, 0x243FFF, SM_RAM); // 68K RAM + SekMapMemory(RamPal, 0x304000, 0x3047FF, SM_RAM); // BCU-2 palette RAM + SekMapMemory(RamPal2, 0x306000, 0x3067FF, SM_RAM); // FCU-2 palette RAM SekSetReadWordHandler(0, outzoneReadWord); SekSetReadByteHandler(0, outzoneReadByte); SekSetWriteWordHandler(0, outzoneWriteWord); SekSetWriteByteHandler(0, outzoneWriteByte); - SekMapHandler(1, 0x140000, 0x140FFF, MAP_RAM); // Z80 RAM + SekMapHandler(1, 0x140000, 0x140FFF, SM_RAM); // Z80 RAM SekSetReadByteHandler(1, toaplan1ReadByteZ80RAM); SekSetReadWordHandler(1, toaplan1ReadWordZ80RAM); diff --git a/src/burn/drv/toaplan/d_pipibibs.cpp b/src/burn/drv/toaplan/d_pipibibs.cpp index 8b901428b..7d82cb55f 100644 --- a/src/burn/drv/toaplan/d_pipibibs.cpp +++ b/src/burn/drv/toaplan/d_pipibibs.cpp @@ -367,15 +367,15 @@ static INT32 DrvInit() { SekInit(0, 0x68000); // Allocate 68000 SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x03FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x080000, 0x082FFF, MAP_RAM); - SekMapMemory(RamPal, 0x0c0000, 0x0c0FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x03FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x080000, 0x082FFF, SM_RAM); + SekMapMemory(RamPal, 0x0c0000, 0x0c0FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, pipibibsReadWord); SekSetReadByteHandler(0, pipibibsReadByte); SekSetWriteWordHandler(0, pipibibsWriteWord); SekSetWriteByteHandler(0, pipibibsWriteByte); - SekMapHandler(1, 0x190000, 0x190FFF, MAP_RAM); + SekMapHandler(1, 0x190000, 0x190FFF, SM_RAM); SekSetReadByteHandler(1, toaplan1ReadByteZ80RAM); SekSetReadWordHandler(1, toaplan1ReadWordZ80RAM); SekSetWriteByteHandler(1, toaplan1WriteByteZ80RAM); diff --git a/src/burn/drv/toaplan/d_rallybik.cpp b/src/burn/drv/toaplan/d_rallybik.cpp index f3b3a8160..f19d8c383 100644 --- a/src/burn/drv/toaplan/d_rallybik.cpp +++ b/src/burn/drv/toaplan/d_rallybik.cpp @@ -375,18 +375,18 @@ static INT32 DrvInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x00FFFF, MAP_ROM); - SekMapMemory(Drv68KROM + 0x40000, 0x040000, 0x07FFFF, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x080000, 0x083FFF, MAP_RAM); - SekMapMemory(DrvSprRAM, 0x0c0000, 0x0C0FFF, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x144000, 0x1447FF, MAP_RAM); - SekMapMemory(DrvPalRAM2, 0x146000, 0x1467FF, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x00FFFF, SM_ROM); + SekMapMemory(Drv68KROM + 0x40000, 0x040000, 0x07FFFF, SM_ROM); + SekMapMemory(Drv68KRAM, 0x080000, 0x083FFF, SM_RAM); + SekMapMemory(DrvSprRAM, 0x0c0000, 0x0C0FFF, SM_RAM); + SekMapMemory(DrvPalRAM, 0x144000, 0x1447FF, SM_RAM); + SekMapMemory(DrvPalRAM2, 0x146000, 0x1467FF, SM_RAM); SekSetReadWordHandler(0, rallybikReadWord); SekSetReadByteHandler(0, rallybikReadByte); SekSetWriteWordHandler(0, rallybikWriteWord); SekSetWriteByteHandler(0, rallybikWriteByte); - SekMapHandler(1, 0x180000, 0x180FFF, MAP_RAM); + SekMapHandler(1, 0x180000, 0x180FFF, SM_RAM); SekSetReadByteHandler(1, toaplan1ReadByteZ80RAM); SekSetReadWordHandler(1, toaplan1ReadWordZ80RAM); SekSetWriteByteHandler(1, toaplan1WriteByteZ80RAM); diff --git a/src/burn/drv/toaplan/d_samesame.cpp b/src/burn/drv/toaplan/d_samesame.cpp index f2222668f..01f211342 100644 --- a/src/burn/drv/toaplan/d_samesame.cpp +++ b/src/burn/drv/toaplan/d_samesame.cpp @@ -787,10 +787,10 @@ static INT32 DrvInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x07FFFF, MAP_ROM); - SekMapMemory(Drv68KRAM, 0x0c0000, 0x0c3FFF, MAP_RAM); - SekMapMemory(DrvPalRAM, 0x104000, 0x1047FF, MAP_RAM); - SekMapMemory(DrvPalRAM2, 0x106000, 0x1067FF, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x07FFFF, SM_ROM); + SekMapMemory(Drv68KRAM, 0x0c0000, 0x0c3FFF, SM_RAM); + SekMapMemory(DrvPalRAM, 0x104000, 0x1047FF, SM_RAM); + SekMapMemory(DrvPalRAM2, 0x106000, 0x1067FF, SM_RAM); SekSetReadWordHandler(0, samesameReadWord); SekSetReadByteHandler(0, samesameReadByte); SekSetWriteWordHandler(0, samesameWriteWord); diff --git a/src/burn/drv/toaplan/d_shippumd.cpp b/src/burn/drv/toaplan/d_shippumd.cpp index cabde7b9e..aa8796e6a 100644 --- a/src/burn/drv/toaplan/d_shippumd.cpp +++ b/src/burn/drv/toaplan/d_shippumd.cpp @@ -498,13 +498,13 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x0FFFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(RamPal, 0x400000, 0x400FFF, MAP_RAM); // Palette RAM - SekMapMemory(Ram02, 0x401000, 0x4017FF, MAP_RAM); // Unused - SekMapMemory(ExtraTRAM, 0x500000, 0x502FFF, MAP_RAM); - SekMapMemory(ExtraTSelect, 0x502000, 0x502FFF, MAP_RAM); // 0x502000 - Scroll; 0x502200 - RAM - SekMapMemory(ExtraTScroll, 0x503000, 0x503FFF, MAP_RAM); // 0x203000 - Offset; 0x503200 - RAM + SekMapMemory(Rom01, 0x000000, 0x0FFFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(RamPal, 0x400000, 0x400FFF, SM_RAM); // Palette RAM + SekMapMemory(Ram02, 0x401000, 0x4017FF, SM_RAM); // Unused + SekMapMemory(ExtraTRAM, 0x500000, 0x502FFF, SM_RAM); + SekMapMemory(ExtraTSelect, 0x502000, 0x502FFF, SM_RAM); // 0x502000 - Scroll; 0x502200 - RAM + SekMapMemory(ExtraTScroll, 0x503000, 0x503FFF, SM_RAM); // 0x203000 - Offset; 0x503200 - RAM SekSetReadWordHandler(0, shippumdReadWord); SekSetReadByteHandler(0, shippumdReadByte); diff --git a/src/burn/drv/toaplan/d_slapfght.cpp b/src/burn/drv/toaplan/d_slapfght.cpp index 2405fe958..584a60ffb 100644 --- a/src/burn/drv/toaplan/d_slapfght.cpp +++ b/src/burn/drv/toaplan/d_slapfght.cpp @@ -647,7 +647,7 @@ void __fastcall tigerhOutCPU0(UINT16 a, UINT8 /* d */) // bprintf(PRINT_NORMAL, "Interrupts disabled.\n"); bInterruptEnable = false; - ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); + ZetLowerIrq(); break; case 0x07: // Enable interrupts // bprintf(PRINT_NORMAL, "Interrupts enabled.\n"); @@ -2286,11 +2286,11 @@ static INT32 tigerhFrame() bVBlank = true; if (bInterruptEnable) { - ZetSetIRQLine(0xff, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0xFF); #if 0 ZetClose(); ZetOpen(1); - ZetSetIRQLine(0xff, CPU_IRQSTATUS_AUTO); + ZetRaiseIrq(0xFF); ZetClose(); ZetOpen(0); #endif diff --git a/src/burn/drv/toaplan/d_snowbro2.cpp b/src/burn/drv/toaplan/d_snowbro2.cpp index 3090144cd..e07235bc9 100644 --- a/src/burn/drv/toaplan/d_snowbro2.cpp +++ b/src/burn/drv/toaplan/d_snowbro2.cpp @@ -558,9 +558,9 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(RamPal, 0x400000, 0x400FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(RamPal, 0x400000, 0x400FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, snowbro2ReadWord); SekSetReadByteHandler(0, snowbro2ReadByte); diff --git a/src/burn/drv/toaplan/d_tekipaki.cpp b/src/burn/drv/toaplan/d_tekipaki.cpp index 49d8d339d..ad5099359 100644 --- a/src/burn/drv/toaplan/d_tekipaki.cpp +++ b/src/burn/drv/toaplan/d_tekipaki.cpp @@ -582,9 +582,9 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x03FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x080000, 0x082FFF, MAP_RAM); - SekMapMemory(RamPal, 0x0c0000, 0x0c0FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x03FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x080000, 0x082FFF, SM_RAM); + SekMapMemory(RamPal, 0x0c0000, 0x0c0FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, tekipakiReadWord); SekSetReadByteHandler(0, tekipakiReadByte); diff --git a/src/burn/drv/toaplan/d_truxton.cpp b/src/burn/drv/toaplan/d_truxton.cpp index f6165c3b5..63bb2f971 100644 --- a/src/burn/drv/toaplan/d_truxton.cpp +++ b/src/burn/drv/toaplan/d_truxton.cpp @@ -508,17 +508,17 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x03FFFF, MAP_ROM); // 68K ROM - SekMapMemory(Ram01, 0x080000, 0x083FFF, MAP_RAM); // 68K RAM - SekMapMemory(RamPal, 0x144000, 0x1447FF, MAP_RAM); // BCU-2 palette RAM - SekMapMemory(RamPal2, 0x146000, 0x1467FF, MAP_RAM); // FCU-2 palette RAM + SekMapMemory(Rom01, 0x000000, 0x03FFFF, SM_ROM); // 68K ROM + SekMapMemory(Ram01, 0x080000, 0x083FFF, SM_RAM); // 68K RAM + SekMapMemory(RamPal, 0x144000, 0x1447FF, SM_RAM); // BCU-2 palette RAM + SekMapMemory(RamPal2, 0x146000, 0x1467FF, SM_RAM); // FCU-2 palette RAM SekSetReadWordHandler(0, truxtonReadWord); SekSetReadByteHandler(0, truxtonReadByte); SekSetWriteWordHandler(0, truxtonWriteWord); SekSetWriteByteHandler(0, truxtonWriteByte); - SekMapHandler(1, 0x180000, 0x180FFF, MAP_RAM); // Z80 RAM + SekMapHandler(1, 0x180000, 0x180FFF, SM_RAM); // Z80 RAM SekSetReadByteHandler(1, toaplan1ReadByteZ80RAM); SekSetReadWordHandler(1, toaplan1ReadWordZ80RAM); diff --git a/src/burn/drv/toaplan/d_truxton2.cpp b/src/burn/drv/toaplan/d_truxton2.cpp index d4848e9ae..72e14e7ef 100644 --- a/src/burn/drv/toaplan/d_truxton2.cpp +++ b/src/burn/drv/toaplan/d_truxton2.cpp @@ -546,12 +546,12 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x10FFFF, MAP_RAM); - SekMapMemory(RamPal, 0x300000, 0x300FFF, MAP_RAM); // Palette RAM - SekMapMemory(ExtraTRAM, 0x400000, 0x401FFF, MAP_RAM); - SekMapMemory(ExtraTSelect, 0x402000, 0x402FFF, MAP_RAM); // 0x502000 - Scroll; 0x502200 - RAM - SekMapMemory(ExtraTScroll, 0x403000, 0x403FFF, MAP_RAM); // 0x203000 - Offset; 0x503200 - RAM + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x10FFFF, SM_RAM); + SekMapMemory(RamPal, 0x300000, 0x300FFF, SM_RAM); // Palette RAM + SekMapMemory(ExtraTRAM, 0x400000, 0x401FFF, SM_RAM); + SekMapMemory(ExtraTSelect, 0x402000, 0x402FFF, SM_RAM); // 0x502000 - Scroll; 0x502200 - RAM + SekMapMemory(ExtraTScroll, 0x403000, 0x403FFF, SM_RAM); // 0x203000 - Offset; 0x503200 - RAM SekSetReadWordHandler(0, truxton2ReadWord); SekSetReadByteHandler(0, truxton2ReadByte); diff --git a/src/burn/drv/toaplan/d_vfive.cpp b/src/burn/drv/toaplan/d_vfive.cpp index 717e1be6d..a5760e2b9 100644 --- a/src/burn/drv/toaplan/d_vfive.cpp +++ b/src/burn/drv/toaplan/d_vfive.cpp @@ -472,10 +472,10 @@ static INT32 DrvInit() { SekInit(0, 0x68000); // Allocate 68000 SekOpen(0); - SekMapMemory(Rom01, 0x000000, 0x07FFFF, MAP_ROM); // CPU 0 ROM - SekMapMemory(Ram01, 0x100000, 0x103FFF, MAP_RAM); - // SekMapMemory(ShareRAM, 0x210000, 0x21ffff, MAP_RAM); - SekMapMemory(RamPal, 0x400000, 0x400FFF, MAP_RAM); // Palette RAM + SekMapMemory(Rom01, 0x000000, 0x07FFFF, SM_ROM); // CPU 0 ROM + SekMapMemory(Ram01, 0x100000, 0x103FFF, SM_RAM); + // SekMapMemory(ShareRAM, 0x210000, 0x21ffff, SM_RAM); + SekMapMemory(RamPal, 0x400000, 0x400FFF, SM_RAM); // Palette RAM SekSetReadWordHandler(0, vfiveReadWord); SekSetReadByteHandler(0, vfiveReadByte); SekSetWriteWordHandler(0, vfiveWriteWord); diff --git a/src/burn/drv/toaplan/d_vimana.cpp b/src/burn/drv/toaplan/d_vimana.cpp index b472bb3f7..046c81d29 100644 --- a/src/burn/drv/toaplan/d_vimana.cpp +++ b/src/burn/drv/toaplan/d_vimana.cpp @@ -672,10 +672,10 @@ static INT32 DrvInit() { SekInit(0, 0x68000); SekOpen(0); - SekMapMemory(Drv68KROM, 0x000000, 0x03FFFF, MAP_ROM); - SekMapMemory(DrvPalRAM, 0x404000, 0x4047FF, MAP_RAM); - SekMapMemory(DrvPalRAM2, 0x406000, 0x4067FF, MAP_RAM); - SekMapMemory(Drv68KRAM, 0x480000, 0x487FFF, MAP_RAM); + SekMapMemory(Drv68KROM, 0x000000, 0x03FFFF, SM_ROM); + SekMapMemory(DrvPalRAM, 0x404000, 0x4047FF, SM_RAM); + SekMapMemory(DrvPalRAM2, 0x406000, 0x4067FF, SM_RAM); + SekMapMemory(Drv68KRAM, 0x480000, 0x487FFF, SM_RAM); SekSetReadWordHandler(0, vimanaReadWord); SekSetReadByteHandler(0, vimanaReadByte); SekSetWriteWordHandler(0, vimanaWriteWord); diff --git a/src/burn/drv/toaplan/d_zerowing.cpp b/src/burn/drv/toaplan/d_zerowing.cpp index b978bf5fe..01d06e7e2 100644 --- a/src/burn/drv/toaplan/d_zerowing.cpp +++ b/src/burn/drv/toaplan/d_zerowing.cpp @@ -594,18 +594,18 @@ static INT32 DrvInit() SekOpen(0); // Map 68000 memory: - SekMapMemory(Rom01, 0x000000, 0x00FFFF, MAP_ROM); // 68K ROM - SekMapMemory(Rom01 + 0x040000, 0x040000, 0x07FFFF, MAP_ROM); // 68K ROM - SekMapMemory(Ram01, 0x080000, 0x087FFF, MAP_RAM); // 68K RAM - SekMapMemory(RamPal, 0x404000, 0x4047FF, MAP_RAM); // BCU-2 palette RAM - SekMapMemory(RamPal2, 0x406000, 0x4067FF, MAP_RAM); // FCU-2 palette RAM + SekMapMemory(Rom01, 0x000000, 0x00FFFF, SM_ROM); // 68K ROM + SekMapMemory(Rom01 + 0x040000, 0x040000, 0x07FFFF, SM_ROM); // 68K ROM + SekMapMemory(Ram01, 0x080000, 0x087FFF, SM_RAM); // 68K RAM + SekMapMemory(RamPal, 0x404000, 0x4047FF, SM_RAM); // BCU-2 palette RAM + SekMapMemory(RamPal2, 0x406000, 0x4067FF, SM_RAM); // FCU-2 palette RAM SekSetReadWordHandler(0, zerowingReadWord); SekSetReadByteHandler(0, zerowingReadByte); SekSetWriteWordHandler(0, zerowingWriteWord); SekSetWriteByteHandler(0, zerowingWriteByte); - SekMapHandler(1, 0x440000, 0x440FFF, MAP_RAM); // Z80 RAM + SekMapHandler(1, 0x440000, 0x440FFF, SM_RAM); // Z80 RAM SekSetReadByteHandler(1, toaplan1ReadByteZ80RAM); SekSetReadWordHandler(1, toaplan1ReadWordZ80RAM); diff --git a/src/burn/snd/ymf278b.c b/src/burn/snd/ymf278b.c index 181c8cb2b..421982456 100644 --- a/src/burn/snd/ymf278b.c +++ b/src/burn/snd/ymf278b.c @@ -910,7 +910,7 @@ READ8_MEMBER( ymf278b_device::read ) static UINT8 ymf278b_status_port_r(int num) { - return m_current_irq | (m_irq_line == ASSERT_LINE ? 0x80 : 0x00); + return m_current_irq | ((m_irq_line) ? 0x80 : 0x00); } // Not implemented yet diff --git a/src/cpu/arm7_intf.cpp b/src/cpu/arm7_intf.cpp index dbe650077..2bfd28b15 100644 --- a/src/cpu/arm7_intf.cpp +++ b/src/cpu/arm7_intf.cpp @@ -325,13 +325,13 @@ void Arm7SetIRQLine(INT32 line, INT32 state) if (!DebugCPU_ARM7Initted) bprintf(PRINT_ERROR, _T("Arm7SetIRQLine called without init\n")); #endif - if (state == CPU_IRQSTATUS_NONE || state == CPU_IRQSTATUS_ACK) { + if (state == ARM7_IRQSTATUS_NONE || state == ARM7_IRQSTATUS_ACK) { arm7_set_irq_line(line, state); } - else if (CPU_IRQSTATUS_AUTO) { - arm7_set_irq_line(line, CPU_IRQSTATUS_ACK); + else if (ARM7_IRQSTATUS_AUTO) { + arm7_set_irq_line(line, ARM7_IRQSTATUS_ACK); Arm7Run(0); - arm7_set_irq_line(line, CPU_IRQSTATUS_NONE); + arm7_set_irq_line(line, ARM7_IRQSTATUS_NONE); } } diff --git a/src/cpu/arm7_intf.h b/src/cpu/arm7_intf.h index c97fd8343..52ec7537d 100644 --- a/src/cpu/arm7_intf.h +++ b/src/cpu/arm7_intf.h @@ -25,8 +25,19 @@ INT32 Arm7Scan(INT32 nAction); #define ARM7_IRQ_LINE 0 #define ARM7_FIRQ_LINE 1 +#define ARM7_IRQSTATUS_NONE 0 +#define ARM7_IRQSTATUS_ACK 1 +#define ARM7_IRQSTATUS_AUTO 2 + void Arm7SetIRQLine(INT32 line, INT32 state); +#define ARM7_READ 1 +#define ARM7_WRITE 2 +#define ARM7_FETCH 4 + +#define ARM7_ROM (ARM7_READ | ARM7_FETCH) +#define ARM7_RAM (ARM7_READ | ARM7_FETCH | ARM7_WRITE) + void Arm7MapMemory(UINT8 *src, UINT32 start, UINT32 finish, INT32 type); void Arm7SetWriteByteHandler(void (*write)(UINT32, UINT8)); diff --git a/src/cpu/arm_intf.cpp b/src/cpu/arm_intf.cpp index 73cf124e5..db5c5d869 100644 --- a/src/cpu/arm_intf.cpp +++ b/src/cpu/arm_intf.cpp @@ -239,13 +239,13 @@ void ArmSetIRQLine(INT32 line, INT32 state) if (!DebugCPU_ARMInitted) bprintf(PRINT_ERROR, _T("ArmSetIRQLine called without init\n")); #endif - if (state == CPU_IRQSTATUS_NONE || state == CPU_IRQSTATUS_ACK) { + if (state == ARM_IRQSTATUS_NONE || state == ARM_IRQSTATUS_ACK) { arm_set_irq_line(line, state); } - else if (CPU_IRQSTATUS_AUTO) { - arm_set_irq_line(line, CPU_IRQSTATUS_ACK); + else if (ARM_IRQSTATUS_AUTO) { + arm_set_irq_line(line, ARM_IRQSTATUS_ACK); ArmRun(0); - arm_set_irq_line(line, CPU_IRQSTATUS_NONE); + arm_set_irq_line(line, ARM_IRQSTATUS_NONE); } } diff --git a/src/cpu/arm_intf.h b/src/cpu/arm_intf.h index bd542bd90..08cacbaf1 100644 --- a/src/cpu/arm_intf.h +++ b/src/cpu/arm_intf.h @@ -4,6 +4,13 @@ UINT8 ArmReadByte(UINT32 addr); UINT32 ArmReadLong(UINT32 addr); UINT32 ArmFetchLong(UINT32 addr); +#define ARM_READ 1 +#define ARM_WRITE 2 +#define ARM_FETCH 4 + +#define ARM_ROM (ARM_READ | ARM_FETCH) +#define ARM_RAM (ARM_READ | ARM_FETCH | ARM_WRITE) + void ArmMapMemory(UINT8 *src, INT32 start, INT32 finish, INT32 type); void ArmSetWriteByteHandler(void (*write)(UINT32, UINT8)); @@ -20,6 +27,10 @@ INT32 ArmScan(INT32 nAction); #define ARM_IRQ_LINE 0 #define ARM_FIRQ_LINE 1 +#define ARM_IRQSTATUS_NONE 0 +#define ARM_IRQSTATUS_ACK 1 +#define ARM_IRQSTATUS_AUTO 2 + void ArmSetIRQLine(INT32 line, INT32 state); void ArmExit(); diff --git a/src/cpu/h6280_intf.cpp b/src/cpu/h6280_intf.cpp index 3155cb8de..e5a1d64dc 100644 --- a/src/cpu/h6280_intf.cpp +++ b/src/cpu/h6280_intf.cpp @@ -212,7 +212,7 @@ void h6280SetIRQLine(INT32 line, INT32 state) if (nh6280CpuActive == -1) bprintf(PRINT_ERROR, _T("h6280SetIRQLine called with no CPU open\n")); #endif - if (state == CPU_IRQSTATUS_AUTO) { + if (state == H6280_IRQSTATUS_AUTO) { h6280_set_irq_line(line, 1); h6280Run(10); h6280_set_irq_line(line, 0); diff --git a/src/cpu/h6280_intf.h b/src/cpu/h6280_intf.h index 8e30be013..db5ad189c 100644 --- a/src/cpu/h6280_intf.h +++ b/src/cpu/h6280_intf.h @@ -4,6 +4,13 @@ void h6280Write(UINT32 address, UINT8 data); UINT8 h6280Read(UINT32 address); UINT8 h6280Fetch(UINT32 address); +#define H6280_READ 1 +#define H6280_WRITE 2 +#define H6280_FETCH 4 + +#define H6280_ROM (H6280_READ | H6280_FETCH) +#define H6280_RAM (H6280_READ | H6280_FETCH | H6280_WRITE) + void h6280MapMemory(UINT8 *src, UINT32 start, UINT32 finish, INT32 type); void h6280SetIrqCallbackHandler(INT32 (*callback)(INT32)); @@ -22,6 +29,10 @@ void h6280Exit(); extern INT32 nh6280CpuCount; +#define H6280_IRQSTATUS_NONE 0 +#define H6280_IRQSTATUS_ACK 1 +#define H6280_IRQSTATUS_AUTO 2 + #define H6280_INPUT_LINE_NMI 0x20 void h6280SetIRQLine(INT32 line, INT32 state); diff --git a/src/cpu/hd6309_intf.cpp b/src/cpu/hd6309_intf.cpp index 68b2b2514..51722b233 100644 --- a/src/cpu/hd6309_intf.cpp +++ b/src/cpu/hd6309_intf.cpp @@ -180,15 +180,15 @@ void HD6309SetIRQLine(INT32 vector, INT32 status) if (nActiveCPU == -1) bprintf(PRINT_ERROR, _T("HD6309SetIRQLine called when no CPU open\n")); #endif - if (status == CPU_IRQSTATUS_NONE) { + if (status == HD6309_IRQSTATUS_NONE) { hd6309_set_irq_line(vector, 0); } - if (status == CPU_IRQSTATUS_ACK) { + if (status == HD6309_IRQSTATUS_ACK) { hd6309_set_irq_line(vector, 1); } - if (status == CPU_IRQSTATUS_AUTO) { + if (status == HD6309_IRQSTATUS_AUTO) { hd6309_set_irq_line(vector, 1); hd6309_execute(0); hd6309_set_irq_line(vector, 0); @@ -239,13 +239,13 @@ INT32 HD6309MapMemory(UINT8* pMemory, UINT16 nStart, UINT16 nEnd, INT32 nType) UINT8 **pMemMap = HD6309CPUContext[nActiveCPU].pMemMap; for (UINT16 i = cStart; i <= (nEnd >> 8); i++) { - if (nType & MAP_READ) { + if (nType & HD6309_READ) { pMemMap[0 + i] = pMemory + ((i - cStart) << 8); } - if (nType & MAP_WRITE) { + if (nType & HD6309_WRITE) { pMemMap[0x100 + i] = pMemory + ((i - cStart) << 8); } - if (nType & MAP_FETCH) { + if (nType & HD6309_FETCH) { pMemMap[0x200 + i] = pMemory + ((i - cStart) << 8); } } @@ -264,13 +264,13 @@ INT32 HD6309MemCallback(UINT16 nStart, UINT16 nEnd, INT32 nType) UINT8 **pMemMap = HD6309CPUContext[nActiveCPU].pMemMap; for (UINT16 i = cStart; i <= (nEnd >> 8); i++) { - if (nType & MAP_READ) { + if (nType & HD6309_READ) { pMemMap[0 + i] = NULL; } - if (nType & MAP_WRITE) { + if (nType & HD6309_WRITE) { pMemMap[0x100 + i] = NULL; } - if (nType & MAP_FETCH) { + if (nType & HD6309_FETCH) { pMemMap[0x200 + i] = NULL; } } diff --git a/src/cpu/hd6309_intf.h b/src/cpu/hd6309_intf.h index b9085b96b..f7e1de6a3 100644 --- a/src/cpu/hd6309_intf.h +++ b/src/cpu/hd6309_intf.h @@ -21,6 +21,17 @@ struct HD6309Ext { INT32 nCyclesLeft; }; +#define HD6309_IRQSTATUS_NONE 0 +#define HD6309_IRQSTATUS_ACK 1 +#define HD6309_IRQSTATUS_AUTO 2 + +#define HD6309_READ 1 +#define HD6309_WRITE 2 +#define HD6309_FETCH 4 + +#define HD6309_RAM (HD6309_READ | HD6309_WRITE | HD6309_FETCH) +#define HD6309_ROM (HD6309_READ | HD6309_FETCH) + extern INT32 nHD6309Count; extern INT32 nHD6309CyclesTotal; diff --git a/src/cpu/konami/konami.cpp b/src/cpu/konami/konami.cpp index f9d38df8b..20b19e4e9 100644 --- a/src/cpu/konami/konami.cpp +++ b/src/cpu/konami/konami.cpp @@ -116,10 +116,10 @@ static PAIR ea; /* effective address */ static int nCyclesToDo = 0; #define CHECK_IRQ_LINES \ - if( konami.irq_state[KONAMI_IRQ_LINE] != CPU_IRQSTATUS_NONE || \ - konami.irq_state[KONAMI_FIRQ_LINE] != CPU_IRQSTATUS_NONE ) \ + if( konami.irq_state[KONAMI_IRQ_LINE] != KONAMI_IRQSTATUS_NONE || \ + konami.irq_state[KONAMI_FIRQ_LINE] != KONAMI_IRQSTATUS_NONE ) \ konami.int_state &= ~KONAMI_SYNC; /* clear SYNC flag */ \ - if( konami.irq_state[KONAMI_FIRQ_LINE]!=CPU_IRQSTATUS_NONE && !(CC & CC_IF) ) \ + if( konami.irq_state[KONAMI_FIRQ_LINE]!=KONAMI_IRQSTATUS_NONE && !(CC & CC_IF) ) \ { \ /* fast IRQ */ \ /* state already saved by CWAI? */ \ @@ -141,7 +141,7 @@ static int nCyclesToDo = 0; (void)(*konami.irq_callback)(KONAMI_FIRQ_LINE); \ } \ else \ - if( konami.irq_state[KONAMI_IRQ_LINE]!=CPU_IRQSTATUS_NONE && !(CC & CC_II) )\ + if( konami.irq_state[KONAMI_IRQ_LINE]!=KONAMI_IRQSTATUS_NONE && !(CC & CC_II) )\ { \ /* standard IRQ */ \ /* state already saved by CWAI? */ \ @@ -412,9 +412,9 @@ void konamiReset() konami.nTotalCycles = 0; konami.int_state = 0; - konami.nmi_state = CPU_IRQSTATUS_NONE; - konami.irq_state[0] = CPU_IRQSTATUS_NONE; - konami.irq_state[1] = CPU_IRQSTATUS_NONE; + konami.nmi_state = KONAMI_IRQSTATUS_NONE; + konami.irq_state[0] = KONAMI_IRQSTATUS_NONE; + konami.irq_state[1] = KONAMI_IRQSTATUS_NONE; DPD = 0; /* Reset direct page register */ @@ -446,7 +446,7 @@ void konami_set_irq_line(int irqline, int state) if (konami.nmi_state == state) return; konami.nmi_state = state; // LOG(("KONAMI#%d set_nmi_line %d\n", cpu_getactivecpu(), state)); - if( state == CPU_IRQSTATUS_NONE ) return; + if( state == KONAMI_IRQSTATUS_NONE ) return; /* if the stack was not yet initialized */ if( !(konami.int_state & KONAMI_LDS) ) return; @@ -479,7 +479,7 @@ void konami_set_irq_line(int irqline, int state) { // LOG(("KONAMI#%d set_irq_line %d, %d\n", cpu_getactivecpu(), irqline, state)); konami.irq_state[irqline] = state; - if (state == CPU_IRQSTATUS_NONE) return; + if (state == KONAMI_IRQSTATUS_NONE) return; CHECK_IRQ_LINES; } } diff --git a/src/cpu/konami_intf.cpp b/src/cpu/konami_intf.cpp index 066eab48c..1ecf75644 100644 --- a/src/cpu/konami_intf.cpp +++ b/src/cpu/konami_intf.cpp @@ -147,10 +147,10 @@ void konamiSetIrqLine(INT32 line, INT32 state) if (!DebugCPU_KonamiInitted) bprintf(PRINT_ERROR, _T("konamiSetIrqLine called without init\n")); #endif - if (state == CPU_IRQSTATUS_AUTO) { - konami_set_irq_line(line, CPU_IRQSTATUS_ACK); + if (state == KONAMI_IRQSTATUS_AUTO) { + konami_set_irq_line(line, KONAMI_IRQSTATUS_ACK); konamiRun(0); - konami_set_irq_line(line, CPU_IRQSTATUS_NONE); + konami_set_irq_line(line, KONAMI_IRQSTATUS_NONE); } else { konami_set_irq_line(line, state); } diff --git a/src/cpu/konami_intf.h b/src/cpu/konami_intf.h index 063a6d054..8bc54cd78 100644 --- a/src/cpu/konami_intf.h +++ b/src/cpu/konami_intf.h @@ -2,6 +2,13 @@ void konamiWrite(UINT16 address, UINT8 data); UINT8 konamiRead(UINT16 address); UINT8 konamiFetch(UINT16 address); +#define KON_READ 1 +#define KON_WRITE 2 +#define KON_FETCH 4 + +#define KON_ROM (KON_READ | KON_FETCH) +#define KON_RAM (KON_READ | KON_FETCH | KON_WRITE) + void konamiMapMemory(UINT8 *src, UINT16 start, UINT16 finish, INT32 type); void konamiSetIrqCallbackHandler(INT32 (*callback)(INT32)); @@ -21,6 +28,10 @@ extern INT32 nKonamiCpuCount; #define KONAMI_IRQ_LINE 0 #define KONAMI_FIRQ_LINE 1 + +#define KONAMI_IRQSTATUS_NONE 0 +#define KONAMI_IRQSTATUS_ACK 1 +#define KONAMI_IRQSTATUS_AUTO 2 #define KONAMI_INPUT_LINE_NMI 0x20 void konamiSetIrqLine(INT32 line, INT32 state); diff --git a/src/cpu/m6502_intf.cpp b/src/cpu/m6502_intf.cpp index 647bab054..61b40a4fa 100644 --- a/src/cpu/m6502_intf.cpp +++ b/src/cpu/m6502_intf.cpp @@ -253,15 +253,15 @@ void M6502SetIRQLine(INT32 vector, INT32 status) if (nActiveCPU == -1) bprintf(PRINT_ERROR, _T("M6502SetIRQLineLine called with no CPU open\n")); #endif - if (status == CPU_IRQSTATUS_NONE) { + if (status == M6502_IRQSTATUS_NONE) { pCurrentCPU->set_irq_line(vector, 0); } - if (status == CPU_IRQSTATUS_ACK) { + if (status == M6502_IRQSTATUS_ACK) { pCurrentCPU->set_irq_line(vector, 1); } - if (status == CPU_IRQSTATUS_AUTO) { + if (status == M6502_IRQSTATUS_AUTO) { pCurrentCPU->set_irq_line(vector, 1); pCurrentCPU->execute(0); pCurrentCPU->set_irq_line(vector, 0); @@ -302,13 +302,13 @@ INT32 M6502MapMemory(UINT8* pMemory, UINT16 nStart, UINT16 nEnd, INT32 nType) UINT8 **pMemMap = pCurrentCPU->pMemMap; for (UINT16 i = cStart; i <= (nEnd >> 8); i++) { - if (nType & MAP_READ) { + if (nType & M6502_READ) { pMemMap[0 + i] = pMemory + ((i - cStart) << 8); } - if (nType & MAP_WRITE) { + if (nType & M6502_WRITE) { pMemMap[0x100 + i] = pMemory + ((i - cStart) << 8); } - if (nType & MAP_FETCH) { + if (nType & M6502_FETCH) { pMemMap[0x200 + i] = pMemory + ((i - cStart) << 8); } } diff --git a/src/cpu/m6502_intf.h b/src/cpu/m6502_intf.h index 673ad5a65..b76b0e63d 100644 --- a/src/cpu/m6502_intf.h +++ b/src/cpu/m6502_intf.h @@ -34,6 +34,17 @@ struct M6502Ext { INT32 nCyclesLeft; }; +#define M6502_IRQSTATUS_NONE 0 +#define M6502_IRQSTATUS_ACK 1 +#define M6502_IRQSTATUS_AUTO 2 + +#define M6502_READ 1 +#define M6502_WRITE 2 +#define M6502_FETCH 4 + +#define M6502_RAM (M6502_READ | M6502_WRITE | M6502_FETCH) +#define M6502_ROM (M6502_READ | M6502_FETCH) + extern INT32 nM6502Count; extern INT32 nM6502CyclesTotal; diff --git a/src/cpu/m68000_intf.cpp b/src/cpu/m68000_intf.cpp index 04e1fa8ad..5454a96f0 100644 --- a/src/cpu/m68000_intf.cpp +++ b/src/cpu/m68000_intf.cpp @@ -1178,15 +1178,13 @@ INT32 SekGetActive() } // Set the status of an IRQ line on the active CPU -void SekSetIRQLine(const INT32 line, const INT32 nstatus) +void SekSetIRQLine(const INT32 line, const INT32 status) { #if defined FBA_DEBUG if (!DebugCPU_SekInitted) bprintf(PRINT_ERROR, _T("SekSetIRQLine called without init\n")); if (nSekActive == -1) bprintf(PRINT_ERROR, _T("SekSetIRQLine called when no CPU open\n")); #endif - INT32 status = nstatus << 12; // needed for compatibility - // bprintf(PRINT_NORMAL, _T(" - irq line %i -> %i\n"), line, status); if (status) { @@ -1513,7 +1511,7 @@ INT32 SekMapMemory(UINT8* pMemory, UINT32 nStart, UINT32 nEnd, INT32 nType) UINT8** pMemMap = pSekExt->MemMap + (nStart >> SEK_SHIFT); // Special case for ROM banks - if (nType == MAP_ROM) { + if (nType == SM_ROM) { for (UINT32 i = (nStart & ~SEK_PAGEM); i <= nEnd; i += SEK_PAGE_SIZE, pMemMap++) { pMemMap[0] = Ptr + i; pMemMap[SEK_WADD * 2] = Ptr + i; @@ -1524,13 +1522,13 @@ INT32 SekMapMemory(UINT8* pMemory, UINT32 nStart, UINT32 nEnd, INT32 nType) for (UINT32 i = (nStart & ~SEK_PAGEM); i <= nEnd; i += SEK_PAGE_SIZE, pMemMap++) { - if (nType & MAP_READ) { // Read + if (nType & SM_READ) { // Read pMemMap[0] = Ptr + i; } - if (nType & MAP_WRITE) { // Write + if (nType & SM_WRITE) { // Write pMemMap[SEK_WADD] = Ptr + i; } - if (nType & MAP_FETCH) { // Fetch + if (nType & SM_FETCH) { // Fetch pMemMap[SEK_WADD * 2] = Ptr + i; } } @@ -1550,13 +1548,13 @@ INT32 SekMapHandler(uintptr_t nHandler, UINT32 nStart, UINT32 nEnd, INT32 nType) // Add to memory map for (UINT32 i = (nStart & ~SEK_PAGEM); i <= nEnd; i += SEK_PAGE_SIZE, pMemMap++) { - if (nType & MAP_READ) { // Read + if (nType & SM_READ) { // Read pMemMap[0] = (UINT8*)nHandler; } - if (nType & MAP_WRITE) { // Write + if (nType & SM_WRITE) { // Write pMemMap[SEK_WADD] = (UINT8*)nHandler; } - if (nType & MAP_FETCH) { // Fetch + if (nType & SM_FETCH) { // Fetch pMemMap[SEK_WADD * 2] = (UINT8*)nHandler; } } diff --git a/src/cpu/m68000_intf.h b/src/cpu/m68000_intf.h index 0807a21d7..1c183eee3 100644 --- a/src/cpu/m68000_intf.h +++ b/src/cpu/m68000_intf.h @@ -204,6 +204,12 @@ inline static INT32 SekCurrentScanline() return SekTotalCycles() / nSekCyclesScanline; } +// SekMemory types: +#define SM_READ (1) +#define SM_WRITE (2) +#define SM_FETCH (4) +#define SM_ROM (SM_READ | SM_FETCH) +#define SM_RAM (SM_READ | SM_WRITE | SM_FETCH) // Map areas of memory INT32 SekMapMemory(UINT8* pMemory, UINT32 nStart, UINT32 nEnd, INT32 nType); diff --git a/src/cpu/m6800_intf.cpp b/src/cpu/m6800_intf.cpp index 62911286c..0b9b2953f 100644 --- a/src/cpu/m6800_intf.cpp +++ b/src/cpu/m6800_intf.cpp @@ -227,15 +227,15 @@ void M6800SetIRQLine(INT32 vector, INT32 status) if (nCpuType != CPU_TYPE_M6800) bprintf(PRINT_ERROR, _T("M6800SetIRQLine called with invalid CPU Type\n")); #endif - if (status == CPU_IRQSTATUS_NONE) { + if (status == M6800_IRQSTATUS_NONE) { m6800_set_irq_line(vector, 0); } - if (status == CPU_IRQSTATUS_ACK) { + if (status == M6800_IRQSTATUS_ACK) { m6800_set_irq_line(vector, 1); } - if (status == CPU_IRQSTATUS_AUTO) { + if (status == M6800_IRQSTATUS_AUTO) { m6800_set_irq_line(vector, 1); m6800_execute(0); m6800_set_irq_line(vector, 0); @@ -250,15 +250,15 @@ void HD63701SetIRQLine(INT32 vector, INT32 status) if (nCpuType != CPU_TYPE_HD63701) bprintf(PRINT_ERROR, _T("HD63701SetIRQLine called with invalid CPU Type\n")); #endif - if (status == CPU_IRQSTATUS_NONE) { + if (status == HD63701_IRQSTATUS_NONE) { m6800_set_irq_line(vector, 0); } - if (status == CPU_IRQSTATUS_ACK) { + if (status == HD63701_IRQSTATUS_ACK) { m6800_set_irq_line(vector, 1); } - if (status == CPU_IRQSTATUS_AUTO) { + if (status == HD63701_IRQSTATUS_AUTO) { m6800_set_irq_line(vector, 1); hd63701_execute(0); m6800_set_irq_line(vector, 0); @@ -273,15 +273,15 @@ void M6803SetIRQLine(INT32 vector, INT32 status) if (nCpuType != CPU_TYPE_M6803) bprintf(PRINT_ERROR, _T("M6803SetIRQLine called with invalid CPU Type\n")); #endif - if (status == CPU_IRQSTATUS_NONE) { + if (status == M6803_IRQSTATUS_NONE) { m6800_set_irq_line(vector, 0); } - if (status == CPU_IRQSTATUS_ACK) { + if (status == M6803_IRQSTATUS_ACK) { m6800_set_irq_line(vector, 1); } - if (status == CPU_IRQSTATUS_AUTO) { + if (status == M6803_IRQSTATUS_AUTO) { m6800_set_irq_line(vector, 1); m6803_execute(0); m6800_set_irq_line(vector, 0); @@ -296,15 +296,15 @@ void M6801SetIRQLine(INT32 vector, INT32 status) if (nCpuType != CPU_TYPE_M6801) bprintf(PRINT_ERROR, _T("M6800SetIRQLine called with invalid CPU Type\n")); #endif - if (status == CPU_IRQSTATUS_NONE) { + if (status == M6801_IRQSTATUS_NONE) { m6800_set_irq_line(vector, 0); } - if (status == CPU_IRQSTATUS_ACK) { + if (status == M6801_IRQSTATUS_ACK) { m6800_set_irq_line(vector, 1); } - if (status == CPU_IRQSTATUS_AUTO) { + if (status == M6801_IRQSTATUS_AUTO) { m6800_set_irq_line(vector, 1); m6803_execute(0); m6800_set_irq_line(vector, 0); @@ -380,13 +380,13 @@ INT32 M6800MapMemory(UINT8* pMemory, UINT16 nStart, UINT16 nEnd, INT32 nType) UINT8 **pMemMap = M6800CPUContext[0].pMemMap; for (UINT16 i = cStart; i <= (nEnd >> 8); i++) { - if (nType & MAP_READ) { + if (nType & M6800_READ) { pMemMap[0 + i] = pMemory + ((i - cStart) << 8); } - if (nType & MAP_WRITE) { + if (nType & M6800_WRITE) { pMemMap[0x100 + i] = pMemory + ((i - cStart) << 8); } - if (nType & MAP_FETCH) { + if (nType & M6800_FETCH) { pMemMap[0x200 + i] = pMemory + ((i - cStart) << 8); } } diff --git a/src/cpu/m6800_intf.h b/src/cpu/m6800_intf.h index f70cf5fa4..fa0cd448a 100644 --- a/src/cpu/m6800_intf.h +++ b/src/cpu/m6800_intf.h @@ -25,20 +25,61 @@ struct M6800Ext { INT32 nCyclesLeft; }; +#define M6800_IRQSTATUS_NONE 0 +#define M6800_IRQSTATUS_ACK 1 +#define M6800_IRQSTATUS_AUTO 2 +#define HD63701_IRQSTATUS_NONE M6800_IRQSTATUS_NONE +#define HD63701_IRQSTATUS_ACK M6800_IRQSTATUS_ACK +#define HD63701_IRQSTATUS_AUTO M6800_IRQSTATUS_AUTO #define HD63701_INPUT_LINE_NMI M6800_INPUT_LINE_NMI #define HD63701_IRQ_LINE M6800_IRQ_LINE #define HD63701_TIN_LINE M6800_TIN_LINE +#define M6801_IRQSTATUS_NONE M6800_IRQSTATUS_NONE +#define M6801_IRQSTATUS_ACK M6800_IRQSTATUS_ACK +#define M6801_IRQSTATUS_AUTO M6800_IRQSTATUS_AUTO + #define M6801_INPUT_LINE_NMI M6800_INPUT_LINE_NMI #define M6801_IRQ_LINE M6800_IRQ_LINE #define M6801_TIN_LINE M6800_TIN_LINE +#define M6803_IRQSTATUS_NONE M6800_IRQSTATUS_NONE +#define M6803_IRQSTATUS_ACK M6800_IRQSTATUS_ACK +#define M6803_IRQSTATUS_AUTO M6800_IRQSTATUS_AUTO + #define M6803_INPUT_LINE_NMI M6800_INPUT_LINE_NMI #define M6803_IRQ_LINE M6800_IRQ_LINE #define M6803_TIN_LINE M6800_TIN_LINE +#define M6800_READ 1 +#define M6800_WRITE 2 +#define M6800_FETCH 4 + +#define HD63701_READ 1 +#define HD63701_WRITE 2 +#define HD63701_FETCH 4 + +#define M6801_READ 1 +#define M6801_WRITE 2 +#define M6801_FETCH 4 + +#define M6803_READ 1 +#define M6803_WRITE 2 +#define M6803_FETCH 4 + +#define M6800_RAM (M6800_READ | M6800_WRITE | M6800_FETCH) +#define M6800_ROM (M6800_READ | M6800_FETCH) + +#define HD63701_RAM (HD63701_READ | HD63701_WRITE | HD63701_FETCH) +#define HD63701_ROM (HD63701_READ | HD63701_FETCH) + +#define M6801_RAM (M6801_READ | M6801_WRITE | M6801_FETCH) +#define M6801_ROM (M6801_READ | M6801_FETCH) + +#define M6803_RAM (M6803_READ | M6803_WRITE | M6803_FETCH) +#define M6803_ROM (M6803_READ | M6803_FETCH) #define CPU_TYPE_M6800 1 #define CPU_TYPE_HD63701 2 diff --git a/src/cpu/m6805/6805ops.c b/src/cpu/m6805/6805ops.c index 76028566a..f26bef795 100644 --- a/src/cpu/m6805/6805ops.c +++ b/src/cpu/m6805/6805ops.c @@ -175,11 +175,11 @@ M6805_INLINE void bil( void ) { if(SUBTYPE==SUBTYPE_HD63705) { - BRANCH( m6805.nmi_state!=CLEAR_LINE ); + BRANCH( m6805.nmi_state!=CPU_IRQSTATUS_NONE ); } else { - BRANCH( m6805.irq_state[0]!=CLEAR_LINE ); + BRANCH( m6805.irq_state[0]!=CPU_IRQSTATUS_NONE ); } } @@ -188,11 +188,11 @@ M6805_INLINE void bih( void ) { if(SUBTYPE==SUBTYPE_HD63705) { - BRANCH( m6805.nmi_state==CLEAR_LINE ); + BRANCH( m6805.nmi_state==CPU_IRQSTATUS_NONE ); } else { - BRANCH( m6805.irq_state[0]==CLEAR_LINE ); + BRANCH( m6805.irq_state[0]==CPU_IRQSTATUS_NONE ); } } @@ -802,7 +802,7 @@ M6805_INLINE void rti( void ) PULLWORD(pPC); change_pc(PC); #if IRQ_LEVEL_DETECT - if( m6805.irq_state != CLEAR_LINE && (CC & IFLAG) == 0 ) + if( m6805.irq_state != CPU_IRQSTATUS_NONE && (CC & IFLAG) == 0 ) m6805.pending_interrupts |= M6805_INT_IRQ; #endif } diff --git a/src/cpu/m6805/m6805.cpp b/src/cpu/m6805/m6805.cpp index 000f67fc3..6a36ea2d1 100644 --- a/src/cpu/m6805/m6805.cpp +++ b/src/cpu/m6805/m6805.cpp @@ -479,7 +479,7 @@ void m6805SetIrqLine(int , int state) if (m6805.irq_state[0] == state) return; m6805.irq_state[0] = state; - if (state != CLEAR_LINE) + if (state != CPU_IRQSTATUS_NONE) m6805.pending_interrupts |= 1<> 8); i++) { - if (nType & MAP_READ) { + if (nType & M6809_READ) { pMemMap[0 + i] = pMemory + ((i - cStart) << 8); } - if (nType & MAP_WRITE) { + if (nType & M6809_WRITE) { pMemMap[0x100 + i] = pMemory + ((i - cStart) << 8); } - if (nType & MAP_FETCH) { + if (nType & M6809_FETCH) { pMemMap[0x200 + i] = pMemory + ((i - cStart) << 8); } } diff --git a/src/cpu/m6809_intf.h b/src/cpu/m6809_intf.h index c57f4d699..9a7b238f7 100644 --- a/src/cpu/m6809_intf.h +++ b/src/cpu/m6809_intf.h @@ -21,6 +21,17 @@ struct M6809Ext { INT32 nCyclesLeft; }; +#define M6809_IRQSTATUS_NONE 0 +#define M6809_IRQSTATUS_ACK 1 +#define M6809_IRQSTATUS_AUTO 2 + +#define M6809_READ 1 +#define M6809_WRITE 2 +#define M6809_FETCH 4 + +#define M6809_RAM (M6809_READ | M6809_WRITE | M6809_FETCH) +#define M6809_ROM (M6809_READ | M6809_FETCH) + extern INT32 nM6809Count; extern INT32 nM6809CyclesTotal; diff --git a/src/cpu/nec/nec.cpp b/src/cpu/nec/nec.cpp index 5beb5d2b7..3dbd19f97 100644 --- a/src/cpu/nec/nec.cpp +++ b/src/cpu/nec/nec.cpp @@ -105,7 +105,7 @@ #include #include -#include "driver.h" +#include "burn.h" #include "state.h" #include "nec_intf.h" #include "bitswap.h" @@ -294,7 +294,7 @@ static void external_int(nec_state_t *nec_state) /* the actual vector is retrieved after pushing flags */ /* and clearing the IF */ nec_interrupt(nec_state, (UINT32)-1, INT_IRQ); - nec_state->irq_state = CLEAR_LINE; + nec_state->irq_state = CPU_IRQSTATUS_NONE; nec_state->pending_irq &= ~INT_IRQ; } } @@ -315,7 +315,7 @@ void nec_set_irq_line_and_vector(int irqline, int vector, int state) { case 0: nec_state->irq_state = state; - if (state == CLEAR_LINE) + if (state == CPU_IRQSTATUS_NONE) nec_state->pending_irq &= ~INT_IRQ; else { @@ -327,7 +327,7 @@ void nec_set_irq_line_and_vector(int irqline, int vector, int state) case INPUT_LINE_NMI: if (nec_state->nmi_state == (unsigned int)state) return; nec_state->nmi_state = state; - if (state != CLEAR_LINE) + if (state != CPU_IRQSTATUS_NONE) { nec_state->vector = vector; nec_state->pending_irq |= NMI_IRQ; diff --git a/src/cpu/nec_intf.cpp b/src/cpu/nec_intf.cpp index 4fd038c9f..1f5a0cff8 100644 --- a/src/cpu/nec_intf.cpp +++ b/src/cpu/nec_intf.cpp @@ -623,11 +623,11 @@ void VezSetIRQLineAndVector(const INT32 line, const INT32 vector, const INT32 st if (nOpenedCPU == -1) bprintf(PRINT_ERROR, _T("VezSetIRQLineAndVector called when no CPU open\n")); #endif - if (status == CPU_IRQSTATUS_AUTO) + if (status == VEZ_IRQSTATUS_AUTO) { - VezCurrentCPU->cpu_set_irq_line(line, vector, CPU_IRQSTATUS_ACK); + VezCurrentCPU->cpu_set_irq_line(line, vector, VEZ_IRQSTATUS_ACK); VezCurrentCPU->cpu_execute(100); - VezCurrentCPU->cpu_set_irq_line(line, vector, CPU_IRQSTATUS_NONE); + VezCurrentCPU->cpu_set_irq_line(line, vector, VEZ_IRQSTATUS_NONE); VezCurrentCPU->cpu_execute(100); } else diff --git a/src/cpu/nec_intf.h b/src/cpu/nec_intf.h index bca14b850..0b9f8a49c 100644 --- a/src/cpu/nec_intf.h +++ b/src/cpu/nec_intf.h @@ -64,5 +64,9 @@ INT32 VezRun(INT32 nCycles); #define NEC_INPUT_LINE_INTP2 12 #define NEC_INPUT_LINE_POLL 20 +#define VEZ_IRQSTATUS_NONE 0 +#define VEZ_IRQSTATUS_ACK 1 +#define VEZ_IRQSTATUS_AUTO 2 + void VezSetIRQLineAndVector(const INT32 line, const INT32 vector, const INT32 status); diff --git a/src/cpu/s2650_intf.h b/src/cpu/s2650_intf.h index 8ca000b63..517a83081 100644 --- a/src/cpu/s2650_intf.h +++ b/src/cpu/s2650_intf.h @@ -12,8 +12,17 @@ typedef INT32 (*s2650irqcallback)(INT32); extern s2650irqcallback s2650_irqcallback[MAX_S2650]; void s2650SetIrqCallback(INT32 (*irqcallback)(INT32)); +#define S2650_READ 1 +#define S2650_WRITE 2 +#define S2650_FETCH 4 +#define S2650_ROM (S2650_READ | S2650_FETCH) +#define S2650_RAM (S2650_ROM | S2650_WRITE) + void s2650MapMemory(UINT8 *src, INT32 start, INT32 end, INT32 type); +#define S2650_IRQSTATUS_ACK 1 +#define S2650_IRQSTATUS_NONE 0 + void s2650SetIRQLine(INT32 irqline, INT32 state); void s2650SetWriteHandler(void (*write)(UINT16, UINT8)); diff --git a/src/cpu/sh2/sh2.cpp b/src/cpu/sh2/sh2.cpp index c28d8fd9e..9c0daa55a 100644 --- a/src/cpu/sh2/sh2.cpp +++ b/src/cpu/sh2/sh2.cpp @@ -3406,7 +3406,7 @@ void Sh2SetIRQLine(const int line, const int state) if (sh2->irq_line_state[line] == state) return; sh2->irq_line_state[line] = state; - if( state == CPU_IRQSTATUS_NONE ) { + if( state == SH2_IRQSTATUS_NONE ) { // LOG(("SH-2 #%d cleared irq #%d\n", cpu_getactivecpu(), line)); sh2->pending_irq &= ~(1 << line); } else { diff --git a/src/cpu/sh2_intf.h b/src/cpu/sh2_intf.h index 958294721..fb724cfd1 100644 --- a/src/cpu/sh2_intf.h +++ b/src/cpu/sh2_intf.h @@ -36,6 +36,10 @@ int Sh2SetWriteWordHandler(int i, pSh2WriteWordHandler pHandler); int Sh2SetReadLongHandler(int i, pSh2ReadLongHandler pHandler); int Sh2SetWriteLongHandler(int i, pSh2WriteLongHandler pHandler); +#define SH2_IRQSTATUS_NONE (0x00) +#define SH2_IRQSTATUS_AUTO (0x01) +//#define SH2_IRQSTATUS_ACK (0x02) + void Sh2SetIRQLine(const int line, const int state); unsigned int Sh2GetPC(int n); @@ -50,3 +54,8 @@ void Sh2BurnCycles(int cycles); int Sh2Scan(int); +#define SH2_READ (1) +#define SH2_WRITE (2) +#define SH2_FETCH (4) +#define SH2_ROM (SH2_READ | SH2_FETCH) +#define SH2_RAM (SH2_READ | SH2_WRITE | SH2_FETCH) diff --git a/src/cpu/tlcs90_intf.h b/src/cpu/tlcs90_intf.h index 39b7cf17b..932595b7e 100644 --- a/src/cpu/tlcs90_intf.h +++ b/src/cpu/tlcs90_intf.h @@ -11,10 +11,18 @@ INT32 tlcs90Reset(); void tlcs90Close(); INT32 tlcs90Exit(); +#define TLCS90_IRQSTATUS_NONE 0 +#define TLCS90_IRQSTATUS_ACK 1 +#define TLCS90_IRQSTATUS_AUTO 2 + void tlcs90SetIRQLine(INT32 line, INT32 state); void tlcs90BurnCycles(INT32 nCpu, INT32 cycles); +#define TLCS90_ROM 1 +#define TLCS90_WRITE 2 +#define TLCS90_RAM 3 + void tlcs90MapMemory(UINT8 *rom, UINT32 start, UINT32 end, INT32 flags); void tlcs90NewFrame(); diff --git a/src/cpu/z80_intf.cpp b/src/cpu/z80_intf.cpp index ca0d8a3d0..6e6bb5699 100644 --- a/src/cpu/z80_intf.cpp +++ b/src/cpu/z80_intf.cpp @@ -672,13 +672,13 @@ void ZetSetIRQLine(const INT32 line, const INT32 status) #endif switch ( status ) { - case CPU_IRQSTATUS_NONE: + case ZET_IRQSTATUS_NONE: Z80SetIrqLine(line, 0); break; - case CPU_IRQSTATUS_ACK: + case ZET_IRQSTATUS_ACK: Z80SetIrqLine(line, 1); break; - case CPU_IRQSTATUS_AUTO: + case ZET_IRQSTATUS_AUTO: Z80SetIrqLine(line, 1); Z80Execute(0); Z80SetIrqLine(0, 0); diff --git a/src/cpu/z80_intf.h b/src/cpu/z80_intf.h index 980e8f71f..f12c871b3 100644 --- a/src/cpu/z80_intf.h +++ b/src/cpu/z80_intf.h @@ -18,13 +18,13 @@ void ZetOpen(INT32 nCPU); void ZetClose(); INT32 ZetGetActive(); -//#define ZET_FETCHOP 4 -//#define ZET_FETCHARG 8 -//#define ZET_READ 1 -//#define ZET_WRITE 2 -//#define ZET_FETCH (ZET_FETCHOP|ZET_FETCHARG) -//#define ZET_ROM (ZET_READ|ZET_FETCH) -//#define ZET_RAM (ZET_ROM|ZET_WRITE) +#define ZET_FETCHOP 4 +#define ZET_FETCHARG 8 +#define ZET_READ 1 +#define ZET_WRITE 2 +#define ZET_FETCH (ZET_FETCHOP|ZET_FETCHARG) +#define ZET_ROM (ZET_READ|ZET_FETCH) +#define ZET_RAM (ZET_ROM|ZET_WRITE) INT32 ZetUnmapMemory(INT32 nStart,INT32 nEnd,INT32 nFlags); void ZetMapMemory(UINT8 *Mem, INT32 nStart, INT32 nEnd, INT32 nFlags); @@ -52,8 +52,12 @@ INT32 ZetSegmentCycles(); INT32 ZetTotalCycles(); void ZetSetHL(INT32 n, UINT16 value); -//#define ZetRaiseIrq(n) ZetSetIRQLine(n, ZET_IRQSTATUS_AUTO) -//#define ZetLowerIrq() ZetSetIRQLine(0, Z80_CLEAR_LINE) +#define ZET_IRQSTATUS_NONE 0 +#define ZET_IRQSTATUS_ACK 1 +#define ZET_IRQSTATUS_AUTO 2 + +#define ZetRaiseIrq(n) ZetSetIRQLine(n, ZET_IRQSTATUS_AUTO) +#define ZetLowerIrq() ZetSetIRQLine(0, Z80_CLEAR_LINE) void ZetSetReadHandler(UINT8 (__fastcall *pHandler)(UINT16)); void ZetSetWriteHandler(void (__fastcall *pHandler)(UINT16, UINT8));