From 04e1d44a1cc9329ace6dc4a481340d5a1e562a83 Mon Sep 17 00:00:00 2001 From: iq_132 <1191709+iq132@users.noreply.github.com> Date: Tue, 10 Feb 2015 03:50:43 +0000 Subject: [PATCH] Phase 1. Kill off xxx_IRQSTATUS_yyyy in favor of CPU_IRQSTATUS_yyyy. Also kill off ZetRaiseIrq and ZetLowerIrq. Please play test! I've tested the most intensive games that use each cpu, but this isn't a large number of games. --- src/burn/burn.h | 29 ++++++++++ src/burn/devices/nmk004.cpp | 4 +- src/burn/devices/seibusnd.cpp | 4 +- src/burn/devices/t5182.cpp | 2 +- src/burn/devices/vdc.cpp | 16 +++--- src/burn/drv/capcom/cps_run.cpp | 6 +-- src/burn/drv/capcom/d_cps1.cpp | 2 +- src/burn/drv/capcom/fcrash_snd.cpp | 4 +- src/burn/drv/capcom/ps.cpp | 4 +- src/burn/drv/capcom/qs.cpp | 2 +- src/burn/drv/capcom/sf2mdt_snd.cpp | 4 +- src/burn/drv/cave/d_dodonpachi.cpp | 2 +- src/burn/drv/cave/d_donpachi.cpp | 2 +- src/burn/drv/cave/d_esprade.cpp | 2 +- src/burn/drv/cave/d_feversos.cpp | 2 +- src/burn/drv/cave/d_gaia.cpp | 2 +- src/burn/drv/cave/d_guwange.cpp | 2 +- src/burn/drv/cave/d_hotdogst.cpp | 6 +-- src/burn/drv/cave/d_korokoro.cpp | 2 +- src/burn/drv/cave/d_mazinger.cpp | 6 +-- src/burn/drv/cave/d_metmqstr.cpp | 8 +-- src/burn/drv/cave/d_pwrinst2.cpp | 6 +-- src/burn/drv/cave/d_sailormn.cpp | 8 ++- src/burn/drv/cave/d_tjumpman.cpp | 2 +- src/burn/drv/cave/d_uopoko.cpp | 2 +- src/burn/drv/coleco/d_coleco.cpp | 2 +- src/burn/drv/cps3/cps3run.cpp | 18 +++---- src/burn/drv/dataeast/d_actfancr.cpp | 12 ++--- src/burn/drv/dataeast/d_backfire.cpp | 2 +- src/burn/drv/dataeast/d_boogwing.cpp | 6 +-- src/burn/drv/dataeast/d_cbuster.cpp | 10 ++-- src/burn/drv/dataeast/d_cninja.cpp | 50 ++++++++--------- src/burn/drv/dataeast/d_darkseal.cpp | 6 +-- src/burn/drv/dataeast/d_dassault.cpp | 16 +++--- src/burn/drv/dataeast/d_dec0.cpp | 32 +++++------ src/burn/drv/dataeast/d_dec8.cpp | 74 +++++++++++++------------- src/burn/drv/dataeast/d_dietgogo.cpp | 6 +-- src/burn/drv/dataeast/d_funkyjet.cpp | 6 +-- src/burn/drv/dataeast/d_karnov.cpp | 22 ++++---- src/burn/drv/dataeast/d_lemmings.cpp | 8 +-- src/burn/drv/dataeast/d_pktgaldx.cpp | 2 +- src/burn/drv/dataeast/d_rohga.cpp | 22 ++++---- src/burn/drv/dataeast/d_sidepckt.cpp | 12 ++--- src/burn/drv/dataeast/d_simpl156.cpp | 2 +- src/burn/drv/dataeast/d_supbtime.cpp | 6 +-- src/burn/drv/dataeast/d_tumblep.cpp | 6 +-- src/burn/drv/dataeast/d_vaportra.cpp | 6 +-- src/burn/drv/dataeast/deco16ic.cpp | 4 +- src/burn/drv/galaxian/d_galaxian.cpp | 8 +-- src/burn/drv/galaxian/gal_run.cpp | 14 ++--- src/burn/drv/galaxian/gal_sound.cpp | 14 ++--- src/burn/drv/irem/d_m107.cpp | 22 ++++---- src/burn/drv/irem/d_m62.cpp | 8 +-- src/burn/drv/irem/d_m72.cpp | 12 ++--- src/burn/drv/irem/d_m90.cpp | 8 +-- src/burn/drv/irem/d_m92.cpp | 28 +++++----- src/burn/drv/irem/d_vigilant.cpp | 6 +-- src/burn/drv/konami/d_88games.cpp | 6 +-- src/burn/drv/konami/d_ajax.cpp | 8 +-- src/burn/drv/konami/d_aliens.cpp | 8 ++- src/burn/drv/konami/d_asterix.cpp | 6 +-- src/burn/drv/konami/d_battlnts.cpp | 6 +-- src/burn/drv/konami/d_bishi.cpp | 6 +-- src/burn/drv/konami/d_bladestl.cpp | 8 +-- src/burn/drv/konami/d_blockhl.cpp | 6 +-- src/burn/drv/konami/d_bottom9.cpp | 6 +-- src/burn/drv/konami/d_circusc.cpp | 6 +-- src/burn/drv/konami/d_contra.cpp | 8 +-- src/burn/drv/konami/d_crimfght.cpp | 6 +-- src/burn/drv/konami/d_dbz.cpp | 6 +-- src/burn/drv/konami/d_finalzr.cpp | 4 +- src/burn/drv/konami/d_gberet.cpp | 2 +- src/burn/drv/konami/d_gbusters.cpp | 6 +-- src/burn/drv/konami/d_gijoe.cpp | 10 ++-- src/burn/drv/konami/d_gradius3.cpp | 12 ++--- src/burn/drv/konami/d_gyruss.cpp | 12 ++--- src/burn/drv/konami/d_hcastle.cpp | 6 +-- src/burn/drv/konami/d_hexion.cpp | 2 +- src/burn/drv/konami/d_ironhors.cpp | 8 +-- src/burn/drv/konami/d_jailbrek.cpp | 4 +- src/burn/drv/konami/d_kontest.cpp | 4 +- src/burn/drv/konami/d_labyrunr.cpp | 4 +- src/burn/drv/konami/d_lethal.cpp | 6 +-- src/burn/drv/konami/d_mainevt.cpp | 10 ++-- src/burn/drv/konami/d_megazone.cpp | 6 +-- src/burn/drv/konami/d_mikie.cpp | 6 +-- src/burn/drv/konami/d_mogura.cpp | 2 +- src/burn/drv/konami/d_moo.cpp | 10 ++-- src/burn/drv/konami/d_mystwarr.cpp | 34 ++++++------ src/burn/drv/konami/d_nemesis.cpp | 42 +++++++-------- src/burn/drv/konami/d_parodius.cpp | 6 +-- src/burn/drv/konami/d_pooyan.cpp | 4 +- src/burn/drv/konami/d_rockrage.cpp | 6 +-- src/burn/drv/konami/d_rocnrope.cpp | 6 +-- src/burn/drv/konami/d_rollerg.cpp | 7 ++- src/burn/drv/konami/d_scotrsht.cpp | 6 +-- src/burn/drv/konami/d_shaolins.cpp | 4 +- src/burn/drv/konami/d_simpsons.cpp | 8 +-- src/burn/drv/konami/d_spy.cpp | 10 ++-- src/burn/drv/konami/d_surpratk.cpp | 2 +- src/burn/drv/konami/d_thunderx.cpp | 8 +-- src/burn/drv/konami/d_timeplt.cpp | 6 +-- src/burn/drv/konami/d_tmnt.cpp | 44 +++++++-------- src/burn/drv/konami/d_tutankhm.cpp | 6 +-- src/burn/drv/konami/d_twin16.cpp | 16 +++--- src/burn/drv/konami/d_ultraman.cpp | 2 +- src/burn/drv/konami/d_vendetta.cpp | 12 ++--- src/burn/drv/konami/d_xexex.cpp | 12 ++--- src/burn/drv/konami/d_xmen.cpp | 8 +-- src/burn/drv/konami/d_yiear.cpp | 4 +- src/burn/drv/konami/timeplt_snd.cpp | 2 +- src/burn/drv/megadrive/megadrive.cpp | 14 ++--- src/burn/drv/neogeo/neo_run.cpp | 30 +++++------ src/burn/drv/pgm/pgm_asic27a_type2.cpp | 6 +-- src/burn/drv/pgm/pgm_asic27a_type3.cpp | 2 +- src/burn/drv/pgm/pgm_run.cpp | 4 +- src/burn/drv/pre90s/d_1942.cpp | 6 +-- src/burn/drv/pre90s/d_1943.cpp | 8 +-- src/burn/drv/pre90s/d_4enraya.cpp | 2 +- src/burn/drv/pre90s/d_alinvade.cpp | 2 +- src/burn/drv/pre90s/d_alpha68k.cpp | 6 +-- src/burn/drv/pre90s/d_ambush.cpp | 2 +- src/burn/drv/pre90s/d_arabian.cpp | 2 +- src/burn/drv/pre90s/d_armedf.cpp | 8 +-- src/burn/drv/pre90s/d_atetris.cpp | 4 +- src/burn/drv/pre90s/d_aztarac.cpp | 6 +-- src/burn/drv/pre90s/d_baraduke.cpp | 6 +-- src/burn/drv/pre90s/d_bionicc.cpp | 4 +- src/burn/drv/pre90s/d_blktiger.cpp | 8 +-- src/burn/drv/pre90s/d_blockout.cpp | 8 +-- src/burn/drv/pre90s/d_blueprnt.cpp | 4 +- src/burn/drv/pre90s/d_capbowl.cpp | 8 +-- src/burn/drv/pre90s/d_commando.cpp | 6 +-- src/burn/drv/pre90s/d_cybertnk.cpp | 10 ++-- src/burn/drv/pre90s/d_ddragon.cpp | 46 ++++++++-------- src/burn/drv/pre90s/d_djboy.cpp | 6 +-- src/burn/drv/pre90s/d_dkong.cpp | 8 +-- src/burn/drv/pre90s/d_dynduke.cpp | 4 +- src/burn/drv/pre90s/d_epos.cpp | 2 +- src/burn/drv/pre90s/d_exedexes.cpp | 12 ++--- src/burn/drv/pre90s/d_funkybee.cpp | 2 +- src/burn/drv/pre90s/d_galaga.cpp | 4 +- src/burn/drv/pre90s/d_gauntlet.cpp | 16 +++--- src/burn/drv/pre90s/d_ginganin.cpp | 6 +-- src/burn/drv/pre90s/d_gng.cpp | 6 +-- src/burn/drv/pre90s/d_gunsmoke.cpp | 10 ++-- src/burn/drv/pre90s/d_higemaru.cpp | 6 +-- src/burn/drv/pre90s/d_ikki.cpp | 8 +-- src/burn/drv/pre90s/d_invaders.cpp | 4 +- src/burn/drv/pre90s/d_jack.cpp | 12 ++--- src/burn/drv/pre90s/d_kangaroo.cpp | 8 +-- src/burn/drv/pre90s/d_kncljoe.cpp | 8 +-- src/burn/drv/pre90s/d_kyugo.cpp | 2 +- src/burn/drv/pre90s/d_ladybug.cpp | 4 +- src/burn/drv/pre90s/d_lastduel.cpp | 12 ++--- src/burn/drv/pre90s/d_lwings.cpp | 8 +-- src/burn/drv/pre90s/d_mario.cpp | 4 +- src/burn/drv/pre90s/d_markham.cpp | 4 +- src/burn/drv/pre90s/d_meijinsn.cpp | 6 +-- src/burn/drv/pre90s/d_mitchell.cpp | 12 ++--- src/burn/drv/pre90s/d_mole.cpp | 2 +- src/burn/drv/pre90s/d_momoko.cpp | 2 +- src/burn/drv/pre90s/d_mrdo.cpp | 2 +- src/burn/drv/pre90s/d_mrflea.cpp | 6 +-- src/burn/drv/pre90s/d_mustache.cpp | 4 +- src/burn/drv/pre90s/d_mystston.cpp | 6 +-- src/burn/drv/pre90s/d_ninjakd2.cpp | 4 +- src/burn/drv/pre90s/d_pac2650.cpp | 4 +- src/burn/drv/pre90s/d_pacland.cpp | 8 +-- src/burn/drv/pre90s/d_pacman.cpp | 8 +-- src/burn/drv/pre90s/d_pkunwar.cpp | 2 +- src/burn/drv/pre90s/d_prehisle.cpp | 6 +-- src/burn/drv/pre90s/d_psychic5.cpp | 8 +-- src/burn/drv/pre90s/d_punchout.cpp | 2 +- src/burn/drv/pre90s/d_quizo.cpp | 2 +- src/burn/drv/pre90s/d_rallyx.cpp | 6 +-- src/burn/drv/pre90s/d_renegade.cpp | 12 ++--- src/burn/drv/pre90s/d_route16.cpp | 4 +- src/burn/drv/pre90s/d_rpunch.cpp | 10 ++-- src/burn/drv/pre90s/d_scregg.cpp | 6 +-- src/burn/drv/pre90s/d_sf.cpp | 10 ++-- src/burn/drv/pre90s/d_sidearms.cpp | 12 ++--- src/burn/drv/pre90s/d_skykid.cpp | 8 +-- src/burn/drv/pre90s/d_snk68.cpp | 6 +-- src/burn/drv/pre90s/d_solomon.cpp | 2 +- src/burn/drv/pre90s/d_sonson.cpp | 6 +-- src/burn/drv/pre90s/d_srumbler.cpp | 6 +-- src/burn/drv/pre90s/d_suna8.cpp | 28 +++++----- src/burn/drv/pre90s/d_tail2nose.cpp | 4 +- src/burn/drv/pre90s/d_tbowl.cpp | 6 +-- src/burn/drv/pre90s/d_tecmo.cpp | 6 +-- src/burn/drv/pre90s/d_terracre.cpp | 6 +-- src/burn/drv/pre90s/d_tigeroad.cpp | 8 +-- src/burn/drv/pre90s/d_timelimt.cpp | 2 +- src/burn/drv/pre90s/d_toki.cpp | 8 +-- src/burn/drv/pre90s/d_tsamurai.cpp | 16 +++--- src/burn/drv/pre90s/d_vulgus.cpp | 12 ++--- src/burn/drv/pre90s/d_wallc.cpp | 6 +-- src/burn/drv/pre90s/d_wc90.cpp | 8 +-- src/burn/drv/pre90s/d_wc90b.cpp | 12 ++--- src/burn/drv/pre90s/d_wwfsstar.cpp | 12 ++--- src/burn/drv/pre90s/d_xain.cpp | 24 ++++----- src/burn/drv/pre90s/d_xxmissio.cpp | 8 +-- src/burn/drv/psikyo/d_psikyo.cpp | 6 +-- src/burn/drv/psikyo/d_psikyo4.cpp | 8 +-- src/burn/drv/psikyo/d_psikyosh.cpp | 10 ++-- src/burn/drv/pst90s/d_1945kiii.cpp | 2 +- src/burn/drv/pst90s/d_aerofgt.cpp | 8 +-- src/burn/drv/pst90s/d_airbustr.cpp | 6 +-- src/burn/drv/pst90s/d_aquarium.cpp | 6 +-- src/burn/drv/pst90s/d_blmbycar.cpp | 2 +- src/burn/drv/pst90s/d_bloodbro.cpp | 6 +-- src/burn/drv/pst90s/d_crospang.cpp | 6 +-- src/burn/drv/pst90s/d_crshrace.cpp | 6 +-- src/burn/drv/pst90s/d_dcon.cpp | 2 +- src/burn/drv/pst90s/d_ddragon3.cpp | 8 +-- src/burn/drv/pst90s/d_deniam.cpp | 6 +-- src/burn/drv/pst90s/d_diverboy.cpp | 4 +- src/burn/drv/pst90s/d_dooyong.cpp | 24 ++++----- src/burn/drv/pst90s/d_drgnmst.cpp | 2 +- src/burn/drv/pst90s/d_drtomy.cpp | 2 +- src/burn/drv/pst90s/d_egghunt.cpp | 6 +-- src/burn/drv/pst90s/d_esd16.cpp | 6 +-- src/burn/drv/pst90s/d_f1gp.cpp | 8 +-- src/burn/drv/pst90s/d_fstarfrc.cpp | 6 +-- src/burn/drv/pst90s/d_funybubl.cpp | 4 +- src/burn/drv/pst90s/d_fuukifg3.cpp | 12 ++--- src/burn/drv/pst90s/d_gaelco.cpp | 6 +-- src/burn/drv/pst90s/d_gaiden.cpp | 8 +-- src/burn/drv/pst90s/d_galpanic.cpp | 18 +++---- src/burn/drv/pst90s/d_galspnbl.cpp | 6 +-- src/burn/drv/pst90s/d_gotcha.cpp | 6 +-- src/burn/drv/pst90s/d_gumbo.cpp | 2 +- src/burn/drv/pst90s/d_hyperpac.cpp | 52 +++++++++--------- src/burn/drv/pst90s/d_jchan.cpp | 14 ++--- src/burn/drv/pst90s/d_kaneko16.cpp | 26 ++++----- src/burn/drv/pst90s/d_lordgun.cpp | 6 +-- src/burn/drv/pst90s/d_mcatadv.cpp | 6 +-- src/burn/drv/pst90s/d_midas.cpp | 2 +- src/burn/drv/pst90s/d_mugsmash.cpp | 6 +-- src/burn/drv/pst90s/d_mwarr.cpp | 4 +- src/burn/drv/pst90s/d_news.cpp | 2 +- src/burn/drv/pst90s/d_nmg5.cpp | 6 +-- src/burn/drv/pst90s/d_nmk16.cpp | 70 ++++++++++++------------ src/burn/drv/pst90s/d_ohmygod.cpp | 2 +- src/burn/drv/pst90s/d_pass.cpp | 4 +- src/burn/drv/pst90s/d_pirates.cpp | 2 +- src/burn/drv/pst90s/d_playmark.cpp | 2 +- src/burn/drv/pst90s/d_powerins.cpp | 14 ++--- src/burn/drv/pst90s/d_pushman.cpp | 6 +-- src/burn/drv/pst90s/d_raiden.cpp | 4 +- src/burn/drv/pst90s/d_raiden2.cpp | 4 +- src/burn/drv/pst90s/d_sandscrp.cpp | 4 +- src/burn/drv/pst90s/d_seta.cpp | 24 ++++----- src/burn/drv/pst90s/d_seta2.cpp | 12 ++--- src/burn/drv/pst90s/d_shadfrce.cpp | 11 ++-- src/burn/drv/pst90s/d_silkroad.cpp | 2 +- src/burn/drv/pst90s/d_silvmil.cpp | 4 +- src/burn/drv/pst90s/d_speedspn.cpp | 6 +-- src/burn/drv/pst90s/d_suna16.cpp | 16 +++--- src/burn/drv/pst90s/d_suprnova.cpp | 20 +++---- src/burn/drv/pst90s/d_taotaido.cpp | 6 +-- src/burn/drv/pst90s/d_tecmosys.cpp | 8 +-- src/burn/drv/pst90s/d_tetrisp2.cpp | 8 +-- src/burn/drv/pst90s/d_tumbleb.cpp | 14 ++--- src/burn/drv/pst90s/d_unico.cpp | 4 +- src/burn/drv/pst90s/d_vmetal.cpp | 2 +- src/burn/drv/pst90s/d_welltris.cpp | 6 +-- src/burn/drv/pst90s/d_wwfwfest.cpp | 8 +-- src/burn/drv/pst90s/d_xorworld.cpp | 4 +- src/burn/drv/pst90s/d_yunsun16.cpp | 6 +-- src/burn/drv/pst90s/d_zerozone.cpp | 6 +-- src/burn/drv/sega/d_angelkds.cpp | 6 +-- src/burn/drv/sega/d_dotrikun.cpp | 2 +- src/burn/drv/sega/d_hangon.cpp | 2 +- src/burn/drv/sega/d_suprloco.cpp | 4 +- src/burn/drv/sega/d_sys1.cpp | 4 +- src/burn/drv/sega/d_sys16b.cpp | 58 ++++++++++---------- src/burn/drv/sega/d_sys18.cpp | 2 +- src/burn/drv/sega/d_zaxxon.cpp | 10 ++-- src/burn/drv/sega/sys16_run.cpp | 70 ++++++++++++------------ src/burn/drv/sg1000/d_sg1000.cpp | 2 +- src/burn/drv/taito/d_arkanoid.cpp | 2 +- src/burn/drv/taito/d_ashnojoe.cpp | 6 +-- src/burn/drv/taito/d_asuka.cpp | 16 +++--- src/burn/drv/taito/d_bublbobl.cpp | 28 +++++----- src/burn/drv/taito/d_chaknpop.cpp | 2 +- src/burn/drv/taito/d_darius2.cpp | 10 ++-- src/burn/drv/taito/d_darkmist.cpp | 4 +- src/burn/drv/taito/d_exzisus.cpp | 8 +-- src/burn/drv/taito/d_flstory.cpp | 6 +-- src/burn/drv/taito/d_lkage.cpp | 6 +-- src/burn/drv/taito/d_minivdr.cpp | 2 +- src/burn/drv/taito/d_othunder.cpp | 10 ++-- src/burn/drv/taito/d_retofinv.cpp | 12 ++--- src/burn/drv/taito/d_slapshot.cpp | 10 ++-- src/burn/drv/taito/d_superchs.cpp | 14 ++--- src/burn/drv/taito/d_taitob.cpp | 8 +-- src/burn/drv/taito/d_taitof2.cpp | 14 ++--- src/burn/drv/taito/d_taitomisc.cpp | 30 +++++------ src/burn/drv/taito/d_taitox.cpp | 12 ++--- src/burn/drv/taito/d_taitoz.cpp | 14 ++--- src/burn/drv/taito/d_tnzs.cpp | 12 ++--- src/burn/drv/taito/d_wyvernf0.cpp | 4 +- src/burn/drv/toaplan/d_batrider.cpp | 8 +-- src/burn/drv/toaplan/d_batsugun.cpp | 2 +- src/burn/drv/toaplan/d_battleg.cpp | 6 +-- src/burn/drv/toaplan/d_bbakraid.cpp | 8 +-- src/burn/drv/toaplan/d_demonwld.cpp | 2 +- src/burn/drv/toaplan/d_dogyuun.cpp | 2 +- src/burn/drv/toaplan/d_fixeight.cpp | 2 +- src/burn/drv/toaplan/d_ghox.cpp | 2 +- src/burn/drv/toaplan/d_hellfire.cpp | 2 +- src/burn/drv/toaplan/d_kbash.cpp | 2 +- src/burn/drv/toaplan/d_kbash2.cpp | 2 +- src/burn/drv/toaplan/d_mahoudai.cpp | 2 +- src/burn/drv/toaplan/d_outzone.cpp | 2 +- src/burn/drv/toaplan/d_pipibibs.cpp | 2 +- src/burn/drv/toaplan/d_rallybik.cpp | 2 +- src/burn/drv/toaplan/d_samesame.cpp | 4 +- src/burn/drv/toaplan/d_shippumd.cpp | 2 +- src/burn/drv/toaplan/d_slapfght.cpp | 6 +-- src/burn/drv/toaplan/d_snowbro2.cpp | 2 +- src/burn/drv/toaplan/d_tekipaki.cpp | 2 +- src/burn/drv/toaplan/d_truxton.cpp | 2 +- src/burn/drv/toaplan/d_truxton2.cpp | 4 +- src/burn/drv/toaplan/d_vfive.cpp | 2 +- src/burn/drv/toaplan/d_vimana.cpp | 2 +- src/burn/drv/toaplan/d_zerowing.cpp | 2 +- src/burn/drv/toaplan/toaplan1.cpp | 4 +- src/burn/snd/ics2115.cpp | 4 +- src/cpu/arm7_intf.cpp | 8 +-- src/cpu/arm7_intf.h | 4 -- src/cpu/arm_intf.cpp | 8 +-- src/cpu/arm_intf.h | 4 -- src/cpu/h6280_intf.cpp | 2 +- src/cpu/h6280_intf.h | 4 -- src/cpu/hd6309_intf.cpp | 6 +-- src/cpu/hd6309_intf.h | 4 -- src/cpu/konami/konami.cpp | 18 +++---- src/cpu/konami_intf.cpp | 6 +-- src/cpu/konami_intf.h | 4 -- src/cpu/m6502_intf.cpp | 6 +-- src/cpu/m6502_intf.h | 4 -- src/cpu/m68000_intf.cpp | 4 +- src/cpu/m6800_intf.cpp | 24 ++++----- src/cpu/m6800_intf.h | 14 ----- src/cpu/m6809_intf.cpp | 6 +-- src/cpu/m6809_intf.h | 4 -- src/cpu/nec_intf.cpp | 6 +-- src/cpu/nec_intf.h | 4 -- src/cpu/s2650_intf.h | 3 -- src/cpu/sh2/sh2.cpp | 2 +- src/cpu/sh2_intf.h | 4 -- src/cpu/tlcs90_intf.h | 4 -- src/cpu/z80_intf.cpp | 6 +-- src/cpu/z80_intf.h | 8 +-- 357 files changed, 1468 insertions(+), 1506 deletions(-) diff --git a/src/burn/burn.h b/src/burn/burn.h index 9b5cc9dfb..876798676 100644 --- a/src/burn/burn.h +++ b/src/burn/burn.h @@ -169,6 +169,35 @@ struct BurnDIPInfo { char* szText; }; + +// --------------------------------------------------------------------------- +// Common CPU definitions + +#define CPU_IRQSTATUS_NONE 0 +#define CPU_IRQSTATUS_ACK 1 +#define CPU_IRQSTATUS_AUTO 2 + +#define CPU_IRQLINE0 0 +#define CPU_IRQLINE1 1 +#define CPU_IRQLINE2 2 +#define CPU_IRQLINE3 3 +#define CPU_IRQLINE4 4 +#define CPU_IRQLINE5 5 +#define CPU_IRQLINE6 6 +#define CPU_IRQLINE7 7 + +#define CPU_IRQLINE_IRQ CPU_IRQLINE0 +#define CPU_IRQLINE_FIRQ CPU_IRQLINE1 +#define CPU_IRQLINE_NMI 0x20 + +#define MAP_READ 1 +#define MAP_WRITE 2 +#define MAP_FETCHOP 4 +#define MAP_FETCHARG 8 +#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/nmk004.cpp b/src/burn/devices/nmk004.cpp index f98c52f92..2a10ec467 100644 --- a/src/burn/devices/nmk004.cpp +++ b/src/burn/devices/nmk004.cpp @@ -124,7 +124,7 @@ void NMK004_reset() static void NMK004YM2203IrqHandler(INT32, INT32 nStatus) { - tlcs90SetIRQLine(0, (nStatus) ? TLCS90_IRQSTATUS_ACK : TLCS90_IRQSTATUS_NONE); + tlcs90SetIRQLine(0, (nStatus) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } inline static double NMK004GetTime() @@ -217,7 +217,7 @@ void NMK004NmiWrite(INT32 data) { data ^= 0xff; // hack - no game works properly without this being inverted. - tlcs90SetIRQLine(0x20 /*nmi*/, (data & 1) ? TLCS90_IRQSTATUS_ACK : TLCS90_IRQSTATUS_NONE); + tlcs90SetIRQLine(0x20 /*nmi*/, (data & 1) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } void NMK004Write(INT32, INT32 data) diff --git a/src/burn/devices/seibusnd.cpp b/src/burn/devices/seibusnd.cpp index 658ad49ff..6156292bc 100644 --- a/src/burn/devices/seibusnd.cpp +++ b/src/burn/devices/seibusnd.cpp @@ -80,10 +80,10 @@ static void update_irq_lines(INT32 param) } if ((irq1 & irq2) == 0xff) { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } else { ZetSetVector(irq1 & irq2); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } } diff --git a/src/burn/devices/t5182.cpp b/src/burn/devices/t5182.cpp index 082a90f4f..4d81db360 100644 --- a/src/burn/devices/t5182.cpp +++ b/src/burn/devices/t5182.cpp @@ -48,7 +48,7 @@ void t5182_setirq_callback(INT32 param) break; } - ZetSetIRQLine(0, (irqstate) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (irqstate) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } diff --git a/src/burn/devices/vdc.cpp b/src/burn/devices/vdc.cpp index ae8e6fd08..21dc3ad1c 100644 --- a/src/burn/devices/vdc.cpp +++ b/src/burn/devices/vdc.cpp @@ -360,7 +360,7 @@ static void pce_refresh_sprites(INT32 which, INT32 line, UINT8 *drawn, UINT16 *l { /* note: flag is set only if irq is taken, Mizubaku Daibouken relies on this behaviour */ vdc_status[which] |= 0x02; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); } continue; /* Should cause an interrupt */ } @@ -404,7 +404,7 @@ static void pce_refresh_sprites(INT32 which, INT32 line, UINT8 *drawn, UINT16 *l else if (drawn[pixel_x] == 2) { if(vdc_data[which][0x05] & 0x01) - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); vdc_status[which] |= 0x01; } } @@ -454,7 +454,7 @@ static void pce_refresh_sprites(INT32 which, INT32 line, UINT8 *drawn, UINT16 *l else if ( drawn[pixel_x] == 2 ) { if(vdc_data[which][0x05] & 0x01) - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); vdc_status[which] |= 0x01; } } @@ -479,7 +479,7 @@ static void pce_refresh_sprites(INT32 which, INT32 line, UINT8 *drawn, UINT16 *l { /* note: flag is set only if irq is taken, Mizubaku Daibouken relies on this behaviour */ vdc_status[which] |= 0x02; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); } } else @@ -513,7 +513,7 @@ static void pce_refresh_sprites(INT32 which, INT32 line, UINT8 *drawn, UINT16 *l else if ( drawn[pixel_x] == 2 ) { if(vdc_data[which][0x05] & 0x01) - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); vdc_status[which] |= 0x01; } } @@ -694,7 +694,7 @@ static void vdc_advance_line(INT32 which) } if (ret) - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); } static void pce_refresh_line(INT32 which, INT32 /*line*/, INT32 external_input, UINT8 *drawn, UINT16 *line_buffer) @@ -1013,7 +1013,7 @@ static void vdc_do_dma(INT32 which) if (dvc) { - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); } } @@ -1129,7 +1129,7 @@ UINT8 vdc_read(INT32 which, UINT8 offset) case 0x00: { UINT8 ret = vdc_status[which]; vdc_status[which] &= ~0x3f; - h6280SetIRQLine(0, H6280_IRQSTATUS_NONE); + h6280SetIRQLine(0, CPU_IRQSTATUS_NONE); return ret; } diff --git a/src/burn/drv/capcom/cps_run.cpp b/src/burn/drv/capcom/cps_run.cpp index 3e119f057..5dad90b2c 100644 --- a/src/burn/drv/capcom/cps_run.cpp +++ b/src/burn/drv/capcom/cps_run.cpp @@ -252,7 +252,7 @@ static void DoIRQ() nRasterline[nInterrupt] = nIrqLine - nFirstLine; } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekRun(nCpsCycles * 0x01 / nCpsNumScanlines); if (nRasterline[nInterrupt] < 224) { CopyCpsReg(nInterrupt); @@ -334,7 +334,7 @@ INT32 Cps1Frame() memcpy(CpsSaveReg[0], CpsReg, 0x100); // Registers correct now - SekSetIRQLine(Cps1VBlankIRQLine, SEK_IRQSTATUS_AUTO); // Trigger VBlank interrupt + SekSetIRQLine(Cps1VBlankIRQLine, CPU_IRQSTATUS_AUTO); // Trigger VBlank interrupt } SekRun(nNext - SekTotalCycles()); // run 68K @@ -461,7 +461,7 @@ INT32 Cps2Frame() // nCpsCyclesSegment[0] = (nCpsCycles * nVBlank) / nCpsNumScanlines; // nDone += SekRun(nCpsCyclesSegment[0] - nDone); - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); // VBlank + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); // VBlank if (pBurnDraw) { CpsDraw(); } diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp index 49680029e..6994d04c2 100644 --- a/src/burn/drv/capcom/d_cps1.cpp +++ b/src/burn/drv/capcom/d_cps1.cpp @@ -13679,7 +13679,7 @@ static void GanabareTimeKeeperTick() if ((GetCurrentFrame() % 60) == 0) TimeKeeperTick(); // refresh is 59.61 SekOpen(0); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); } diff --git a/src/burn/drv/capcom/fcrash_snd.cpp b/src/burn/drv/capcom/fcrash_snd.cpp index a8194a754..3c23b0b8f 100644 --- a/src/burn/drv/capcom/fcrash_snd.cpp +++ b/src/burn/drv/capcom/fcrash_snd.cpp @@ -31,7 +31,7 @@ void FcrashSoundCommand(UINT16 d) } FcrashSoundLatch = d & 0xff; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } UINT8 __fastcall FcrashZ80Read(UINT16 a) @@ -46,7 +46,7 @@ UINT8 __fastcall FcrashZ80Read(UINT16 a) } case 0xe400: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return FcrashSoundLatch; } diff --git a/src/burn/drv/capcom/ps.cpp b/src/burn/drv/capcom/ps.cpp index aef77fa99..c48eceb10 100644 --- a/src/burn/drv/capcom/ps.cpp +++ b/src/burn/drv/capcom/ps.cpp @@ -15,10 +15,10 @@ static INT32 nCyclesDone; static void drvYM2151IRQHandler(INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); ZetRun(0x0800); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/capcom/qs.cpp b/src/burn/drv/capcom/qs.cpp index 3bb00e2d5..0d92e9cb6 100644 --- a/src/burn/drv/capcom/qs.cpp +++ b/src/burn/drv/capcom/qs.cpp @@ -6,7 +6,7 @@ static INT32 nQsndCyclesExtra; static INT32 qsndTimerOver(INT32, INT32) { // bprintf(PRINT_NORMAL, _T(" - IRQ -> 1.\n")); - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_AUTO); return 0; } diff --git a/src/burn/drv/capcom/sf2mdt_snd.cpp b/src/burn/drv/capcom/sf2mdt_snd.cpp index bb02541a9..4d6a1f847 100644 --- a/src/burn/drv/capcom/sf2mdt_snd.cpp +++ b/src/burn/drv/capcom/sf2mdt_snd.cpp @@ -32,7 +32,7 @@ void Sf2mdtSoundCommand(UINT16 d) } Sf2mdtSoundLatch = d & 0xff; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } UINT8 __fastcall Sf2mdtZ80Read(UINT16 a) @@ -43,7 +43,7 @@ UINT8 __fastcall Sf2mdtZ80Read(UINT16 a) } case 0xdc00: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return Sf2mdtSoundLatch; } diff --git a/src/burn/drv/cave/d_dodonpachi.cpp b/src/burn/drv/cave/d_dodonpachi.cpp index 127a420dc..4167fb9f0 100644 --- a/src/burn/drv/cave/d_dodonpachi.cpp +++ b/src/burn/drv/cave/d_dodonpachi.cpp @@ -62,7 +62,7 @@ STDINPUTINFO(ddonpach) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall ddonpachReadByte(UINT32 sekAddress) diff --git a/src/burn/drv/cave/d_donpachi.cpp b/src/burn/drv/cave/d_donpachi.cpp index 7bdaa7ef2..06d0c0a40 100644 --- a/src/burn/drv/cave/d_donpachi.cpp +++ b/src/burn/drv/cave/d_donpachi.cpp @@ -59,7 +59,7 @@ STDINPUTINFO(donpachi) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall donpachiReadByte(UINT32 sekAddress) diff --git a/src/burn/drv/cave/d_esprade.cpp b/src/burn/drv/cave/d_esprade.cpp index 6ee3b569f..e59ac93ad 100644 --- a/src/burn/drv/cave/d_esprade.cpp +++ b/src/burn/drv/cave/d_esprade.cpp @@ -76,7 +76,7 @@ STDDIPINFO(esprade) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall espradeReadByte(UINT32 sekAddress) diff --git a/src/burn/drv/cave/d_feversos.cpp b/src/burn/drv/cave/d_feversos.cpp index f10e7cd18..a50562167 100644 --- a/src/burn/drv/cave/d_feversos.cpp +++ b/src/burn/drv/cave/d_feversos.cpp @@ -62,7 +62,7 @@ STDINPUTINFO(feversos) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall feversosReadByte(UINT32 sekAddress) diff --git a/src/burn/drv/cave/d_gaia.cpp b/src/burn/drv/cave/d_gaia.cpp index aa9526094..27bf46a29 100644 --- a/src/burn/drv/cave/d_gaia.cpp +++ b/src/burn/drv/cave/d_gaia.cpp @@ -248,7 +248,7 @@ STDDIPINFO(theroes) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall gaiaReadByte(UINT32 sekAddress) diff --git a/src/burn/drv/cave/d_guwange.cpp b/src/burn/drv/cave/d_guwange.cpp index 7ce153721..3c046e678 100644 --- a/src/burn/drv/cave/d_guwange.cpp +++ b/src/burn/drv/cave/d_guwange.cpp @@ -62,7 +62,7 @@ STDINPUTINFO(guwange) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall guwangeReadByte(UINT32 sekAddress) diff --git a/src/burn/drv/cave/d_hotdogst.cpp b/src/burn/drv/cave/d_hotdogst.cpp index 5dedd56d6..3c82b9519 100644 --- a/src/burn/drv/cave/d_hotdogst.cpp +++ b/src/burn/drv/cave/d_hotdogst.cpp @@ -67,7 +67,7 @@ STDINPUTINFO(hotdogst) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall hotdogstReadByte(UINT32 sekAddress) @@ -591,9 +591,9 @@ static INT32 DrvScan(INT32 nAction, INT32 *pnMin) static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/cave/d_korokoro.cpp b/src/burn/drv/cave/d_korokoro.cpp index 87c480722..a74fa3d63 100644 --- a/src/burn/drv/cave/d_korokoro.cpp +++ b/src/burn/drv/cave/d_korokoro.cpp @@ -74,7 +74,7 @@ static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(2, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(2, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall korokoroReadByte(UINT32 sekAddress) diff --git a/src/burn/drv/cave/d_mazinger.cpp b/src/burn/drv/cave/d_mazinger.cpp index 2b9e2911c..55f148076 100644 --- a/src/burn/drv/cave/d_mazinger.cpp +++ b/src/burn/drv/cave/d_mazinger.cpp @@ -74,7 +74,7 @@ STDINPUTINFO(mazinger) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall mazingerReadByte(UINT32 sekAddress) @@ -634,9 +634,9 @@ static INT32 DrvScan(INT32 nAction, INT32 *pnMin) static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/cave/d_metmqstr.cpp b/src/burn/drv/cave/d_metmqstr.cpp index 10b2bd46f..6a946694c 100644 --- a/src/burn/drv/cave/d_metmqstr.cpp +++ b/src/burn/drv/cave/d_metmqstr.cpp @@ -76,7 +76,7 @@ STDINPUTINFO(metmqstr) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall metmqstrReadByte(UINT32 sekAddress) @@ -477,7 +477,7 @@ static INT32 DrvFrame() UpdateIRQStatus(); } - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; if (!CheckSleep(nCurrentCPU)) { // See if this CPU is busywaiting @@ -690,9 +690,9 @@ static INT32 drvZInit() static void DrvYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/cave/d_pwrinst2.cpp b/src/burn/drv/cave/d_pwrinst2.cpp index 6411a36b9..583a13f33 100644 --- a/src/burn/drv/cave/d_pwrinst2.cpp +++ b/src/burn/drv/cave/d_pwrinst2.cpp @@ -74,7 +74,7 @@ STDINPUTINFO(pwrinst2) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall pwrinst2ReadByte(UINT32 sekAddress) @@ -823,9 +823,9 @@ static INT32 DrvScan(INT32 nAction, INT32 *pnMin) static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/cave/d_sailormn.cpp b/src/burn/drv/cave/d_sailormn.cpp index 2be22c3ca..3bbc65130 100644 --- a/src/burn/drv/cave/d_sailormn.cpp +++ b/src/burn/drv/cave/d_sailormn.cpp @@ -73,7 +73,7 @@ STDINPUTINFO(sailormn) static void UpdateIRQStatus() { INT32 nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static void drvZ80Bankswitch(INT32 nBank) @@ -90,11 +90,9 @@ static void drvZ80Bankswitch(INT32 nBank) static void drvYM2151IRQHandler(INT32 nStatus) { if (nStatus) { -// ZetRaiseIrq(255); -// nCaveCyclesDone[1] += ZetRun(0x0400); - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/cave/d_tjumpman.cpp b/src/burn/drv/cave/d_tjumpman.cpp index 9b8300aa9..ab0765c8f 100644 --- a/src/burn/drv/cave/d_tjumpman.cpp +++ b/src/burn/drv/cave/d_tjumpman.cpp @@ -61,7 +61,7 @@ STDDIPINFO(Tjumpman) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static INT32 tjumpman_hopper_read() diff --git a/src/burn/drv/cave/d_uopoko.cpp b/src/burn/drv/cave/d_uopoko.cpp index 29ced3314..c1482a06d 100644 --- a/src/burn/drv/cave/d_uopoko.cpp +++ b/src/burn/drv/cave/d_uopoko.cpp @@ -62,7 +62,7 @@ STDINPUTINFO(uopoko) static void UpdateIRQStatus() { nIRQPending = (nVideoIRQ == 0 || nSoundIRQ == 0 || nUnknownIRQ == 0); - SekSetIRQLine(1, nIRQPending ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, nIRQPending ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } UINT8 __fastcall uopokoReadByte(UINT32 sekAddress) diff --git a/src/burn/drv/coleco/d_coleco.cpp b/src/burn/drv/coleco/d_coleco.cpp index 01dcb28f0..41d4507c5 100644 --- a/src/burn/drv/coleco/d_coleco.cpp +++ b/src/burn/drv/coleco/d_coleco.cpp @@ -247,7 +247,7 @@ static void paddle_callback() joy_status[1] = 1; if (joy_status[0] || joy_status[1]) { - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); // ACK? -- lower when input read? + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); // ACK? -- lower when input read? } } diff --git a/src/burn/drv/cps3/cps3run.cpp b/src/burn/drv/cps3/cps3run.cpp index 9e8ca8c8f..97f7fdc0a 100644 --- a/src/burn/drv/cps3/cps3run.cpp +++ b/src/burn/drv/cps3/cps3run.cpp @@ -442,25 +442,25 @@ static void cps3_process_character_dma(UINT32 address) switch ( dat1 & 0x00e00000 ) { case 0x00800000: chardma_table_address = real_source; - Sh2SetIRQLine(10, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(10, CPU_IRQSTATUS_AUTO); break; case 0x00400000: cps3_do_char_dma( real_source, real_destination, real_length ); - Sh2SetIRQLine(10, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(10, CPU_IRQSTATUS_AUTO); break; case 0x00600000: //bprintf(PRINT_NORMAL, _T("Character DMA (alt) start %08x to %08x with %d\n"), real_source, real_destination, real_length); /* 8bpp DMA decompression - this is used on SFIII NG Sean's Stage ONLY */ cps3_do_alt_char_dma( real_source, real_destination, real_length ); - Sh2SetIRQLine(10, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(10, CPU_IRQSTATUS_AUTO); break; case 0x00000000: // Red Earth need this. 8192 byte trans to 0x00003000 (from 0x007ec000???) // seems some stars(6bit alpha) without compress //bprintf(PRINT_NORMAL, _T("Character DMA (redearth) start %08x to %08x with %d\n"), real_source, real_destination, real_length); memcpy( (UINT8 *)RamCRam + real_destination, RomUser + real_source, real_length ); - Sh2SetIRQLine(10, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(10, CPU_IRQSTATUS_AUTO); break; default: bprintf(PRINT_NORMAL, _T("Character DMA Unknown DMA List Command Type %08x\n"), dat1); @@ -693,7 +693,7 @@ void __fastcall cps3WriteWord(UINT32 addr, UINT16 data) #endif Cps3CurPal[(paldma_dest + i) ] = BurnHighCol(r, g, b, 0); } - Sh2SetIRQLine(10, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(10, CPU_IRQSTATUS_AUTO); } break; @@ -713,10 +713,10 @@ void __fastcall cps3WriteWord(UINT32 addr, UINT16 data) case 0x05050026: break; case 0x05100000: - Sh2SetIRQLine(12, SH2_IRQSTATUS_NONE); + Sh2SetIRQLine(12, CPU_IRQSTATUS_NONE); break; case 0x05110000: - Sh2SetIRQLine(10, SH2_IRQSTATUS_NONE); + Sh2SetIRQLine(10, CPU_IRQSTATUS_NONE); break; case 0x05140000: @@ -2015,11 +2015,11 @@ INT32 cps3Frame() if (cps_int10_cnt >= 2) { cps_int10_cnt = 0; - Sh2SetIRQLine(10, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(10, CPU_IRQSTATUS_AUTO); } else cps_int10_cnt++; } - Sh2SetIRQLine(12, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(12, CPU_IRQSTATUS_AUTO); cps3SndUpdate(); diff --git a/src/burn/drv/dataeast/d_actfancr.cpp b/src/burn/drv/dataeast/d_actfancr.cpp index e38136b28..7c14d13d0 100644 --- a/src/burn/drv/dataeast/d_actfancr.cpp +++ b/src/burn/drv/dataeast/d_actfancr.cpp @@ -241,7 +241,7 @@ void actfan_main_write(UINT32 address, UINT8 data) case 0x150000: *soundlatch = data; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; case 0x160000: @@ -291,7 +291,7 @@ void triothep_main_write(UINT32 address, UINT8 data) { case 0x100000: *soundlatch = data; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; case 0x110000: @@ -369,7 +369,7 @@ static UINT8 Dec0_sound_read(UINT16 address) switch (address) { case 0x3000: - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_NONE); return *soundlatch; case 0x3800: @@ -392,9 +392,9 @@ inline static double Dec0YM2203GetTime() static void Dec0YM3812IRQHandler(INT32, INT32 nStatus) { if (nStatus) { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_ACK); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_ACK); } else { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_NONE); } } @@ -911,7 +911,7 @@ static INT32 DrvFrame() if (i == 1) vblank = 0; if (i == 30) { vblank = 0x80; - h6280SetIRQLine(0, H6280_IRQSTATUS_AUTO); + h6280SetIRQLine(0, CPU_IRQSTATUS_AUTO); } BurnTimerUpdateYM3812(i * (nCyclesTotal[1] / nInterleave)); // m6502 diff --git a/src/burn/drv/dataeast/d_backfire.cpp b/src/burn/drv/dataeast/d_backfire.cpp index 8ef13081b..bdb4770f1 100644 --- a/src/burn/drv/dataeast/d_backfire.cpp +++ b/src/burn/drv/dataeast/d_backfire.cpp @@ -614,7 +614,7 @@ static INT32 DrvFrame() ArmOpen(0); deco16_vblank = 0x10; ArmRun(nTotalCycles - 2240); - ArmSetIRQLine(ARM_IRQ_LINE, ARM_IRQSTATUS_AUTO); + ArmSetIRQLine(ARM_IRQ_LINE, CPU_IRQSTATUS_AUTO); deco16_vblank = 0x00; ArmRun(2240); ArmClose(); diff --git a/src/burn/drv/dataeast/d_boogwing.cpp b/src/burn/drv/dataeast/d_boogwing.cpp index b3ef512d9..3495b0459 100644 --- a/src/burn/drv/dataeast/d_boogwing.cpp +++ b/src/burn/drv/dataeast/d_boogwing.cpp @@ -159,7 +159,7 @@ void __fastcall boogwing_main_write_byte(UINT32 address, UINT8 data) case 0x24e151: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); break; case 0x282008: @@ -195,7 +195,7 @@ void __fastcall boogwing_main_write_word(UINT32 address, UINT16 data) case 0x24e150: deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); break; case 0x282008: @@ -733,7 +733,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/dataeast/d_cbuster.cpp b/src/burn/drv/dataeast/d_cbuster.cpp index e3b535f8b..e139bc322 100644 --- a/src/burn/drv/dataeast/d_cbuster.cpp +++ b/src/burn/drv/dataeast/d_cbuster.cpp @@ -136,7 +136,7 @@ void __fastcall cbuster_main_write_word(UINT32 address, UINT16 data) case 0xbc002: deco16_soundlatch = data & 0xff; - //h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + //h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); // tempo fluctuation hack static UINT8 last_latch = 0; @@ -148,10 +148,10 @@ void __fastcall cbuster_main_write_word(UINT32 address, UINT16 data) if (latch_repeat) { if (latch_repeat%8 == 0) { - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); } } else { - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); } // end tempo fluctuation hack return; @@ -169,7 +169,7 @@ void __fastcall cbuster_main_write_byte(UINT32 address, UINT8 data) case 0xbc003: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0xbc004: @@ -642,7 +642,7 @@ static INT32 DrvFrame() nSoundBufferPos += nSegmentLength; } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(nCyclesTotal[1]); if (pBurnSoundOut) { diff --git a/src/burn/drv/dataeast/d_cninja.cpp b/src/burn/drv/dataeast/d_cninja.cpp index c0199fda0..0dfc8c949 100644 --- a/src/burn/drv/dataeast/d_cninja.cpp +++ b/src/burn/drv/dataeast/d_cninja.cpp @@ -524,7 +524,7 @@ void __fastcall cninja_main_write_word(UINT32 address, UINT16 data) ZetNmi(); } else { deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); } break; } @@ -587,7 +587,7 @@ void __fastcall cninja_main_write_byte(UINT32 address, UINT8 data) ZetNmi(); } else { deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); } break; } @@ -625,8 +625,8 @@ UINT16 __fastcall cninja_main_read_word(UINT32 address) case 0x1a4004: case 0x190004: - SekSetIRQLine(3, SEK_IRQSTATUS_NONE); - SekSetIRQLine(4, SEK_IRQSTATUS_NONE); + SekSetIRQLine(3, CPU_IRQSTATUS_NONE); + SekSetIRQLine(4, CPU_IRQSTATUS_NONE); return 0; } @@ -673,8 +673,8 @@ UINT8 __fastcall cninja_main_read_byte(UINT32 address) case 0x1a4005: // case 0x190004: case 0x190005: - SekSetIRQLine(3, SEK_IRQSTATUS_NONE); - SekSetIRQLine(4, SEK_IRQSTATUS_NONE); + SekSetIRQLine(3, CPU_IRQSTATUS_NONE); + SekSetIRQLine(4, CPU_IRQSTATUS_NONE); return 0; } @@ -704,7 +704,7 @@ void __fastcall mutantf_main_write_word(UINT32 address, UINT16 data) case 0x1a0064: deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); break; case 0x1c0000: @@ -743,7 +743,7 @@ void __fastcall mutantf_main_write_byte(UINT32 address, UINT8 data) case 0x1a0065: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); break; } @@ -801,7 +801,7 @@ void __fastcall robocop2_main_write_word(UINT32 address, UINT16 data) case 0x18c064: deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return;; case 0x1f0000: @@ -838,7 +838,7 @@ void __fastcall robocop2_main_write_byte(UINT32 address, UINT8 data) case 0x18c065: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); break; case 0x1f0000: @@ -868,8 +868,8 @@ UINT16 __fastcall robocop2_main_read_word(UINT32 address) return scanline; case 0x1b0004: - SekSetIRQLine(3, SEK_IRQSTATUS_NONE); - SekSetIRQLine(4, SEK_IRQSTATUS_NONE); + SekSetIRQLine(3, CPU_IRQSTATUS_NONE); + SekSetIRQLine(4, CPU_IRQSTATUS_NONE); return 0; case 0x1f8000: @@ -909,8 +909,8 @@ UINT8 __fastcall robocop2_main_read_byte(UINT32 address) case 0x1b0004: case 0x1b0005: - SekSetIRQLine(3, SEK_IRQSTATUS_NONE); - SekSetIRQLine(4, SEK_IRQSTATUS_NONE); + SekSetIRQLine(3, CPU_IRQSTATUS_NONE); + SekSetIRQLine(4, CPU_IRQSTATUS_NONE); return 0; case 0x1f8000: @@ -951,7 +951,7 @@ UINT8 __fastcall stoneage_sound_read(UINT16 address) return MSM6295ReadStatus(0); case 0xa000: - ZetSetIRQLine(0x20, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0x20, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -960,7 +960,7 @@ UINT8 __fastcall stoneage_sound_read(UINT16 address) static void DrvYM2151IrqHandler(INT32 state) { - ZetSetIRQLine(0, state ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, state ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static void DrvYM2151WritePort(UINT32, UINT32 data) @@ -2249,7 +2249,7 @@ static INT32 CninjaFrame() nCyclesDone[1] += h6280Run(nCyclesTotal[1] / nInterleave); if (irq_timer == i) { - SekSetIRQLine((irq_mask & 0x10) ? 3 : 4, SEK_IRQSTATUS_ACK); + SekSetIRQLine((irq_mask & 0x10) ? 3 : 4, CPU_IRQSTATUS_ACK); irq_timer = -1; } if (i == 206) deco16_vblank = 0x08; @@ -2260,7 +2260,7 @@ static INT32 CninjaFrame() nSoundBufferPos += nSegmentLength; } - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(nCyclesTotal[1]); if (pBurnSoundOut) { @@ -2325,7 +2325,7 @@ static INT32 EdrandyFrame() nCyclesDone[1] += h6280Run(nCyclesTotal[1] / nInterleave); if (irq_timer == i) { - SekSetIRQLine((irq_mask & 0x10) ? 3 : 4, SEK_IRQSTATUS_ACK); + SekSetIRQLine((irq_mask & 0x10) ? 3 : 4, CPU_IRQSTATUS_ACK); irq_timer = -1; } @@ -2338,7 +2338,7 @@ static INT32 EdrandyFrame() } if (i == 255) { - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); // deco16_vblank = 0x00; } @@ -2412,7 +2412,7 @@ static INT32 Robocop2Frame() nCyclesDone[1] += h6280Run(nCyclesTotal[1] / nInterleave); if (irq_timer == i) { - SekSetIRQLine((irq_mask & 0x10) ? 3 : 4, SEK_IRQSTATUS_ACK); + SekSetIRQLine((irq_mask & 0x10) ? 3 : 4, CPU_IRQSTATUS_ACK); irq_timer = -1; } @@ -2431,7 +2431,7 @@ static INT32 Robocop2Frame() nSoundBufferPos += nSegmentLength; } - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(nCyclesTotal[1]); if (pBurnSoundOut) { @@ -2503,7 +2503,7 @@ static INT32 MutantfFrame() } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; @@ -2556,7 +2556,7 @@ static INT32 StoneageFrame() nCyclesDone[1] += ZetRun(nCyclesTotal[1] / nInterleave); if (irq_timer == i) { - SekSetIRQLine((irq_mask & 0x10) ? 3 : 4, SEK_IRQSTATUS_ACK); + SekSetIRQLine((irq_mask & 0x10) ? 3 : 4, CPU_IRQSTATUS_ACK); irq_timer = -1; } if (i == 248) deco16_vblank = 0x08; @@ -2571,7 +2571,7 @@ static INT32 StoneageFrame() } } - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/dataeast/d_darkseal.cpp b/src/burn/drv/dataeast/d_darkseal.cpp index 56fbb3330..ac771e8ad 100644 --- a/src/burn/drv/dataeast/d_darkseal.cpp +++ b/src/burn/drv/dataeast/d_darkseal.cpp @@ -154,7 +154,7 @@ void __fastcall darkseal_write_byte(UINT32 address, UINT8 data) case 0x08: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -173,7 +173,7 @@ void __fastcall darkseal_write_word(UINT32 address, UINT16 data) case 0x08: deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -662,7 +662,7 @@ static INT32 DrvFrame() nSoundBufferPos += nSegmentLength; } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(nCyclesTotal[1]); if (pBurnSoundOut) { diff --git a/src/burn/drv/dataeast/d_dassault.cpp b/src/burn/drv/dataeast/d_dassault.cpp index 11809afff..5aecd8d87 100644 --- a/src/burn/drv/dataeast/d_dassault.cpp +++ b/src/burn/drv/dataeast/d_dassault.cpp @@ -240,7 +240,7 @@ void __fastcall dassault_main_write_word(UINT32 address, UINT16 data) { case 0x180000: deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x1c000c: @@ -261,7 +261,7 @@ void __fastcall dassault_main_write_byte(UINT32 address, UINT8 data) { case 0x180001: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x1c000b: @@ -397,11 +397,11 @@ void __fastcall dassault_sub_write_byte(UINT32 address, UINT8 ) static void set_cpuA_irq(INT32 state) { if (SekGetActive() == 0) { // main - SekSetIRQLine(5, state ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(5, state ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } else { SekClose(); SekOpen(0); - SekSetIRQLine(5, state ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(5, state ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); SekClose(); SekOpen(1); } @@ -410,11 +410,11 @@ static void set_cpuA_irq(INT32 state) static void set_cpuB_irq(INT32 state) { if (SekGetActive() == 1) { // sub - SekSetIRQLine(6, state ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, state ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } else { SekClose(); SekOpen(1); - SekSetIRQLine(6, state ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, state ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); SekClose(); SekOpen(0); } @@ -885,12 +885,12 @@ static INT32 DrvFrame() { SekOpen(0); nCyclesDone[0] += SekRun(nCyclesTotal[0] / nInterleave); - if (i == (nInterleave - 1)) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); SekOpen(1); nCyclesDone[1] += SekRun(nCyclesDone[0] - nCyclesDone[1]); - if (i == (nInterleave - 1)) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); nCyclesDone[1] += h6280Run(nCyclesTotal[2] / nInterleave); diff --git a/src/burn/drv/dataeast/d_dec0.cpp b/src/burn/drv/dataeast/d_dec0.cpp index bcd79e5cd..ae8a6b0a1 100644 --- a/src/burn/drv/dataeast/d_dec0.cpp +++ b/src/burn/drv/dataeast/d_dec0.cpp @@ -2289,7 +2289,7 @@ void __fastcall Dec068KWriteByte(UINT32 a, UINT8 d) case 0x30c015: { DrvSoundLatch = d; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; } @@ -2473,7 +2473,7 @@ void __fastcall Dec068KWriteWord(UINT32 a, UINT16 d) case 0x30c014: { DrvSoundLatch = d & 0xff; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; } @@ -2482,13 +2482,13 @@ void __fastcall Dec068KWriteWord(UINT32 a, UINT16 d) if (Dec0Game == DEC0_GAME_HBARREL) HbarrelI8751Write(d); if (Dec0Game == DEC0_GAME_BIRDTRY) BirdtryI8751Write(d); - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); return; } case 0x30c018: { - SekSetIRQLine(6, SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, CPU_IRQSTATUS_NONE); return; } @@ -2666,7 +2666,7 @@ void __fastcall RobocopShared68KWriteByte(UINT32 a, UINT8 d) INT32 Offset = (a - 0x180000) >> 1; DrvSharedRam[Offset] = d; if (Offset == 0x7ff) { - h6280SetIRQLine(0, H6280_IRQSTATUS_AUTO); + h6280SetIRQLine(0, CPU_IRQSTATUS_AUTO); } } @@ -2681,7 +2681,7 @@ void __fastcall RobocopShared68KWriteWord(UINT32 a, UINT16 d) INT32 Offset = (a - 0x180000) >> 1; DrvSharedRam[Offset] = d & 0xff; if (Offset == 0x7ff) { - h6280SetIRQLine(0, H6280_IRQSTATUS_AUTO); + h6280SetIRQLine(0, CPU_IRQSTATUS_AUTO); } } @@ -2781,7 +2781,7 @@ void __fastcall Slyspy68KWriteByte(UINT32 a, UINT8 d) case 0x314001: { DrvSoundLatch = d; - h6280SetIRQLine(H6280_INPUT_LINE_NMI, H6280_IRQSTATUS_AUTO); + h6280SetIRQLine(H6280_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; } @@ -2877,7 +2877,7 @@ void __fastcall Slyspy68KWriteWord(UINT32 a, UINT16 d) case 0x314000: { DrvSoundLatch = d & 0xff; - h6280SetIRQLine(H6280_INPUT_LINE_NMI, H6280_IRQSTATUS_AUTO); + h6280SetIRQLine(H6280_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; } @@ -3204,7 +3204,7 @@ void __fastcall Midres68KWriteByte(UINT32 a, UINT8 d) switch (a) { case 0x1a0001: { DrvSoundLatch = d; - h6280SetIRQLine(H6280_INPUT_LINE_NMI, H6280_IRQSTATUS_AUTO); + h6280SetIRQLine(H6280_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; } @@ -3479,9 +3479,9 @@ inline static double Dec0YM2203GetTime() static void Dec0YM3812IRQHandler(INT32, INT32 nStatus) { if (nStatus) { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_ACK); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_ACK); } else { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_NONE); } } @@ -3493,9 +3493,9 @@ static INT32 Dec0YM3812SynchroniseStream(INT32 nSoundRate) static void Dec1YM3812IRQHandler(INT32, INT32 nStatus) { if (nStatus) { - h6280SetIRQLine(1, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(1, CPU_IRQSTATUS_ACK); } else { - h6280SetIRQLine(1, H6280_IRQSTATUS_NONE); + h6280SetIRQLine(1, CPU_IRQSTATUS_NONE); } } @@ -5074,7 +5074,7 @@ static INT32 DrvFrame() if (i == 8) DrvVBlank = 0; if (i == 248) { DrvVBlank = 1; - SekSetIRQLine(6, SEK_IRQSTATUS_ACK); + SekSetIRQLine(6, CPU_IRQSTATUS_ACK); } nCurrentCPU = 1; @@ -5126,7 +5126,7 @@ static INT32 RobocopFrame() if (i == 8) DrvVBlank = 0; if (i == 248) { DrvVBlank = 1; - SekSetIRQLine(6, SEK_IRQSTATUS_ACK); + SekSetIRQLine(6, CPU_IRQSTATUS_ACK); } nCurrentCPU = 2; @@ -5192,7 +5192,7 @@ static INT32 Dec1Frame() if (i == 8) DrvVBlank = 0; if (i == 248) { DrvVBlank = 1; - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); } nCurrentCPU = 1; diff --git a/src/burn/drv/dataeast/d_dec8.cpp b/src/burn/drv/dataeast/d_dec8.cpp index eab0ce7d5..9a628fe70 100644 --- a/src/burn/drv/dataeast/d_dec8.cpp +++ b/src/burn/drv/dataeast/d_dec8.cpp @@ -968,7 +968,7 @@ void ghostb_main_write(UINT16 address, UINT8 data) { case 0x3800: *soundlatch = data; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; case 0x3840: @@ -1105,9 +1105,9 @@ inline static INT32 CsilverMSM5205SynchroniseStream(INT32 nSoundRate) static void DrvYM3812FMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_ACK); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_ACK); } else { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_NONE); } } @@ -1603,7 +1603,7 @@ static INT32 DrvDraw() static inline void do_interrupt() { if (*interrupt_enable) { - HD6309SetIRQLine(0, HD6309_IRQSTATUS_AUTO); + HD6309SetIRQLine(0, CPU_IRQSTATUS_AUTO); } } @@ -1622,7 +1622,7 @@ static void ghostb_interrupt() if (((i8751_out & 0x2) != 0x2) && latch[2]) {latch[2] = 0; do_interrupt(); i8751_return = 0x2001; } /* Player 3 coin */ if (((i8751_out & 0x1) != 0x1) && latch[3]) {latch[3] = 0; do_interrupt(); i8751_return = 0x1001; } /* Service */ - if (*nmi_enable) HD6309SetIRQLine(0x20, HD6309_IRQSTATUS_AUTO); + if (*nmi_enable) HD6309SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); } static INT32 DrvFrame() @@ -1945,7 +1945,7 @@ void cobra_main_write(UINT16 address, UINT8 data) { case 0x3e00: *soundlatch = data; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); M6502Run(500); return; @@ -2346,7 +2346,7 @@ static INT32 CobraFrame() if (i == 1) vblank = 0x80; if (i == 31) { vblank = 0; - M6809SetIRQLine(0x20 /*NMI*/, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0x20 /*NMI*/, CPU_IRQSTATUS_AUTO); } BurnTimerUpdate((i + 1) * (nCyclesTotal[0] / nInterleave)); @@ -2663,7 +2663,7 @@ void srdarwin_main_write(UINT16 address, UINT8 data) case 0x2000: *soundlatch = data; // m6502SetIRQ(M6502_NMI); - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; case 0x2001: @@ -3017,7 +3017,7 @@ static INT32 SrdarwinFrame() if (i == 1) vblank = 0x40; if (i == 31) { vblank = 0; - M6809SetIRQLine(0x20 /*NMI*/, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0x20 /*NMI*/, CPU_IRQSTATUS_AUTO); } BurnTimerUpdate((i + 1) * (nCyclesTotal[0] / nInterleave)); @@ -3135,7 +3135,7 @@ static void gondo_i8751_write(INT32 offset, UINT8 data) { case 0: i8751_value = (i8751_value & 0xff) | (data << 8); - if (*interrupt_enable) HD6309SetIRQLine(0, HD6309_IRQSTATUS_AUTO); + if (*interrupt_enable) HD6309SetIRQLine(0, CPU_IRQSTATUS_AUTO); break; case 1: @@ -3197,7 +3197,7 @@ void gondo_main_write(UINT16 address, UINT8 data) { case 0x3810: *soundlatch = data; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; case 0x3818: @@ -3673,7 +3673,7 @@ static INT32 GondoFrame() if (i == 270) { vblank = 0x80; - if (*nmi_enable) HD6309SetIRQLine(0x20, HD6309_IRQSTATUS_AUTO); + if (*nmi_enable) HD6309SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); } BurnTimerUpdate((i + 1) * (nCyclesTotal[0] / nInterleave)); @@ -3911,29 +3911,29 @@ void oscar_main_write(UINT16 address, UINT8 data) case 0x3d80: *soundlatch = data; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; case 0x3e80: HD6309Close(); HD6309Open(1); - HD6309SetIRQLine(0, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(0, CPU_IRQSTATUS_ACK); HD6309Close(); HD6309Open(0); return; case 0x3e81: - HD6309SetIRQLine(0, HD6309_IRQSTATUS_NONE); + HD6309SetIRQLine(0, CPU_IRQSTATUS_NONE); return; case 0x3e82: - HD6309SetIRQLine(0, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x3e83: HD6309Close(); HD6309Open(1); - HD6309SetIRQLine(0, HD6309_IRQSTATUS_NONE); + HD6309SetIRQLine(0, CPU_IRQSTATUS_NONE); HD6309Close(); HD6309Open(0); return; @@ -3951,7 +3951,7 @@ void oscar_sub_write(UINT16 address, UINT8 ) switch (address) { case 0x3e80: - HD6309SetIRQLine(0, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(0, CPU_IRQSTATUS_ACK); HD6309Close(); HD6309Open(0); return; @@ -3959,7 +3959,7 @@ void oscar_sub_write(UINT16 address, UINT8 ) case 0x3e81: HD6309Close(); HD6309Open(0); - HD6309SetIRQLine(0, HD6309_IRQSTATUS_NONE); + HD6309SetIRQLine(0, CPU_IRQSTATUS_NONE); HD6309Close(); HD6309Open(1); return; @@ -3967,13 +3967,13 @@ void oscar_sub_write(UINT16 address, UINT8 ) case 0x3e82: HD6309Close(); HD6309Open(0); - HD6309SetIRQLine(0, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(0, CPU_IRQSTATUS_ACK); HD6309Close(); HD6309Open(1); return; case 0x3e83: - HD6309SetIRQLine(0, HD6309_IRQSTATUS_NONE); + HD6309SetIRQLine(0, CPU_IRQSTATUS_NONE); return; } } @@ -4205,7 +4205,7 @@ static INT32 OscarFrame() if ((DrvInputs[2] & 7) == 7) latch = 1; if ((DrvInputs[2] & 7) != 7 && latch) { latch = 0; - HD6309SetIRQLine(0x20, HD6309_IRQSTATUS_AUTO); + HD6309SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); } vblank = 0x80; } @@ -4416,7 +4416,7 @@ static void lastmiss_i8751_write(INT32 offset, INT32 data) { case 0: i8751_value = (i8751_value & 0xff) | (data << 8); - M6809SetIRQLine(1, M6809_IRQSTATUS_AUTO); /* Signal main cpu */ + M6809SetIRQLine(1, CPU_IRQSTATUS_AUTO); /* Signal main cpu */ break; case 1: @@ -4450,7 +4450,7 @@ static void shackled_i8751_write(INT32 offset, INT32 data) { case 0: /* High byte */ i8751_value = (i8751_value & 0xff) | (data << 8); - M6809SetIRQLine(1, M6809_IRQSTATUS_AUTO); /* Signal main cpu */ + M6809SetIRQLine(1, CPU_IRQSTATUS_AUTO); /* Signal main cpu */ break; case 1: /* Low byte */ i8751_value = (i8751_value & 0xff00) | data; @@ -4480,11 +4480,11 @@ void lastmiss_main_write(UINT16 address, UINT8 data) { case 0x1803: if (M6809GetActive() == 0) { // main - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); } else { M6809Close(); M6809Open(0); - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); M6809Close(); M6809Open(1); } @@ -4494,11 +4494,11 @@ void lastmiss_main_write(UINT16 address, UINT8 data) if (M6809GetActive() == 0) { // main M6809Close(); M6809Open(1); - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); M6809Close(); M6809Open(0); } else { - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); } return; @@ -4512,7 +4512,7 @@ void lastmiss_main_write(UINT16 address, UINT8 data) case 0x180c: *soundlatch = data; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; // main cpu only! @@ -5223,7 +5223,7 @@ static void csilver_i8751_write(INT32 offset, UINT8 data) { case 0: /* High byte */ i8751_value = (i8751_value & 0xff) | (data << 8); - M6809SetIRQLine(1, M6809_IRQSTATUS_AUTO); /* Signal main cpu */ + M6809SetIRQLine(1, CPU_IRQSTATUS_AUTO); /* Signal main cpu */ break; case 1: /* Low byte */ i8751_value = (i8751_value & 0xff00) | data; @@ -5250,11 +5250,11 @@ void csilver_main_write(UINT16 address, UINT8 data) { case 0x1803: if (M6809GetActive() == 0) { // main - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); } else { M6809Close(); M6809Open(0); - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); M6809Close(); M6809Open(1); } @@ -5264,11 +5264,11 @@ void csilver_main_write(UINT16 address, UINT8 data) if (M6809GetActive() == 0) { // main M6809Close(); M6809Open(1); - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); M6809Close(); M6809Open(0); } else { - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); } return; @@ -5282,7 +5282,7 @@ void csilver_main_write(UINT16 address, UINT8 data) case 0x180c: *soundlatch = data; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; case 0x1808: @@ -5382,7 +5382,7 @@ UINT8 csilver_sound_read(UINT16 address) static void CsilverADPCMInt() { Toggle ^= 1; - if (Toggle) M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_AUTO); + if (Toggle) M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_AUTO); MSM5205DataWrite(0, MSM5205Next >> 4); MSM5205Next <<= 4; @@ -5538,7 +5538,7 @@ static INT32 CsilverFrame() nCyclesDone[1] += M6809Run(nSegment - nCyclesDone[1]); if (i == DrvVBlankSlices[1]) { vblank = 0; - M6809SetIRQLine(0x20, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); } MSM5205Update(); M6809Close(); diff --git a/src/burn/drv/dataeast/d_dietgogo.cpp b/src/burn/drv/dataeast/d_dietgogo.cpp index afc5f87f4..6e1586d55 100644 --- a/src/burn/drv/dataeast/d_dietgogo.cpp +++ b/src/burn/drv/dataeast/d_dietgogo.cpp @@ -124,7 +124,7 @@ void __fastcall dietgogo_main_write_word(UINT32 address, UINT16 data) { case 0x340380: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -136,7 +136,7 @@ void __fastcall dietgogo_main_write_byte(UINT32 address, UINT8 data) case 0x340380: case 0x340381: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -450,7 +450,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/dataeast/d_funkyjet.cpp b/src/burn/drv/dataeast/d_funkyjet.cpp index c09e7697a..f09dac449 100644 --- a/src/burn/drv/dataeast/d_funkyjet.cpp +++ b/src/burn/drv/dataeast/d_funkyjet.cpp @@ -260,7 +260,7 @@ void __fastcall funkyjet_main_write_word(UINT32 address, UINT16 data) { case 0x18010a: deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); break; } @@ -276,7 +276,7 @@ void __fastcall funkyjet_main_write_byte(UINT32 address, UINT8 data) { case 0x18010b: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); break; } @@ -586,7 +586,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/dataeast/d_karnov.cpp b/src/burn/drv/dataeast/d_karnov.cpp index 42afbb568..1b6f4aa3c 100644 --- a/src/burn/drv/dataeast/d_karnov.cpp +++ b/src/burn/drv/dataeast/d_karnov.cpp @@ -343,7 +343,7 @@ static void karnov_i8751_w(INT32 data) if (data==0x401) i8751_return=0x4138; /* ^Whistling wind */ if (data==0x408) i8751_return=0x4276; /* ^Heavy Gates */ - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); /* Signal main cpu task is complete */ + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); /* Signal main cpu task is complete */ i8751_needs_ack=1; } @@ -394,7 +394,7 @@ static void wndrplnt_i8751_w(INT32 data) if (data==0x501) i8751_return=0x6bf8; if (data==0x500) i8751_return=0x4e75; - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); i8751_needs_ack=1; } @@ -508,7 +508,7 @@ static void chelnov_i8751_w(INT32 data) } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); i8751_needs_ack=1; } @@ -517,14 +517,14 @@ static void karnov_control_w(INT32 offset, INT32 data) switch (offset<<1) { case 0: - SekSetIRQLine(6, SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, CPU_IRQSTATUS_NONE); if (i8751_needs_ack) { if (i8751_coin_pending) { i8751_return=i8751_coin_pending; - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); i8751_coin_pending=0; } else if (i8751_command_queue) @@ -542,7 +542,7 @@ static void karnov_control_w(INT32 offset, INT32 data) case 2: *soundlatch = data; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); break; case 4: @@ -572,7 +572,7 @@ static void karnov_control_w(INT32 offset, INT32 data) break; case 0xe: - SekSetIRQLine(7, SEK_IRQSTATUS_NONE); + SekSetIRQLine(7, CPU_IRQSTATUS_NONE); break; } } @@ -679,9 +679,9 @@ UINT8 karnov_sound_read(UINT16 address) static void DrvYM3526FMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_ACK); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_ACK); } else { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_NONE); } } @@ -1105,14 +1105,14 @@ static void DrvInterrupt() else { i8751_return = DrvInput[2] | 0x8000; - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); SekRun(100); i8751_needs_ack=1; } latch=0; } - SekSetIRQLine(7, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(7, CPU_IRQSTATUS_AUTO); } static INT32 DrvFrame() diff --git a/src/burn/drv/dataeast/d_lemmings.cpp b/src/burn/drv/dataeast/d_lemmings.cpp index ad9603f22..6f6345c3a 100644 --- a/src/burn/drv/dataeast/d_lemmings.cpp +++ b/src/burn/drv/dataeast/d_lemmings.cpp @@ -188,7 +188,7 @@ static void __fastcall lemmings_main_write_word(UINT32 address, UINT16 data) { case 0x1a0064: *soundlatch = data & 0xff; - M6809SetIRQLine(1, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(1, CPU_IRQSTATUS_ACK); return; case 0x1c0000: @@ -278,7 +278,7 @@ static void lemmings_sound_write(UINT16 address, UINT8 data) return; case 0x1800: - M6809SetIRQLine(1, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(1, CPU_IRQSTATUS_NONE); return; } } @@ -303,7 +303,7 @@ static UINT8 lemmings_sound_read(UINT16 address) static void lemmingsYM2151IrqHandler(INT32 irq) { - M6809SetIRQLine(0, irq ? M6809_IRQSTATUS_ACK : M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0, irq ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); M6809Run(1000); // fix music tempo } @@ -686,7 +686,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { nSegment = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/dataeast/d_pktgaldx.cpp b/src/burn/drv/dataeast/d_pktgaldx.cpp index e47c73fd2..c1ca8047a 100644 --- a/src/burn/drv/dataeast/d_pktgaldx.cpp +++ b/src/burn/drv/dataeast/d_pktgaldx.cpp @@ -504,7 +504,7 @@ static INT32 DrvFrame() if (i == 240) deco16_vblank = 0x08; } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); SekClose(); diff --git a/src/burn/drv/dataeast/d_rohga.cpp b/src/burn/drv/dataeast/d_rohga.cpp index 7809eb84d..82c751eb4 100644 --- a/src/burn/drv/dataeast/d_rohga.cpp +++ b/src/burn/drv/dataeast/d_rohga.cpp @@ -388,7 +388,7 @@ void __fastcall rohga_main_write_word(UINT32 address, UINT16 data) { case 0x2800a8: deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x300000: @@ -401,7 +401,7 @@ void __fastcall rohga_main_write_word(UINT32 address, UINT16 data) return; case 0x321100: // schmeisr - SekSetIRQLine(6, SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, CPU_IRQSTATUS_NONE); return; case 0x322000: @@ -422,7 +422,7 @@ void __fastcall rohga_main_write_byte(UINT32 address, UINT8 data) { case 0x2800a9: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x300000: @@ -438,7 +438,7 @@ void __fastcall rohga_main_write_byte(UINT32 address, UINT8 data) case 0x321100: // schmeisr case 0x321101: - SekSetIRQLine(6, SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, CPU_IRQSTATUS_NONE); return; case 0x322000: @@ -465,7 +465,7 @@ UINT16 __fastcall rohga_main_read_word(UINT32 address) return (DrvInputs[1] & 0x07) | (deco16_vblank & 0x08); case 0x321100: - SekSetIRQLine(6, SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, CPU_IRQSTATUS_NONE); return 0; } @@ -492,7 +492,7 @@ UINT8 __fastcall rohga_main_read_byte(UINT32 address) case 0x321100: case 0x321101: - SekSetIRQLine(6, SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, CPU_IRQSTATUS_NONE); return 0; } @@ -527,14 +527,14 @@ void __fastcall wizdfire_main_write_word(UINT32 address, UINT16 data) return; case 0x320004: - SekSetIRQLine(6, SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, CPU_IRQSTATUS_NONE); return; case 0xfe4150: case 0xff4260: // nitrobal case 0xff4a60: deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -576,14 +576,14 @@ void __fastcall wizdfire_main_write_byte(UINT32 address, UINT8 data) case 0x320004: case 0x320005: - SekSetIRQLine(6, SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, CPU_IRQSTATUS_NONE); return; case 0xfe4151: case 0xff4261: // nitrobal case 0xff4a61: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -1637,7 +1637,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(6, SEK_IRQSTATUS_ACK); + SekSetIRQLine(6, CPU_IRQSTATUS_ACK); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/dataeast/d_sidepckt.cpp b/src/burn/drv/dataeast/d_sidepckt.cpp index 04be5e6aa..753effc6d 100644 --- a/src/burn/drv/dataeast/d_sidepckt.cpp +++ b/src/burn/drv/dataeast/d_sidepckt.cpp @@ -355,7 +355,7 @@ static void SidecpcktI8751Write(UINT8 Data) static const INT32 table_2[] = { 0x8e, 0x42, 0xad, 0x58, 0xec, 0x85, 0xdd, 0x4c, 0xad, 0x9f, 0x00, 0x4c, 0x7e, 0x42, 0xa2, 0xff }; static const INT32 table_3[] = { 0xbd, 0x73, 0x80, 0xbd, 0x73, 0xa7, 0xbd, 0x73, 0xe0, 0x7e, 0x72, 0x56, 0xff, 0xff, 0xff, 0xff }; - M6809SetIRQLine(M6809_FIRQ_LINE, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(M6809_FIRQ_LINE, CPU_IRQSTATUS_AUTO); if (InMath == 1) { InMath=2; @@ -408,7 +408,7 @@ static void SidecpcktjI8751Write(UINT8 Data) static const INT32 table_2[] = { 0x8e, 0x42, 0xb2, 0x58, 0xec, 0x85, 0xdd, 0x4c, 0xad, 0x9f, 0x00, 0x4c, 0x7e, 0x42, 0xa7, 0xff }; static const INT32 table_3[] = { 0xbd, 0x71, 0xc8, 0xbd, 0x71, 0xef, 0xbd, 0x72, 0x28, 0x7e, 0x70, 0x9e, 0xff, 0xff, 0xff, 0xff }; - M6809SetIRQLine(M6809_FIRQ_LINE, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(M6809_FIRQ_LINE, CPU_IRQSTATUS_AUTO); if (InMath == 1) { InMath = 2; @@ -496,7 +496,7 @@ void SidepcktM6809WriteByte(UINT16 Address, UINT8 Data) switch (Address) { case 0x3004: { DrvSoundLatch = Data; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; } @@ -573,9 +573,9 @@ inline static double DrvGetTime() static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_ACK); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_ACK); } else { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_NONE); } } @@ -880,7 +880,7 @@ static INT32 DrvFrame() nCurrentCPU = 0; nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; BurnTimerUpdate(nNext); - if (i == (nInterleave - 1)) M6809SetIRQLine(0x20, M6809_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) M6809SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); nCurrentCPU = 1; nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; diff --git a/src/burn/drv/dataeast/d_simpl156.cpp b/src/burn/drv/dataeast/d_simpl156.cpp index ba1ec5991..79f8f928d 100644 --- a/src/burn/drv/dataeast/d_simpl156.cpp +++ b/src/burn/drv/dataeast/d_simpl156.cpp @@ -547,7 +547,7 @@ static INT32 DrvFrame() ArmOpen(0); deco16_vblank = 0x00; ArmRun(nTotalCycles - 12240); - ArmSetIRQLine(ARM_IRQ_LINE, ARM_IRQSTATUS_AUTO); + ArmSetIRQLine(ARM_IRQ_LINE, CPU_IRQSTATUS_AUTO); deco16_vblank = 0xf0; ArmRun(12240); ArmClose(); diff --git a/src/burn/drv/dataeast/d_supbtime.cpp b/src/burn/drv/dataeast/d_supbtime.cpp index 6ccafe496..816576e14 100644 --- a/src/burn/drv/dataeast/d_supbtime.cpp +++ b/src/burn/drv/dataeast/d_supbtime.cpp @@ -167,7 +167,7 @@ void __fastcall supbtime_main_write_word(UINT32 address, UINT16 data) case 0x100000: case 0x1a0000: deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -179,7 +179,7 @@ void __fastcall supbtime_main_write_byte(UINT32 address, UINT8 data) case 0x100001: case 0x1a0001: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -509,7 +509,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/dataeast/d_tumblep.cpp b/src/burn/drv/dataeast/d_tumblep.cpp index b39cb0381..1c6476cfa 100644 --- a/src/burn/drv/dataeast/d_tumblep.cpp +++ b/src/burn/drv/dataeast/d_tumblep.cpp @@ -125,7 +125,7 @@ void __fastcall tumblep_main_write_word(UINT32 address, UINT16 data) { case 0x100000: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -137,7 +137,7 @@ void __fastcall tumblep_main_write_byte(UINT32 address, UINT8 data) case 0x100000: case 0x100001: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -468,7 +468,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/dataeast/d_vaportra.cpp b/src/burn/drv/dataeast/d_vaportra.cpp index 81e1449d1..affecee73 100644 --- a/src/burn/drv/dataeast/d_vaportra.cpp +++ b/src/burn/drv/dataeast/d_vaportra.cpp @@ -143,7 +143,7 @@ void __fastcall vaportra_main_write_word(UINT32 address, UINT16 data) case 0x100006: deco16_soundlatch = data & 0xff; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x30c000: @@ -165,7 +165,7 @@ void __fastcall vaportra_main_write_byte(UINT32 address, UINT8 data) case 0x100007: deco16_soundlatch = data; - h6280SetIRQLine(0, H6280_IRQSTATUS_ACK); + h6280SetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x30c000: @@ -558,7 +558,7 @@ static INT32 DrvFrame() if (i == 206) { deco16_vblank = 0x08; - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); } INT32 nSegmentLength = nBurnSoundLen / nInterleave; diff --git a/src/burn/drv/dataeast/deco16ic.cpp b/src/burn/drv/dataeast/deco16ic.cpp index 5830e84c6..9bb4c2d21 100644 --- a/src/burn/drv/dataeast/deco16ic.cpp +++ b/src/burn/drv/dataeast/deco16ic.cpp @@ -731,7 +731,7 @@ INT32 deco16_soundlatch; static void deco16YM2151IrqHandler(INT32 state) { #ifdef ENABLE_HUC6280 - h6280SetIRQLine(1, state ? H6280_IRQSTATUS_ACK : H6280_IRQSTATUS_NONE); + h6280SetIRQLine(1, state ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); #else state = state; #endif @@ -840,7 +840,7 @@ static UINT8 deco16_sound_read(UINT32 address) case 0x140000: case 0x140001: #ifdef ENABLE_HUC6280 - h6280SetIRQLine(0, H6280_IRQSTATUS_NONE); + h6280SetIRQLine(0, CPU_IRQSTATUS_NONE); #endif return deco16_soundlatch; } diff --git a/src/burn/drv/galaxian/d_galaxian.cpp b/src/burn/drv/galaxian/d_galaxian.cpp index 7c7b41cdf..0bbdc831b 100644 --- a/src/burn/drv/galaxian/d_galaxian.cpp +++ b/src/burn/drv/galaxian/d_galaxian.cpp @@ -14396,7 +14396,7 @@ void __fastcall FroggermcZ80Write(UINT16 a, UINT8 d) if (!(d & 1)) { ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); } @@ -15885,7 +15885,7 @@ void __fastcall ExplorerZ80Write(UINT16 a, UINT8 d) case 0x9000: { ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -16318,7 +16318,7 @@ void __fastcall HotshockZ80Write(UINT16 a, UINT8 d) case 0x9000: { ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -18225,7 +18225,7 @@ void __fastcall Ad2083Z80Write(UINT16 a, UINT8 d) case 0x9000: { ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; diff --git a/src/burn/drv/galaxian/gal_run.cpp b/src/burn/drv/galaxian/gal_run.cpp index 1734d6cd7..5eefbb78c 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) ZetRaiseIrq(0); + if (GalIrqType == GAL_IRQ_TYPE_IRQ0) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); 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) ZetRaiseIrq(0); + if (GalSoundType == GAL_SOUND_HARDWARE_TYPE_CHECKMANAY8910) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } @@ -1675,9 +1675,9 @@ INT32 GalFrame() nGalCyclesSegment = nNext - nGalCyclesDone[nCurrentCPU]; nGalCyclesSegment = ZetRun(nGalCyclesSegment); nGalCyclesDone[nCurrentCPU] += nGalCyclesSegment; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); nGalCyclesDone[nCurrentCPU] += ZetRun(300); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); nGalCyclesDone[nCurrentCPU] += ZetRun(300); ZetClose(); } @@ -1701,9 +1701,9 @@ INT32 GalFrame() nGalCyclesDone[nCurrentCPU] += s2650Run(nGalCyclesSegment); if (i == nIrqInterleaveFire) { GalVBlank = 1; - s2650SetIRQLine(0, S2650_IRQSTATUS_ACK); + s2650SetIRQLine(0, CPU_IRQSTATUS_ACK); s2650Run(0); - s2650SetIRQLine(0, S2650_IRQSTATUS_NONE); + s2650SetIRQLine(0, CPU_IRQSTATUS_NONE); s2650Run(0); } s2650Close(); @@ -1716,7 +1716,7 @@ INT32 GalFrame() nNext = (i + 1) * nGalCyclesTotal[nCurrentCPU] / nInterleave; nGalCyclesSegment = nNext - nGalCyclesDone[nCurrentCPU]; nGalCyclesDone[nCurrentCPU] += ZetRun(nGalCyclesSegment); - if (HunchbksSoundIrqFire) ZetRaiseIrq(0); + if (HunchbksSoundIrqFire) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } diff --git a/src/burn/drv/galaxian/gal_sound.cpp b/src/burn/drv/galaxian/gal_sound.cpp index a60f06ff4..f2a42d9c0 100644 --- a/src/burn/drv/galaxian/gal_sound.cpp +++ b/src/burn/drv/galaxian/gal_sound.cpp @@ -535,7 +535,7 @@ UINT8 BongoDipSwitchRead(UINT32) UINT8 KonamiSoundLatchRead(UINT32) { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return GalSoundLatch; } @@ -607,11 +607,11 @@ void KonamiSoundControlWrite(UINT8 d) INT32 nActiveCPU = ZetGetActive(); if (nActiveCPU == 1) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } else { ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(nActiveCPU); } @@ -652,16 +652,16 @@ void SfxSampleControlWrite(UINT32, UINT32 d) INT32 nActiveCPU = ZetGetActive(); if (nActiveCPU == 2) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); nGalCyclesDone[2] += ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } else { ZetClose(); ZetOpen(2); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); nGalCyclesDone[2] += ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); ZetOpen(nActiveCPU); } diff --git a/src/burn/drv/irem/d_m107.cpp b/src/burn/drv/irem/d_m107.cpp index 93896017b..7fb2ebd88 100644 --- a/src/burn/drv/irem/d_m107.cpp +++ b/src/burn/drv/irem/d_m107.cpp @@ -339,7 +339,7 @@ static void m107YM2151IRQHandler(INT32 nStatus) { if (VezGetActive() == -1) return; - VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP0, 0xff/*default*/, nStatus ? VEZ_IRQSTATUS_ACK : VEZ_IRQSTATUS_NONE); + VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP0, 0xff/*default*/, nStatus ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); VezRun(100); } @@ -390,8 +390,8 @@ static UINT8 __fastcall m107ReadPort(UINT32 port) case 0x06: return DrvInput[2]; case 0x07: return DrvInput[3]; - case 0x08: VezSetIRQLineAndVector(0, (irq_vectorbase + 12)/4, VEZ_IRQSTATUS_NONE); return sound_status[0]; - case 0x09: VezSetIRQLineAndVector(0, (irq_vectorbase + 12)/4, VEZ_IRQSTATUS_NONE); return sound_status[1]; + case 0x08: VezSetIRQLineAndVector(0, (irq_vectorbase + 12)/4, CPU_IRQSTATUS_NONE); return sound_status[0]; + case 0x09: VezSetIRQLineAndVector(0, (irq_vectorbase + 12)/4, CPU_IRQSTATUS_NONE); return sound_status[1]; case 0x18: return 0; @@ -440,9 +440,9 @@ static void __fastcall m107WritePort(UINT32 port, UINT8 data) sound_latch[0] = data; VezClose(); VezOpen(1); - VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, VEZ_IRQSTATUS_ACK); + VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, CPU_IRQSTATUS_ACK); VezRun(10); - VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, VEZ_IRQSTATUS_NONE); + VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, CPU_IRQSTATUS_NONE); VezRun(10); VezClose(); VezOpen(0); @@ -562,14 +562,14 @@ static void __fastcall m107SndWriteByte(UINT32 address, UINT8 data) return; case 0xa8044: - // VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, VEZ_IRQSTATUS_NONE); + // VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, CPU_IRQSTATUS_NONE); return; case 0xa8046: sound_status[0] = data; VezClose(); VezOpen(0); - VezSetIRQLineAndVector(0, (irq_vectorbase + 12)/4, VEZ_IRQSTATUS_ACK); + VezSetIRQLineAndVector(0, (irq_vectorbase + 12)/4, CPU_IRQSTATUS_ACK); VezClose(); VezOpen(1); return; @@ -1022,9 +1022,9 @@ static void scanline_interrupts(INT32 scanline) nPrevScreenPos = (scanline-8)+1; } - VezSetIRQLineAndVector(0, (irq_vectorbase + 8)/4, VEZ_IRQSTATUS_ACK); + VezSetIRQLineAndVector(0, (irq_vectorbase + 8)/4, CPU_IRQSTATUS_ACK); VezRun(10); - VezSetIRQLineAndVector(0, (irq_vectorbase + 8)/4, VEZ_IRQSTATUS_NONE); + VezSetIRQLineAndVector(0, (irq_vectorbase + 8)/4, CPU_IRQSTATUS_NONE); } else if (scanline == 248) // vblank @@ -1041,9 +1041,9 @@ static void scanline_interrupts(INT32 scanline) // DrvReDraw(); } - VezSetIRQLineAndVector(0, (irq_vectorbase + 0)/4, VEZ_IRQSTATUS_ACK); + VezSetIRQLineAndVector(0, (irq_vectorbase + 0)/4, CPU_IRQSTATUS_ACK); VezRun(10); - VezSetIRQLineAndVector(0, (irq_vectorbase + 0)/4, VEZ_IRQSTATUS_NONE); + VezSetIRQLineAndVector(0, (irq_vectorbase + 0)/4, CPU_IRQSTATUS_NONE); } else if (scanline == 8) { vblank = 0x80; } diff --git a/src/burn/drv/irem/d_m62.cpp b/src/burn/drv/irem/d_m62.cpp index 82a773c8b..78b237911 100644 --- a/src/burn/drv/irem/d_m62.cpp +++ b/src/burn/drv/irem/d_m62.cpp @@ -2078,7 +2078,7 @@ void __fastcall M62Z80PortWrite(UINT16 a, UINT8 d) if ((d & 0x80) == 0) { M62SoundLatch = d & 0x7f; } else { - M6803SetIRQLine(M6803_IRQ_LINE, M6803_IRQSTATUS_ACK); + M6803SetIRQLine(M6803_IRQ_LINE, CPU_IRQSTATUS_ACK); } return; } @@ -2385,7 +2385,7 @@ void M62M6803WriteByte(UINT16 a, UINT8 d) switch (a) { case 0x0800: { - M6803SetIRQLine(M6803_IRQ_LINE, M6803_IRQSTATUS_NONE); + M6803SetIRQLine(M6803_IRQ_LINE, CPU_IRQSTATUS_NONE); return; } @@ -2503,7 +2503,7 @@ inline static INT32 M62SynchroniseStream(INT32 nSoundRate) static void M62MSM5205Vck0() { - M6803SetIRQLine(M6803_INPUT_LINE_NMI, M6803_IRQSTATUS_AUTO); + M6803SetIRQLine(M6803_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); M62SlaveMSM5205VClckReset = 1; } @@ -4730,7 +4730,7 @@ static INT32 M62Frame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); nCurrentCPU = 1; diff --git a/src/burn/drv/irem/d_m72.cpp b/src/burn/drv/irem/d_m72.cpp index dd02dd05b..ac3f2edf3 100644 --- a/src/burn/drv/irem/d_m72.cpp +++ b/src/burn/drv/irem/d_m72.cpp @@ -944,10 +944,10 @@ static void setvector_callback(INT32 param) } if (irqvector == 0xff) { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } else { ZetSetVector(irqvector); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } } @@ -2062,9 +2062,9 @@ static void scanline_interrupts(INT32 scanline) nPreviousLine = scanline + 1; } if (Kengo) - VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP2, 0xff, VEZ_IRQSTATUS_AUTO); + VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP2, 0xff, CPU_IRQSTATUS_AUTO); else - VezSetIRQLineAndVector(0, (m72_irq_base + 8)/4, VEZ_IRQSTATUS_AUTO); + VezSetIRQLineAndVector(0, (m72_irq_base + 8)/4, CPU_IRQSTATUS_AUTO); } else if (scanline == 255) // vblank { @@ -2073,9 +2073,9 @@ static void scanline_interrupts(INT32 scanline) nPreviousLine = 0; } if (Kengo) - VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP0, 0xff, VEZ_IRQSTATUS_AUTO); + VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP0, 0xff, CPU_IRQSTATUS_AUTO); else - VezSetIRQLineAndVector(0, (m72_irq_base + 0)/4, VEZ_IRQSTATUS_AUTO); + VezSetIRQLineAndVector(0, (m72_irq_base + 0)/4, CPU_IRQSTATUS_AUTO); } if (nPreviousLine >= nScreenHeight) nPreviousLine = 0; diff --git a/src/burn/drv/irem/d_m90.cpp b/src/burn/drv/irem/d_m90.cpp index 78e2ff4c3..ae3180859 100644 --- a/src/burn/drv/irem/d_m90.cpp +++ b/src/burn/drv/irem/d_m90.cpp @@ -805,7 +805,7 @@ static void setvector_callback(INT32 param) } ZetSetVector(irqvector); - ZetSetIRQLine(0, (irqvector == 0xff) ? ZET_IRQSTATUS_NONE : ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, (irqvector == 0xff) ? CPU_IRQSTATUS_NONE : CPU_IRQSTATUS_ACK); } static inline void update_palette_entry(INT32 entry) @@ -952,7 +952,7 @@ UINT8 __fastcall m90_sound_read_port(UINT16 port) case 0x42: // bbmanw case 0x80: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0x84: @@ -1391,9 +1391,9 @@ static INT32 DrvFrame() if (i == (nInterleave - 1)) { - VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP0, 0xff, VEZ_IRQSTATUS_ACK); + VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP0, 0xff, CPU_IRQSTATUS_ACK); VezRun(0); - VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP0, 0xff, VEZ_IRQSTATUS_NONE); + VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP0, 0xff, CPU_IRQSTATUS_NONE); } nCyclesDone[1] += ZetRun(nCyclesTotal[1] / nInterleave); diff --git a/src/burn/drv/irem/d_m92.cpp b/src/burn/drv/irem/d_m92.cpp index bcff54fb3..0765f27c9 100644 --- a/src/burn/drv/irem/d_m92.cpp +++ b/src/burn/drv/irem/d_m92.cpp @@ -1230,7 +1230,7 @@ inline static UINT32 CalcCol(INT32 offs) static void m92YM2151IRQHandler(INT32 nStatus) { if (VezGetActive() == -1) return; - VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP0, 0xff/*default*/, nStatus ? VEZ_IRQSTATUS_ACK : VEZ_IRQSTATUS_NONE); + VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP0, 0xff/*default*/, nStatus ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); VezRun(100); } @@ -1308,8 +1308,8 @@ UINT8 __fastcall m92ReadPort(UINT32 port) case 0x06: return ~DrvInput[2]; // player 3 case 0x07: return ~DrvInput[3]; // player 4 - case 0x08: VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 12)/4, VEZ_IRQSTATUS_NONE); return sound_status[0]; - case 0x09: VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 12)/4, VEZ_IRQSTATUS_NONE); return sound_status[1]; + case 0x08: VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 12)/4, CPU_IRQSTATUS_NONE); return sound_status[0]; + case 0x09: VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 12)/4, CPU_IRQSTATUS_NONE); return sound_status[1]; case 0x18: return (m92_kludge == 3) ? MSM6295ReadStatus(0) : 0; // ppan @@ -1363,9 +1363,9 @@ void __fastcall m92WritePort(UINT32 port, UINT8 data) sound_latch[0] = data; VezClose(); VezOpen(1); - VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, VEZ_IRQSTATUS_ACK); + VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, CPU_IRQSTATUS_ACK); VezRun(10); - VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, VEZ_IRQSTATUS_NONE); + VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, CPU_IRQSTATUS_NONE); VezRun(10); VezClose(); VezOpen(0); @@ -1461,7 +1461,7 @@ UINT8 __fastcall m92SndReadByte(UINT32 address) return BurnYM2151ReadStatus(); case 0xa8044: -// VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, VEZ_IRQSTATUS_NONE); +// VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, CPU_IRQSTATUS_NONE); return sound_latch[0]; case 0xa8045: @@ -1498,7 +1498,7 @@ void __fastcall m92SndWriteByte(UINT32 address, UINT8 data) case 0xa8044: // case 0xa8045: -// VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, VEZ_IRQSTATUS_NONE); +// VezSetIRQLineAndVector(NEC_INPUT_LINE_INTP1, 0xff/*default*/, CPU_IRQSTATUS_NONE); return; case 0xa8046: @@ -1506,7 +1506,7 @@ void __fastcall m92SndWriteByte(UINT32 address, UINT8 data) sound_status[0] = data; VezClose(); VezOpen(0); - VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 12)/4, VEZ_IRQSTATUS_ACK); + VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 12)/4, CPU_IRQSTATUS_ACK); VezClose(); VezOpen(1); return; @@ -2017,9 +2017,9 @@ static void scanline_interrupts(INT32 prev, INT32 segment, INT32 scanline) memcpy (DrvSprBuf, DrvSprRAM, 0x800); if (m92_kludge != 4) nCyclesDone[0] += VezRun(347); // nbbatman: fix for random lockups during gameplay m92_sprite_buffer_busy = 0x80; - VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 4)/4, VEZ_IRQSTATUS_ACK); + VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 4)/4, CPU_IRQSTATUS_ACK); nCyclesDone[0] += VezRun(10); - VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 4)/4, VEZ_IRQSTATUS_NONE); + VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 4)/4, CPU_IRQSTATUS_NONE); if (m92_kludge != 4) nCyclesDone[0] += VezRun(segment - (VezTotalCycles() - prev)); m92_sprite_buffer_timer = 0; @@ -2033,9 +2033,9 @@ static void scanline_interrupts(INT32 prev, INT32 segment, INT32 scanline) nPrevScreenPos = (scanline-8)+1; } - VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 8)/4, VEZ_IRQSTATUS_ACK); + VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 8)/4, CPU_IRQSTATUS_ACK); nCyclesDone[0] += VezRun((m92_kludge == 4) ? 20 : 10); // nbbatman: gets rid of flashes in intro sequence - VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 8)/4, VEZ_IRQSTATUS_NONE); + VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 8)/4, CPU_IRQSTATUS_NONE); } else if (scanline == 248) // vblank @@ -2050,9 +2050,9 @@ static void scanline_interrupts(INT32 prev, INT32 segment, INT32 scanline) } if (m92_kludge == 4) nCyclesDone[0] += VezRun(1200); // nbbatman: gets rid of flash after IREM logo fades out - VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 0)/4, VEZ_IRQSTATUS_ACK); + VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 0)/4, CPU_IRQSTATUS_ACK); nCyclesDone[0] += VezRun(10); - VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 0)/4, VEZ_IRQSTATUS_NONE); + VezSetIRQLineAndVector(0, (m92_irq_vectorbase + 0)/4, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/irem/d_vigilant.cpp b/src/burn/drv/irem/d_vigilant.cpp index 5c560090e..54d005360 100644 --- a/src/burn/drv/irem/d_vigilant.cpp +++ b/src/burn/drv/irem/d_vigilant.cpp @@ -828,10 +828,10 @@ static void DrvSetVector(INT32 Status) if (DrvIrqVector == 0xff) { // ZetSetVector(DrvIrqVector); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } else { ZetSetVector(DrvIrqVector); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); nCyclesDone[1] += ZetRun(1000); } } @@ -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)) ZetRaiseIrq(0); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); nCurrentCPU = 1; diff --git a/src/burn/drv/konami/d_88games.cpp b/src/burn/drv/konami/d_88games.cpp index a972ed44e..9bd2e550e 100644 --- a/src/burn/drv/konami/d_88games.cpp +++ b/src/burn/drv/konami/d_88games.cpp @@ -169,7 +169,7 @@ void games88_main_write(UINT16 address, UINT8 data) case 0x5f90: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -263,7 +263,7 @@ UINT8 __fastcall games88_sound_read(UINT16 address) switch (address) { case 0xa000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xc000: @@ -577,7 +577,7 @@ static INT32 DrvFrame() } } - if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_ajax.cpp b/src/burn/drv/konami/d_ajax.cpp index de2c6a0fc..c2ea984d4 100644 --- a/src/burn/drv/konami/d_ajax.cpp +++ b/src/burn/drv/konami/d_ajax.cpp @@ -178,12 +178,12 @@ void ajax_main_write(UINT16 address, UINT8 data) { case 0x0000: if (address == 0 && firq_enable) { - M6809SetIRQLine(1, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(1, CPU_IRQSTATUS_AUTO); } break; case 0x0001: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); break; case 0x0002: @@ -354,7 +354,7 @@ UINT8 __fastcall ajax_sound_read(UINT16 address) return BurnYM2151ReadStatus(); case 0xe000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -703,7 +703,7 @@ static INT32 DrvFrame() } } - if (K051960_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + if (K051960_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_aliens.cpp b/src/burn/drv/konami/d_aliens.cpp index 5142e0e38..8eda8aedc 100644 --- a/src/burn/drv/konami/d_aliens.cpp +++ b/src/burn/drv/konami/d_aliens.cpp @@ -157,9 +157,7 @@ void aliens_main_write(UINT16 address, UINT8 data) case 0x5f8c: *soundlatch = data; ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - - //ZetRaiseIrq(0xff); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -232,7 +230,7 @@ UINT8 __fastcall aliens_sound_read(UINT16 address) return BurnYM2151ReadStatus(); case 0xc000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -511,7 +509,7 @@ static INT32 DrvFrame() } } - if (K051960_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + if (K051960_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_asterix.cpp b/src/burn/drv/konami/d_asterix.cpp index c868d0c11..50005e682 100644 --- a/src/burn/drv/konami/d_asterix.cpp +++ b/src/burn/drv/konami/d_asterix.cpp @@ -228,7 +228,7 @@ static void _fastcall asterix_main_write_byte(UINT32 address, UINT8 data) return; case 0x380301: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x380601: @@ -342,7 +342,7 @@ static UINT8 __fastcall asterix_sound_read(UINT16 address) } if (address >= 0xfa00 && address <= 0xfa2f) { - if ((address & 0x3e) == 0x00) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if ((address & 0x3e) == 0x00) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return K053260Read(0, address & 0x3f); } @@ -667,7 +667,7 @@ static INT32 DrvFrame() } } - if (K056832IsIrqEnabled()) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (K056832IsIrqEnabled()) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_battlnts.cpp b/src/burn/drv/konami/d_battlnts.cpp index 34abc7568..64a3f37f5 100644 --- a/src/burn/drv/konami/d_battlnts.cpp +++ b/src/burn/drv/konami/d_battlnts.cpp @@ -272,7 +272,7 @@ static void battlnts_main_write(UINT16 address, UINT8 data) case 0x2e18: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -329,7 +329,7 @@ static UINT8 __fastcall battlnts_sound_read(UINT16 address) return BurnYM3812Read(1, address & 1); case 0xe000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch; } @@ -555,7 +555,7 @@ static INT32 DrvFrame() HD6309Run(nCyclesTotal[0] / nInterleave); - if (i == 240 && K007342_irq_enabled()) HD6309SetIRQLine(0, HD6309_IRQSTATUS_AUTO); + if (i == 240 && K007342_irq_enabled()) HD6309SetIRQLine(0, CPU_IRQSTATUS_AUTO); BurnTimerUpdateYM3812((i + 1) * (nCyclesTotal[1] / nInterleave)); } diff --git a/src/burn/drv/konami/d_bishi.cpp b/src/burn/drv/konami/d_bishi.cpp index 9ef7a0f2a..abd3af2a4 100644 --- a/src/burn/drv/konami/d_bishi.cpp +++ b/src/burn/drv/konami/d_bishi.cpp @@ -393,7 +393,7 @@ static void bishi_tile_callback(INT32 layer, INT32 *code, INT32 *color, INT32 */ static void bishi_sound_irq(INT32 status) { - SekSetIRQLine(1, (status) ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, (status) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static INT32 DrvDoReset() @@ -598,8 +598,8 @@ static INT32 DrvFrame() nCyclesDone[0] += SekRun(nCyclesTotal[0] / nInterleave); if (control_data & 0x800) { - if (i == 0) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 240) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); + if (i == 0) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 240) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/konami/d_bladestl.cpp b/src/burn/drv/konami/d_bladestl.cpp index 0a5a2a619..8804b84c9 100644 --- a/src/burn/drv/konami/d_bladestl.cpp +++ b/src/burn/drv/konami/d_bladestl.cpp @@ -185,7 +185,7 @@ static void bladestl_main_write(UINT16 address, UINT8 data) { case 0x2e80: soundlatch = data; - M6809SetIRQLine(0, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x2ec0: @@ -280,7 +280,7 @@ static UINT8 bladestl_sound_read(UINT16 address) return (UPD7759BusyRead(0) ? 1 : 0); case 0x6000: - M6809SetIRQLine(0, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch; } @@ -551,13 +551,13 @@ static INT32 DrvFrame() HD6309Open(0); M6809Open(0); - HD6309SetIRQLine(0x20, HD6309_IRQSTATUS_AUTO); // nmi + HD6309SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); // nmi for (INT32 i = 0; i < nInterleave; i++) { HD6309Run(nCyclesTotal[0] / nInterleave); - if (i == 240 && K007342_irq_enabled()) HD6309SetIRQLine(1, HD6309_IRQSTATUS_AUTO); // firq + if (i == 240 && K007342_irq_enabled()) HD6309SetIRQLine(1, CPU_IRQSTATUS_AUTO); // firq BurnTimerUpdate((i + 1) * (nCyclesTotal[1] / nInterleave)); } diff --git a/src/burn/drv/konami/d_blockhl.cpp b/src/burn/drv/konami/d_blockhl.cpp index 4cf74c511..bcdc8f7ea 100644 --- a/src/burn/drv/konami/d_blockhl.cpp +++ b/src/burn/drv/konami/d_blockhl.cpp @@ -140,7 +140,7 @@ void blockhl_main_write(UINT16 address, UINT8 data) case 0x1f88: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x1f8c: @@ -200,7 +200,7 @@ UINT8 __fastcall blockhl_sound_read(UINT16 address) switch (address) { case 0xa000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xc001: @@ -447,7 +447,7 @@ static INT32 DrvFrame() } if (K052109_irq_enabled && (nDrvKonamiBank[0] & 0x03) == 0) - konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_bottom9.cpp b/src/burn/drv/konami/d_bottom9.cpp index afab6c0c9..4d90a0b93 100644 --- a/src/burn/drv/konami/d_bottom9.cpp +++ b/src/burn/drv/konami/d_bottom9.cpp @@ -269,7 +269,7 @@ void bottom9_main_write(UINT16 address, UINT8 data) case 0x1fc0: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -380,7 +380,7 @@ UINT8 __fastcall bottom9_sound_read(UINT16 address) switch (address) { case 0xd000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -660,7 +660,7 @@ static INT32 DrvFrame() if (*nmi_enable) ZetNmi(); } - if (K052109_irq_enabled) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + if (K052109_irq_enabled) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { memset(pBurnSoundOut, 0, nBurnSoundLen * sizeof(INT16) * 2); diff --git a/src/burn/drv/konami/d_circusc.cpp b/src/burn/drv/konami/d_circusc.cpp index 9c150434b..9661cf41e 100644 --- a/src/burn/drv/konami/d_circusc.cpp +++ b/src/burn/drv/konami/d_circusc.cpp @@ -162,7 +162,7 @@ static void circusc_main_write(UINT16 address, UINT8 data) case 0x0c00: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x1c00: @@ -229,7 +229,7 @@ static UINT8 __fastcall circusc_sound_read(UINT16 address) switch (address) { case 0x6000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch; case 0x8000: @@ -560,7 +560,7 @@ static INT32 DrvFrame() } } - if (irqmask) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + if (irqmask) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); // Make sure the buffer is entirely filled. if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/d_contra.cpp b/src/burn/drv/konami/d_contra.cpp index b9ae8f089..7b0650153 100644 --- a/src/burn/drv/konami/d_contra.cpp +++ b/src/burn/drv/konami/d_contra.cpp @@ -433,9 +433,9 @@ static INT32 DrvDoReset() static void DrvYM2151IrqHandler(INT32 Irq) { if (Irq) { - M6809SetIRQLine(M6809_FIRQ_LINE, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(M6809_FIRQ_LINE, CPU_IRQSTATUS_ACK); } else { - M6809SetIRQLine(M6809_FIRQ_LINE, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(M6809_FIRQ_LINE, CPU_IRQSTATUS_NONE); } } @@ -861,14 +861,14 @@ static INT32 DrvFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += M6809Run(nCyclesSegment); if (i == (nInterleave - 1)) { - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); } M6809Close(); nCurrentCPU = 1; M6809Open(nCurrentCPU); if (trigger_sound_irq) { - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); trigger_sound_irq = 0; } nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; diff --git a/src/burn/drv/konami/d_crimfght.cpp b/src/burn/drv/konami/d_crimfght.cpp index f5d761f41..550e0ece5 100644 --- a/src/burn/drv/konami/d_crimfght.cpp +++ b/src/burn/drv/konami/d_crimfght.cpp @@ -265,7 +265,7 @@ void crimfght_main_write(UINT16 address, UINT8 data) case 0x3f8c: *soundlatch = data; ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); break; } @@ -347,7 +347,7 @@ UINT8 __fastcall crimfght_sound_read(UINT16 address) return BurnYM2151ReadStatus(); case 0xc000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -626,7 +626,7 @@ static INT32 DrvFrame() } } - konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_dbz.cpp b/src/burn/drv/konami/d_dbz.cpp index 9240b0d7b..75fd549e4 100644 --- a/src/burn/drv/konami/d_dbz.cpp +++ b/src/burn/drv/konami/d_dbz.cpp @@ -492,7 +492,7 @@ static void dbz_K053936_callback2(INT32 offset, UINT16 *ram, INT32 *code, INT32 static void dbzYM2151IrqHandler(INT32 status) { - ZetSetIRQLine(0, (status) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (status) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static INT32 DrvDoReset() @@ -919,11 +919,11 @@ static INT32 DrvFrame() nCyclesDone[0] += nCyclesSegment; if (i == 0 && K053246_is_IRQ_enabled()) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } if (i == (nInterleave - 20)) { - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); //CK); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); //CK); } nNext = (i + 1) * nCyclesTotal[1] / nInterleave; diff --git a/src/burn/drv/konami/d_finalzr.cpp b/src/burn/drv/konami/d_finalzr.cpp index c61b829e2..8124557bc 100644 --- a/src/burn/drv/konami/d_finalzr.cpp +++ b/src/burn/drv/konami/d_finalzr.cpp @@ -718,8 +718,8 @@ static INT32 DrvFrame() for (INT32 i = 0; i < nInterleave; i++) { nCyclesDone[0] += M6809Run(nCyclesTotal[0] / nInterleave); - if (i == 240 && irq_enable) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); - if ((i % 0x1f) == 0 && nmi_enable) M6809SetIRQLine(0x20, M6809_IRQSTATUS_AUTO); + if (i == 240 && irq_enable) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); + if ((i % 0x1f) == 0 && nmi_enable) M6809SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); if (i == 240) vblank = 1; // ? diff --git a/src/burn/drv/konami/d_gberet.cpp b/src/burn/drv/konami/d_gberet.cpp index f7cad3157..ff3f4016d 100644 --- a/src/burn/drv/konami/d_gberet.cpp +++ b/src/burn/drv/konami/d_gberet.cpp @@ -916,7 +916,7 @@ static INT32 DrvFrame() nCyclesDone = ZetRun(nCyclesSegment); if (irq_enable && i == (nInterleave - 1)) { - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } if (nmi_enable && (i & 1)) { diff --git a/src/burn/drv/konami/d_gbusters.cpp b/src/burn/drv/konami/d_gbusters.cpp index 845f84c2b..f663a3e64 100644 --- a/src/burn/drv/konami/d_gbusters.cpp +++ b/src/burn/drv/konami/d_gbusters.cpp @@ -168,7 +168,7 @@ void gbusters_main_write(UINT16 address, UINT8 data) case 0x1f88: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; @@ -256,7 +256,7 @@ UINT8 __fastcall gbusters_sound_read(UINT16 address) switch (address) { case 0xa000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xc001: @@ -524,7 +524,7 @@ static INT32 DrvFrame() } } - if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_gijoe.cpp b/src/burn/drv/konami/d_gijoe.cpp index 9ac6f0cd1..6ed77c878 100644 --- a/src/burn/drv/konami/d_gijoe.cpp +++ b/src/burn/drv/konami/d_gijoe.cpp @@ -184,7 +184,7 @@ static void _fastcall gijoe_main_write_word(UINT32 address, UINT16 data) break; case 0x1d0000: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -233,7 +233,7 @@ static void _fastcall gijoe_main_write_byte(UINT32 address, UINT8 data) case 0x1d0000: case 0x1d0001: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -346,7 +346,7 @@ static UINT8 __fastcall gijoe_sound_read(UINT16 address) switch (address) { case 0xfc02: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -697,7 +697,7 @@ static INT32 DrvFrame() nCyclesDone[0] += nCyclesSegment; if (control_data & 0x20 && irq6_timer > 0) { - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); } irq6_timer--; @@ -725,7 +725,7 @@ static INT32 DrvFrame() } if (control_data & 0x80) { - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/konami/d_gradius3.cpp b/src/burn/drv/konami/d_gradius3.cpp index 14e19dc1a..eba9d4c96 100644 --- a/src/burn/drv/konami/d_gradius3.cpp +++ b/src/burn/drv/konami/d_gradius3.cpp @@ -233,7 +233,7 @@ static void __fastcall gradius3_main_write_byte(UINT32 address, UINT8 data) case 0x0f0000: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -436,7 +436,7 @@ static UINT8 __fastcall gradius3_sound_read(UINT16 address) switch (address) { case 0xf010: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xf031: @@ -764,18 +764,18 @@ static INT32 DrvFrame() SekOpen(0); nCycleSegment = (nCyclesTotal[0] / nInterleave) * (i + 1); nCyclesDone[0] += SekRun(nCycleSegment - nCyclesDone[0]); - if (i == nInterleave - 1 && irqA_enable) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == nInterleave - 1 && irqA_enable) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); SekClose(); if (gradius3_cpub_enable) { SekOpen(1); nCycleSegment = (nCyclesTotal[1] / nInterleave) * (i + 1); nCyclesDone[1] += SekRun(nCycleSegment - SekTotalCycles()); - if (interrupt_triggered) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (interrupt_triggered) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); if (i == 240 && (irqB_mask & 1)) - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); if (i == 16 && (irqB_mask & 2)) - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); SekClose(); } diff --git a/src/burn/drv/konami/d_gyruss.cpp b/src/burn/drv/konami/d_gyruss.cpp index 5acb6a6f6..f7d992363 100644 --- a/src/burn/drv/konami/d_gyruss.cpp +++ b/src/burn/drv/konami/d_gyruss.cpp @@ -249,7 +249,7 @@ void __fastcall gyruss_main_write(UINT16 address, UINT8 data) ZetClose(); ZetOpen(1); ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -261,7 +261,7 @@ void __fastcall gyruss_main_write(UINT16 address, UINT8 data) case 0xc180: *interrupt_enable0 = data & 1; if (!*interrupt_enable0) { - ZetSetIRQLine(Z80_INPUT_LINE_NMI, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(Z80_INPUT_LINE_NMI, CPU_IRQSTATUS_NONE); } return; @@ -304,7 +304,7 @@ void gyruss_sub_write(UINT16 address, UINT8 data) case 0x2000: *interrupt_enable1 = data & 1; if (!*interrupt_enable1) { - M6809SetIRQLine(0, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0, CPU_IRQSTATUS_NONE); } return; } @@ -326,7 +326,7 @@ UINT8 __fastcall gyruss_sound0_read(UINT16 address) switch (address) { case 0x8000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -954,7 +954,7 @@ static INT32 DrvFrame() nCyclesSegment = nNext - nCyclesDone[0]; nCyclesDone[0] += ZetRun(nCyclesSegment); if (i == (nInterleave - 248) && *interrupt_enable0) { - ZetSetIRQLine(Z80_INPUT_LINE_NMI, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(Z80_INPUT_LINE_NMI, CPU_IRQSTATUS_ACK); } ZetClose(); @@ -963,7 +963,7 @@ static INT32 DrvFrame() nCyclesSegment = nNext - nCyclesDone[1]; nCyclesDone[1] += M6809Run(nCyclesSegment); if (i == (nInterleave - 248) && *interrupt_enable1) { - M6809SetIRQLine(0, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(0, CPU_IRQSTATUS_ACK); } M6809Close(); diff --git a/src/burn/drv/konami/d_hcastle.cpp b/src/burn/drv/konami/d_hcastle.cpp index 5c0434049..83fbe6c78 100644 --- a/src/burn/drv/konami/d_hcastle.cpp +++ b/src/burn/drv/konami/d_hcastle.cpp @@ -212,7 +212,7 @@ void hcastle_write(UINT16 address, UINT8 data) t -= ZetTotalCycles(); if (t > 1) ZetRun((INT32)t); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } return; @@ -321,7 +321,7 @@ UINT8 __fastcall hcastle_sound_read(UINT16 address) return BurnYM3812Read(0, address & 1); case 0xd000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -754,7 +754,7 @@ static INT32 DrvFrame() konamiOpen(0); konamiRun(nCyclesTotal[0]); - konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); BurnTimerEndFrameYM3812(nCyclesTotal[1]); diff --git a/src/burn/drv/konami/d_hexion.cpp b/src/burn/drv/konami/d_hexion.cpp index 57fb79dac..19968ad0f 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) ZetRaiseIrq(0); + if (i == nInterleave - 1) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); nCyclesDone[0] += nCyclesSegment; if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/d_ironhors.cpp b/src/burn/drv/konami/d_ironhors.cpp index 36489812f..5254e952f 100644 --- a/src/burn/drv/konami/d_ironhors.cpp +++ b/src/burn/drv/konami/d_ironhors.cpp @@ -197,7 +197,7 @@ static void ironhors_main_write(UINT16 address, UINT8 data) case 0x0900: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x0a00: @@ -241,7 +241,7 @@ static UINT8 __fastcall ironhors_sound_read(UINT16 address) switch (address) { case 0x8000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch; } @@ -604,8 +604,8 @@ static INT32 DrvFrame() { M6809Run(nCyclesTotal[0] / nInterleave); - if (i == 240 && (DrvIRQEnable[0] & 0x04)) M6809SetIRQLine(1, M6809_IRQSTATUS_AUTO); // firq - if ((i&0x3f)==0 && (DrvIRQEnable[0] & 0x01)) M6809SetIRQLine(0x20, M6809_IRQSTATUS_AUTO); // nmi + if (i == 240 && (DrvIRQEnable[0] & 0x04)) M6809SetIRQLine(1, CPU_IRQSTATUS_AUTO); // firq + if ((i&0x3f)==0 && (DrvIRQEnable[0] & 0x01)) M6809SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); // nmi BurnTimerUpdate((i+1) * (nCyclesTotal[1] / nInterleave)); } diff --git a/src/burn/drv/konami/d_jailbrek.cpp b/src/burn/drv/konami/d_jailbrek.cpp index b0e450f5c..10261ae02 100644 --- a/src/burn/drv/konami/d_jailbrek.cpp +++ b/src/burn/drv/konami/d_jailbrek.cpp @@ -548,9 +548,9 @@ static INT32 DrvFrame() { nCyclesDone[0] += M6809Run(nCyclesTotal[0] / nInterleave); - if (i < 8 && nmi_enable) M6809SetIRQLine(0x20, M6809_IRQSTATUS_AUTO); + if (i < 8 && nmi_enable) M6809SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); - if (i == 8 && irq_enable) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + if (i == 8 && irq_enable) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen / nInterleave; diff --git a/src/burn/drv/konami/d_kontest.cpp b/src/burn/drv/konami/d_kontest.cpp index d24deb77f..0793eb2e9 100644 --- a/src/burn/drv/konami/d_kontest.cpp +++ b/src/burn/drv/konami/d_kontest.cpp @@ -99,7 +99,7 @@ static void __fastcall kontest_write_port(UINT16 port, UINT8 data) case 0x08: *irq_enable = data & 0x08; - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return; } } @@ -292,7 +292,7 @@ static INT32 DrvFrame() ZetRun(3000000 / 60); if (*irq_enable) - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); diff --git a/src/burn/drv/konami/d_labyrunr.cpp b/src/burn/drv/konami/d_labyrunr.cpp index 0c56ed45e..bc8d7b909 100644 --- a/src/burn/drv/konami/d_labyrunr.cpp +++ b/src/burn/drv/konami/d_labyrunr.cpp @@ -745,9 +745,9 @@ static INT32 DrvFrame() BurnTimerUpdate((i+1) * (nCyclesTotal / nInterleave)); // the timings of these is extremely important.. and currently wrong. - if ((i & 0x3f) == 0x3f && (K007121CtrlRAM[7] & 0x01)) HD6309SetIRQLine(0x20, HD6309_IRQSTATUS_AUTO); + if ((i & 0x3f) == 0x3f && (K007121CtrlRAM[7] & 0x01)) HD6309SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); - if (i == 253 && (K007121CtrlRAM[7] & 0x02)) HD6309SetIRQLine(0x00, HD6309_IRQSTATUS_AUTO); + if (i == 253 && (K007121CtrlRAM[7] & 0x02)) HD6309SetIRQLine(0x00, CPU_IRQSTATUS_AUTO); } BurnTimerEndFrame(nCyclesTotal); diff --git a/src/burn/drv/konami/d_lethal.cpp b/src/burn/drv/konami/d_lethal.cpp index 566aa1fdc..f22b43018 100644 --- a/src/burn/drv/konami/d_lethal.cpp +++ b/src/burn/drv/konami/d_lethal.cpp @@ -246,7 +246,7 @@ static void lethal_main_write(UINT16 address, UINT8 data) return; case 0x00c7: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -335,7 +335,7 @@ static UINT8 __fastcall lethal_sound_read(UINT16 address) switch (address) { case 0xfc02: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xfc03: @@ -707,7 +707,7 @@ static INT32 DrvFrame() } if (K056832IsIrqEnabled()) { - HD6309SetIRQLine(0, HD6309_IRQSTATUS_AUTO); + HD6309SetIRQLine(0, CPU_IRQSTATUS_AUTO); } if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/d_mainevt.cpp b/src/burn/drv/konami/d_mainevt.cpp index c4c3db3ef..64620ea5b 100644 --- a/src/burn/drv/konami/d_mainevt.cpp +++ b/src/burn/drv/konami/d_mainevt.cpp @@ -486,7 +486,7 @@ void mainevt_main_write(UINT16 address, UINT8 data) case 0x1f88: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x1f90: @@ -562,7 +562,7 @@ UINT8 __fastcall mainevt_sound_read(UINT16 address) switch (address) { case 0xa000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xc000: @@ -853,7 +853,7 @@ static INT32 DrvFrame() if (i == nCyclesSoundIrqTrigger-1) { nCyclesSoundIrqTrigger+=nCyclesSoundIrq; if (*irq_enable) { - if (nGame) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (nGame) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); else ZetNmi(); } } @@ -869,9 +869,9 @@ static INT32 DrvFrame() } if (nGame) { - if (nmi_enable[0]) HD6309SetIRQLine(0x20, HD6309_IRQSTATUS_AUTO); // nmi + if (nmi_enable[0]) HD6309SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); // nmi } else { - if (K052109_irq_enabled) HD6309SetIRQLine(HD6309_IRQ_LINE, HD6309_IRQSTATUS_AUTO); + if (K052109_irq_enabled) HD6309SetIRQLine(HD6309_IRQ_LINE, CPU_IRQSTATUS_AUTO); } if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/d_megazone.cpp b/src/burn/drv/konami/d_megazone.cpp index 10d41c5bb..3007a85b4 100644 --- a/src/burn/drv/konami/d_megazone.cpp +++ b/src/burn/drv/konami/d_megazone.cpp @@ -739,12 +739,12 @@ static INT32 DrvFrame() { INT32 nSegment = (nCyclesTotal[0] * (i + 1)) / nInterleave; nCyclesDone[0] += M6809Run(nSegment - nCyclesDone[0]); - if (i == (nInterleave - 1) && irq_enable) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + if (i == (nInterleave - 1) && irq_enable) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); nSegment = (nCyclesTotal[1] * (i + 1)) / nInterleave; nCyclesDone[1] += ZetRun(nSegment - nCyclesDone[1]); - if (i == (nInterleave - 2)) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == (nInterleave - 2)) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); nSegment = (nCyclesTotal[2] * (i + 1)) / nInterleave; nCyclesDone[2] += I8039Run(nSegment - nCyclesDone[2]); diff --git a/src/burn/drv/konami/d_mikie.cpp b/src/burn/drv/konami/d_mikie.cpp index 0623fe06c..a3333d169 100644 --- a/src/burn/drv/konami/d_mikie.cpp +++ b/src/burn/drv/konami/d_mikie.cpp @@ -159,7 +159,7 @@ static void mikie_main_write(UINT16 a, UINT8 d) case 0x2002: if (*sound_irq == 0 && d == 1) { ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } *sound_irq = d; return; @@ -233,7 +233,7 @@ static UINT8 __fastcall mikie_sound_read(UINT16 a) switch (a) { case 0x8003: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0x8005: @@ -554,7 +554,7 @@ static INT32 DrvFrame() nCyclesDone[0] += M6809Run(nCyclesTotal[0] / nInterleave); nCyclesDone[1] += ZetRun(nCyclesTotal[1] / nInterleave); - if (i == 240 && *irq_mask) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + if (i == 240 && *irq_mask) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); // Render Sound Segment if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/d_mogura.cpp b/src/burn/drv/konami/d_mogura.cpp index 6c1fdc0a5..223939f75 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { DACUpdate(pBurnSoundOut, nBurnSoundLen); diff --git a/src/burn/drv/konami/d_moo.cpp b/src/burn/drv/konami/d_moo.cpp index 9ad64bc7d..08a430b7f 100644 --- a/src/burn/drv/konami/d_moo.cpp +++ b/src/burn/drv/konami/d_moo.cpp @@ -346,7 +346,7 @@ static void __fastcall moo_main_write_byte(UINT32 address, UINT8 data) { case 0x0d4000: case 0x0d4001: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x0d600c: @@ -551,7 +551,7 @@ static void __fastcall bucky_main_write_byte(UINT32 address, UINT8 data) { case 0x0d4000: case 0x0d4001: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x0d600c: @@ -721,7 +721,7 @@ static UINT8 __fastcall moo_sound_read(UINT16 address) return BurnYM2151ReadStatus(); case 0xf002: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xf003: @@ -1146,7 +1146,7 @@ static INT32 DrvFrame() } if (control_data & 0x20) { - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); } } @@ -1155,7 +1155,7 @@ static INT32 DrvFrame() irq5_timer--; if (control_data & 0x800) { irq5_timer = 0; - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } } diff --git a/src/burn/drv/konami/d_mystwarr.cpp b/src/burn/drv/konami/d_mystwarr.cpp index 2951a1024..459ec5553 100644 --- a/src/burn/drv/konami/d_mystwarr.cpp +++ b/src/burn/drv/konami/d_mystwarr.cpp @@ -557,7 +557,7 @@ static void __fastcall mystwarr_main_write_byte(UINT32 address, UINT8 data) case 0x49a000: case 0x49a001: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x49e004: @@ -834,7 +834,7 @@ static void __fastcall metamrph_main_write_word(UINT32 address, UINT16 data) { case 0x264000: case 0x264001: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x26800c: @@ -917,7 +917,7 @@ static void __fastcall metamrph_main_write_byte(UINT32 address, UINT8 data) { case 0x264000: case 0x264001: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x26800c: @@ -1282,7 +1282,7 @@ static void __fastcall martchmp_main_write_byte(UINT32 address, UINT8 data) case 0x41a000: case 0x41a001: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -1536,7 +1536,7 @@ static void __fastcall dadandrn_main_write_byte(UINT32 address, UINT8 data) return; case 0x6e0000: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0xe00000: @@ -1630,7 +1630,7 @@ static void __fastcall mystwarr_sound_write(UINT16 address, UINT8 data) case 0xf800: sound_control = data & 0x10; bankswitch(data); - // if (!sound_control) ZetSetIRQLine(0x20, ZET_IRQSTATUS_NONE); // CLEAR NMI LINE! + // if (!sound_control) ZetSetIRQLine(0x20, CPU_IRQSTATUS_NONE); // CLEAR NMI LINE! return; } @@ -1665,11 +1665,11 @@ static UINT8 __fastcall mystwarr_sound_read(UINT16 address) switch (address) { case 0xf002: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xf003: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch2; } @@ -2811,23 +2811,23 @@ static INT32 DrvFrame() if (mw_irq_control & 1) { if (i == 0) - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); if (i == ((nInterleave * 240)/256)) - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } } if (nGame == 2 || nGame == 3) { if (i == 0) // otherwise service mode doesn't work! - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); if (i == ((nInterleave * 24) / 256)) - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (i == ((nInterleave * 248) / 256) && K053246_is_IRQ_enabled()) - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); } if (nGame == 4) // martchmp @@ -2835,17 +2835,17 @@ static INT32 DrvFrame() if (mw_irq_control & 2) { if (i == ((nInterleave * 23) / 256)) - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); if (i == ((nInterleave * 247) / 256) && K053246_is_IRQ_enabled()) - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); } } if (nGame == 5 || nGame == 6) { if (i == (nInterleave - 1)) - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); } nNext = (i + 1) * nCyclesTotal[1] / nInterleave; @@ -2854,7 +2854,7 @@ static INT32 DrvFrame() nCyclesDone[1] += nCyclesSegment; if ((i % (nInterleave / 8)) == ((nInterleave / 8) - 1)) {// && sound_nmi_enable && sound_control) { // iq_132 - ZetNmi(); //ZetSetIRQLine(0x20, ZET_IRQSTATUS_ACK); + ZetNmi(); //ZetSetIRQLine(0x20, CPU_IRQSTATUS_ACK); } if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/d_nemesis.cpp b/src/burn/drv/konami/d_nemesis.cpp index b0115f936..65bf1e178 100644 --- a/src/burn/drv/konami/d_nemesis.cpp +++ b/src/burn/drv/konami/d_nemesis.cpp @@ -1262,7 +1262,7 @@ static void __fastcall nemesis_main_write_byte(UINT32 address, UINT8 data) case 0x05e004: if (data & 1) { ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } return; @@ -1356,7 +1356,7 @@ static void __fastcall salamand_main_write_byte(UINT32 address, UINT8 data) switch (address) { case 0x0a0000: - if (data & 0x08) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + if (data & 0x08) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x0a0001: @@ -1394,7 +1394,7 @@ static void __fastcall salamand_main_write_word(UINT32 address, UINT16 data) *flipscreen = data & 0x04; *tilemap_flip_x = data & 0x04; *tilemap_flip_y = data & 0x08; - if (data & 0x0800) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + if (data & 0x0800) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } return; } @@ -1475,7 +1475,7 @@ static void __fastcall hcrash_main_write_byte(UINT32 address, UINT8 data) switch (address) { case 0x0a0000: - if (data & 0x08) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + if (data & 0x08) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x0a0001: @@ -1552,7 +1552,7 @@ static void __fastcall gx400_main_write_byte(UINT32 address, UINT8 data) case 0x05e004: if (data & 1) { ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } return; @@ -1632,7 +1632,7 @@ static void __fastcall citybomb_main_write_byte(UINT32 address, UINT8 data) case 0x078000: case 0x0f8000: // coin counters - if (data & 0x08) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + if (data & 0x08) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); selected_ip = (~data & 0x10) >> 4; return; @@ -1664,7 +1664,7 @@ static void __fastcall citybomb_main_write_word(UINT32 address, UINT16 data) *flipscreen = data & 0x04; *tilemap_flip_x = data & 0x04; *tilemap_flip_y = data & 0x08; - if (data & 0x0800) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + if (data & 0x0800) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); selected_ip = (~data & 0x1000) >> 12; } return; @@ -1776,7 +1776,7 @@ static UINT8 __fastcall nemesis_sound_read(UINT16 address) switch (address) { case 0xe001: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xe086: @@ -1830,7 +1830,7 @@ static UINT8 __fastcall salamand_sound_read(UINT16 address) switch (address) { case 0xa000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xc000: @@ -1916,7 +1916,7 @@ static UINT8 __fastcall citybomb_sound_read(UINT16 address) return BurnYM3812Read(0, address & 1); case 0xd000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -3059,7 +3059,7 @@ static INT32 NemesisFrame() segment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(segment); if (i == (nInterleave - 4) && *m68k_irq_enable) // should be 2500... - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); segment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += ZetRun(segment); @@ -3116,10 +3116,10 @@ static INT32 KonamigtFrame() nCyclesDone[0] += SekRun(segment); if (*m68k_irq_enable && i == 240 && (nCurrentFrame & 1) == 0) - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); if (*m68k_irq_enable2 && i == 0) - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); segment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += ZetRun(segment); @@ -3182,7 +3182,7 @@ static INT32 SalamandFrame() segment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(segment); if (i == (nInterleave - 4) && *m68k_irq_enable) // should be 2500... - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); segment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += ZetRun(segment); @@ -3255,10 +3255,10 @@ static INT32 HcrashFrame() nCyclesDone[0] += SekRun(segment); if (*m68k_irq_enable && i == 240 && (nCurrentFrame & 1) == 0) - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); if (*m68k_irq_enable2 && i == 0) - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); segment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += ZetRun(segment); @@ -3333,7 +3333,7 @@ static INT32 BlkpnthrFrame() segment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(segment); if (i == (nInterleave - 4) && *m68k_irq_enable) - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); segment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += ZetRun(segment); @@ -3406,13 +3406,13 @@ static INT32 Gx400Frame() nCyclesDone[0] += SekRun(segment); if (*m68k_irq_enable && (i == 240) && (nCurrentFrame & 1) == 0) - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); if (*m68k_irq_enable2 && (i == 0)) - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); if (*m68k_irq_enable4 && (i == 120)) - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); segment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += ZetRun(segment); @@ -3471,7 +3471,7 @@ static INT32 CitybombFrame() nCyclesDone[0] += SekRun(nCyclesTotal[0]); if (*m68k_irq_enable) // 2500... - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); BurnTimerEndFrameYM3812(nCyclesTotal[1]); diff --git a/src/burn/drv/konami/d_parodius.cpp b/src/burn/drv/konami/d_parodius.cpp index 3ed00e180..55f747875 100644 --- a/src/burn/drv/konami/d_parodius.cpp +++ b/src/burn/drv/konami/d_parodius.cpp @@ -169,7 +169,7 @@ void parodius_main_write(UINT16 address, UINT8 data) case 0x3fc8: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x3fcc: @@ -295,7 +295,7 @@ UINT8 __fastcall parodius_sound_read(UINT16 address) } if (address >= 0xfc00 && address <= 0xfc2f) { - if ((address & 0x3e) == 0x00) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if ((address & 0x3e) == 0x00) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return K053260Read(0, address & 0x3f); } @@ -562,7 +562,7 @@ static INT32 DrvFrame() } } - if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_pooyan.cpp b/src/burn/drv/konami/d_pooyan.cpp index 35412e7e2..cd2ca5f60 100644 --- a/src/burn/drv/konami/d_pooyan.cpp +++ b/src/burn/drv/konami/d_pooyan.cpp @@ -169,7 +169,7 @@ static void __fastcall pooyan_main_write(UINT16 address, UINT8 data) case 0xa180: irq_enable = data & 1; if (!irq_enable) - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); break; case 0xa181: @@ -177,7 +177,7 @@ static void __fastcall pooyan_main_write(UINT16 address, UINT8 data) if (irqtrigger == 0 && data) { ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); } diff --git a/src/burn/drv/konami/d_rockrage.cpp b/src/burn/drv/konami/d_rockrage.cpp index 29572fed0..76adc4877 100644 --- a/src/burn/drv/konami/d_rockrage.cpp +++ b/src/burn/drv/konami/d_rockrage.cpp @@ -161,7 +161,7 @@ static void rockrage_main_write(UINT16 address, UINT8 data) { case 0x2e80: soundlatch = data; - M6809SetIRQLine(0, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x2ec0: @@ -228,7 +228,7 @@ static UINT8 rockrage_sound_read(UINT16 address) return (vlm5030_bsy(0) ? 1 : 0); case 0x5000: - M6809SetIRQLine(0, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch; case 0x6000: @@ -523,7 +523,7 @@ static INT32 DrvFrame() } } - if (K007342_irq_enabled()) HD6309SetIRQLine(0, HD6309_IRQSTATUS_AUTO); + if (K007342_irq_enabled()) HD6309SetIRQLine(0, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_rocnrope.cpp b/src/burn/drv/konami/d_rocnrope.cpp index 15ab61527..5f7e12241 100644 --- a/src/burn/drv/konami/d_rocnrope.cpp +++ b/src/burn/drv/konami/d_rocnrope.cpp @@ -202,7 +202,7 @@ static void rocnrope_write(UINT16 address, UINT8 data) return; case 0x8081: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x8082: @@ -213,7 +213,7 @@ static void rocnrope_write(UINT16 address, UINT8 data) case 0x8087: irq_enable = data & 0x01; if (!irq_enable) { - M6809SetIRQLine(0, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0, CPU_IRQSTATUS_NONE); } return; @@ -530,7 +530,7 @@ static INT32 DrvFrame() { INT32 nSegment = (nCyclesTotal[0] * (i + 1)) / nInterleave; nCyclesDone[0] += M6809Run(nSegment - nCyclesDone[0]); - if (i == (nInterleave - 1) && irq_enable) M6809SetIRQLine(0, M6809_IRQSTATUS_ACK); + if (i == (nInterleave - 1) && irq_enable) M6809SetIRQLine(0, CPU_IRQSTATUS_ACK); nSegment = (nCyclesTotal[1] * i) / nInterleave; nCyclesDone[1] += ZetRun(nSegment - nCyclesDone[1]); diff --git a/src/burn/drv/konami/d_rollerg.cpp b/src/burn/drv/konami/d_rollerg.cpp index 0d1fbb733..9fe237355 100644 --- a/src/burn/drv/konami/d_rollerg.cpp +++ b/src/burn/drv/konami/d_rollerg.cpp @@ -159,8 +159,7 @@ void rollerg_main_write(UINT16 address, UINT8 data) case 0x0040: ZetSetVector(0xff); - // ZetRaiseIrq(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -265,7 +264,7 @@ UINT8 __fastcall rollerg_sound_read(UINT16 address) if (address >= 0xa000 && address <= 0xa02f) { // not sure... - if ((address & 0x3e) == 0x00) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if ((address & 0x3e) == 0x00) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return K053260Read(0, address & 0x3f); } @@ -496,7 +495,7 @@ static INT32 DrvFrame() BurnTimerUpdateYM3812(i * (nCyclesTotal[1] / nInterleave)); } - konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); BurnTimerEndFrameYM3812(nCyclesTotal[1]); diff --git a/src/burn/drv/konami/d_scotrsht.cpp b/src/burn/drv/konami/d_scotrsht.cpp index cb47d91c3..4636b6797 100644 --- a/src/burn/drv/konami/d_scotrsht.cpp +++ b/src/burn/drv/konami/d_scotrsht.cpp @@ -153,7 +153,7 @@ void scotrsht_main_write(UINT16 address, UINT8 data) case 0x3100: *soundlatch = data; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x3300: @@ -200,7 +200,7 @@ UINT8 scotrsht_main_read(UINT16 address) UINT8 __fastcall scotrsht_sound_read(UINT16 address) { if (address == 0x8000) { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -571,7 +571,7 @@ static INT32 DrvFrame() BurnTimerEndFrame(nCyclesTotal[1]); - if (*irq_enable) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + if (*irq_enable) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { BurnYM2203Update(pBurnSoundOut, nBurnSoundLen); diff --git a/src/burn/drv/konami/d_shaolins.cpp b/src/burn/drv/konami/d_shaolins.cpp index 36778a1d6..1d36541a0 100644 --- a/src/burn/drv/konami/d_shaolins.cpp +++ b/src/burn/drv/konami/d_shaolins.cpp @@ -496,9 +496,9 @@ static INT32 DrvFrame() nCyclesDone[0] += M6809Run(nCyclesTotal[0] / nInterleave); if (*nmi_enable && (i & 0x1f) == 0) - M6809SetIRQLine(0x20, M6809_IRQSTATUS_AUTO); // 480x/second (8x/frame) + M6809SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); // 480x/second (8x/frame) - if (i == 240) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + if (i == 240) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); // Render Sound Segment if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/d_simpsons.cpp b/src/burn/drv/konami/d_simpsons.cpp index 85eeeec55..6dc06942a 100644 --- a/src/burn/drv/konami/d_simpsons.cpp +++ b/src/burn/drv/konami/d_simpsons.cpp @@ -215,7 +215,7 @@ UINT8 simpsons_main_read(UINT16 address) case 0x1fc4: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return 0; case 0x1fc6: @@ -302,7 +302,7 @@ UINT8 __fastcall simpsons_sound_read(UINT16 address) } if (address >= 0xfc00 && address < 0xfc30) { - if ((address & 0x3f) == 0x01) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if ((address & 0x3f) == 0x01) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return K053260Read(0, address & 0xff); } @@ -628,7 +628,7 @@ static INT32 DrvFrame() nCyclesDone[0] += nCyclesSegment; if (i == 1 && K053246Irq && simpsons_firq_enabled) { - konamiSetIrqLine(KONAMI_FIRQ_LINE, KONAMI_IRQSTATUS_AUTO); + konamiSetIrqLine(KONAMI_FIRQ_LINE, CPU_IRQSTATUS_AUTO); } K053246Irq = K053246_is_IRQ_enabled(); @@ -648,7 +648,7 @@ static INT32 DrvFrame() } if (K053246Irq) simpsons_objdma(); - if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_spy.cpp b/src/burn/drv/konami/d_spy.cpp index 3e3f36b89..332f9b1d7 100644 --- a/src/burn/drv/konami/d_spy.cpp +++ b/src/burn/drv/konami/d_spy.cpp @@ -257,9 +257,9 @@ static void spy_3f90_w(INT32 data) { spy_collision(); - M6809SetIRQLine(1 /*FIRQ*/, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(1 /*FIRQ*/, CPU_IRQSTATUS_ACK); M6809Run(105); // delay or the M6809 won't read it... - M6809SetIRQLine(1 /*FIRQ*/, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(1 /*FIRQ*/, CPU_IRQSTATUS_NONE); } Drv3f90old = data; @@ -300,7 +300,7 @@ void spy_main_write(UINT16 address, UINT8 data) return; case 0x3fc0: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } @@ -392,7 +392,7 @@ UINT8 __fastcall spy_sound_read(UINT16 address) return BurnYM3812Read(0, address & 1); case 0xd000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -657,7 +657,7 @@ static INT32 DrvFrame() nCyclesDone[1] += BurnTimerUpdateYM3812(nCyclesSegment - nCyclesDone[1]); } - if (K052109_irq_enabled) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + if (K052109_irq_enabled) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); BurnTimerEndFrameYM3812(nCyclesTotal[1]); diff --git a/src/burn/drv/konami/d_surpratk.cpp b/src/burn/drv/konami/d_surpratk.cpp index 3ca137cd9..f1a89b654 100644 --- a/src/burn/drv/konami/d_surpratk.cpp +++ b/src/burn/drv/konami/d_surpratk.cpp @@ -457,7 +457,7 @@ static INT32 DrvFrame() nCyclesDone += konamiRun(nSegment - nCyclesDone); if (i == 235) { - if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); } if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/d_thunderx.cpp b/src/burn/drv/konami/d_thunderx.cpp index 1383e168f..85e31308f 100644 --- a/src/burn/drv/konami/d_thunderx.cpp +++ b/src/burn/drv/konami/d_thunderx.cpp @@ -314,7 +314,7 @@ static void thunderx_1f98_w(UINT8 data) konamiRun(10); - konamiSetIrqLine(KONAMI_FIRQ_LINE, KONAMI_IRQSTATUS_AUTO); // must be delayed + konamiSetIrqLine(KONAMI_FIRQ_LINE, CPU_IRQSTATUS_AUTO); // must be delayed } thunderx_1f98_data = data; @@ -371,7 +371,7 @@ void scontra_main_write(UINT16 address, UINT8 data) return; case 0x1f88: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x1f8c: @@ -461,7 +461,7 @@ UINT8 __fastcall scontra_sound_read(UINT16 address) switch (address) { case 0xa000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xc001: @@ -794,7 +794,7 @@ static INT32 DrvFrame() } } - if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + if (K052109_irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_timeplt.cpp b/src/burn/drv/konami/d_timeplt.cpp index 1ec9476b2..544c07892 100644 --- a/src/burn/drv/konami/d_timeplt.cpp +++ b/src/burn/drv/konami/d_timeplt.cpp @@ -268,7 +268,7 @@ static void __fastcall timeplt_main_write(UINT16 address, UINT8 data) case 0xc300: if (game_select != 2) { // psurge doesn't use this nmi_enable = data & 1; - if (!nmi_enable) ZetSetIRQLine(0x20, ZET_IRQSTATUS_NONE); + if (!nmi_enable) ZetSetIRQLine(0x20, CPU_IRQSTATUS_NONE); } return; @@ -281,7 +281,7 @@ static void __fastcall timeplt_main_write(UINT16 address, UINT8 data) ZetClose(); ZetOpen(1); ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); } @@ -742,7 +742,7 @@ static INT32 DrvFrame() ZetOpen(0); INT32 nSegment = (nCyclesTotal[0] * (i + 1)) / nInterleave; nCyclesDone[0] += ZetRun(nSegment - nCyclesDone[0]); - if (i == (nInterleave - 1) && nmi_enable) ZetSetIRQLine(0x20, ZET_IRQSTATUS_ACK); + if (i == (nInterleave - 1) && nmi_enable) ZetSetIRQLine(0x20, CPU_IRQSTATUS_ACK); if (i == (nInterleave - 1) && game_select == 2) ZetNmi(); ZetClose(); diff --git a/src/burn/drv/konami/d_tmnt.cpp b/src/burn/drv/konami/d_tmnt.cpp index 540442b7c..e9d8cff9b 100644 --- a/src/burn/drv/konami/d_tmnt.cpp +++ b/src/burn/drv/konami/d_tmnt.cpp @@ -2510,7 +2510,7 @@ void __fastcall Tmnt68KWriteByte(UINT32 a, UINT8 d) static INT32 Last; if (Last == 0x08 && (d & 0x08) == 0) { ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); } Last = d & 0x08; @@ -2619,7 +2619,7 @@ void __fastcall Mia68KWriteByte(UINT32 a, UINT8 d) static INT32 Last; if (Last == 0x08 && (d & 0x08) == 0) { ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); } Last = d & 0x08; @@ -2969,7 +2969,7 @@ void __fastcall Blswhstl68KWriteByte(UINT32 a, UINT8 d) case 0x780605: { ZetOpen(0); ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -3397,7 +3397,7 @@ void __fastcall Ssriders68KWriteByte(UINT32 a, UINT8 d) case 0x5c0605: { ZetOpen(0); ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -3591,7 +3591,7 @@ void __fastcall Thndrx268KWriteByte(UINT32 a, UINT8 d) static INT32 last; if (last == 0 && (d & 0x20) != 0) { ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } last = d & 0x20; @@ -3734,7 +3734,7 @@ void __fastcall Lgtnfght68KWriteByte(UINT32 a, UINT8 d) static INT32 last; if (last == 0 && (d & 0x4) != 0) { ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } last = d & 0x4; @@ -3842,7 +3842,7 @@ void __fastcall Punkshot68KWriteByte(UINT32 a, UINT8 d) if (last == 0x04 && (d & 0x04) == 0x00) { ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } last = d & 0x04; @@ -3871,7 +3871,7 @@ UINT8 __fastcall TmntZ80Read(UINT16 a) } case 0xa000: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return DrvSoundLatch; } @@ -3946,7 +3946,7 @@ UINT8 __fastcall MiaZ80Read(UINT16 a) switch (a) { case 0xa000: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return DrvSoundLatch; } @@ -3989,7 +3989,7 @@ void __fastcall MiaZ80Write(UINT16 a, UINT8 d) UINT8 __fastcall BlswhstlZ80Read(UINT16 a) { if (a >= 0xfa00 && a <= 0xfa2f) { - if (a == 0xfa00) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (a == 0xfa00) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return K053260Read(0, a - 0xfa00); } @@ -4065,7 +4065,7 @@ void __fastcall Thndrx2Z80Write(UINT16 a, UINT8 d) UINT8 __fastcall Thndrx2Z80Read(UINT16 a) { if (a >= 0xfc00 && a <= 0xfc2f) { - if (a == 0xfc00) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (a == 0xfc00) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return K053260Read(0, a - 0xfc00); } @@ -4101,7 +4101,7 @@ void __fastcall LgtnfghtZ80Write(UINT16 a, UINT8 d) UINT8 __fastcall LgtnfghtZ80Read(UINT16 a) { if (a >= 0xc000 && a <= 0xc02f) { - if (a == 0xc000) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (a == 0xc000) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return K053260Read(0, a - 0xc000); } @@ -5614,7 +5614,7 @@ static INT32 TmntFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1) && bIrqEnable) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1) && bIrqEnable) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); // Run Z80 @@ -5680,7 +5680,7 @@ static INT32 MiaFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1) && bIrqEnable) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1) && bIrqEnable) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); // Run Z80 @@ -5740,8 +5740,8 @@ static INT32 CuebrickFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1) && bIrqEnable) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); - if (CuebrickSndIrqFire) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1) && bIrqEnable) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); + if (CuebrickSndIrqFire) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen / nInterleave; @@ -5793,7 +5793,7 @@ static INT32 BlswhstlFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1) && K052109_irq_enabled) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1) && K052109_irq_enabled) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); // Run Z80 @@ -5880,7 +5880,7 @@ static INT32 SsridersFrame() } SekOpen(0); - if (K052109_irq_enabled) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (K052109_irq_enabled) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); // Make sure the buffer is entirely filled. @@ -5943,7 +5943,7 @@ static INT32 Thndrx2Frame() } } - if (K052109_irq_enabled) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (K052109_irq_enabled) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); // Make sure the buffer is entirely filled. if (pBurnSoundOut) { @@ -6008,7 +6008,7 @@ static INT32 LgtnfghtFrame() } } - if (K052109_irq_enabled) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (K052109_irq_enabled) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); // Make sure the buffer is entirely filled. if (pBurnSoundOut) { @@ -6056,7 +6056,7 @@ static INT32 Tmnt2Frame() nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); if (i == 19) DrvVBlank = 0; if (i == 243) DrvVBlank = 1; - if (i == 243 && K052109_irq_enabled) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == 243 && K052109_irq_enabled) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); // Run Z80 @@ -6137,7 +6137,7 @@ static INT32 PunkshotFrame() } } - if (K052109_irq_enabled) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (K052109_irq_enabled) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); // Make sure the buffer is entirely filled. if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/d_tutankhm.cpp b/src/burn/drv/konami/d_tutankhm.cpp index b4a4545a7..281846f69 100644 --- a/src/burn/drv/konami/d_tutankhm.cpp +++ b/src/burn/drv/konami/d_tutankhm.cpp @@ -164,7 +164,7 @@ static void tutankhm_write(UINT16 address, UINT8 data) case 0x8200: irq_enable = data & 1; if (!irq_enable) { - M6809SetIRQLine(0, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0, CPU_IRQSTATUS_NONE); } return; @@ -192,7 +192,7 @@ static void tutankhm_write(UINT16 address, UINT8 data) return; case 0x8600: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x8700: @@ -435,7 +435,7 @@ static INT32 DrvFrame() { INT32 nSegment = (nCyclesTotal[0] * (i + 1)) / nInterleave; nCyclesDone[0] += M6809Run(nSegment - nCyclesDone[0]); - if (i == (nInterleave - 1) && irq_enable && (nCurrentFrame & 1)) M6809SetIRQLine(0, M6809_IRQSTATUS_ACK); + if (i == (nInterleave - 1) && irq_enable && (nCurrentFrame & 1)) M6809SetIRQLine(0, CPU_IRQSTATUS_ACK); nSegment = (nCyclesTotal[1] * i) / nInterleave; nCyclesDone[1] += ZetRun(nSegment - nCyclesDone[1]); diff --git a/src/burn/drv/konami/d_twin16.cpp b/src/burn/drv/konami/d_twin16.cpp index 83e0b623a..566b60934 100644 --- a/src/burn/drv/konami/d_twin16.cpp +++ b/src/burn/drv/konami/d_twin16.cpp @@ -563,7 +563,7 @@ static void fround_CPU_register_w(INT32 data) { if ((old & 0x08) == 0 && (twin16_CPUA_register & 0x08)) { ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } } } @@ -574,7 +574,7 @@ static void twin16_CPUA_register_w(INT32 data) { if ((twin16_CPUA_register & 0x08) == 0 && (data & 0x08)) { ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } if ((twin16_CPUA_register & 0x40) && (data & 0x40) == 0) @@ -583,7 +583,7 @@ static void twin16_CPUA_register_w(INT32 data) if ((twin16_CPUA_register & 0x10) == 0 && (data & 0x10)) { SekClose(); SekOpen(1); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); SekClose(); SekOpen(0); } @@ -602,7 +602,7 @@ static void twin16_CPUB_register_w(INT32 data) { SekClose(); SekOpen(0); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); SekClose(); SekOpen(1); } @@ -649,7 +649,7 @@ void __fastcall twin16_main_write_byte(UINT32 address, UINT8 data) case 0xa0008: case 0xa0009: *soundlatch = data; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0xa0011: // watchdog @@ -811,7 +811,7 @@ UINT8 __fastcall twin16_sound_read(UINT16 address) return *soundlatch2; case 0xa000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xc000: @@ -1420,13 +1420,13 @@ static INT32 DrvFrame() SekOpen(0); nSegment = (nTotalCycles[0] - nCyclesDone[0]) / (nInterleave - i); nCyclesDone[0] += SekRun(nSegment); - if ((twin16_CPUA_register & 0x20) && i == nInterleave-1) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if ((twin16_CPUA_register & 0x20) && i == nInterleave-1) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); if (twin16_custom_video != 1) { SekOpen(1); nCyclesDone[1] += SekRun(nSegment); - if ((twin16_CPUB_register & 0x02) && i == nInterleave-1) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if ((twin16_CPUB_register & 0x02) && i == nInterleave-1) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); } diff --git a/src/burn/drv/konami/d_ultraman.cpp b/src/burn/drv/konami/d_ultraman.cpp index 1aa7a21ab..358d5a361 100644 --- a/src/burn/drv/konami/d_ultraman.cpp +++ b/src/burn/drv/konami/d_ultraman.cpp @@ -592,7 +592,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_vendetta.cpp b/src/burn/drv/konami/d_vendetta.cpp index 251c6f613..e127cee2d 100644 --- a/src/burn/drv/konami/d_vendetta.cpp +++ b/src/burn/drv/konami/d_vendetta.cpp @@ -213,7 +213,7 @@ void vendetta_main_write(UINT16 address, UINT8 data) case 0x5fe4: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x5fe6: @@ -289,7 +289,7 @@ UINT8 vendetta_main_read(UINT16 address) case 0x5fe4: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return 0; case 0x5fe6: @@ -349,7 +349,7 @@ void esckids_main_write(UINT16 address, UINT8 data) case 0x3fd4: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x3fd6: @@ -420,7 +420,7 @@ UINT8 esckids_main_read(UINT16 address) case 0x3fd4: ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return 0; case 0x3fd6: @@ -486,7 +486,7 @@ UINT8 __fastcall vendetta_sound_read(UINT16 address) } if (address >= 0xfc00 && address < 0xfc30) { - if ((address & 0x3f) == 0x01) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if ((address & 0x3f) == 0x01) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return K053260Read(0, address & 0xff); } @@ -829,7 +829,7 @@ static INT32 DrvFrame() } } - if (irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, KONAMI_IRQSTATUS_AUTO); + if (irq_enabled) konamiSetIrqLine(KONAMI_IRQ_LINE, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_xexex.cpp b/src/burn/drv/konami/d_xexex.cpp index 881844d7b..8c59ca51f 100644 --- a/src/burn/drv/konami/d_xexex.cpp +++ b/src/burn/drv/konami/d_xexex.cpp @@ -202,7 +202,7 @@ static void _fastcall xexex_main_write_byte(UINT32 address, UINT8 data) { case 0x0d4000: case 0x0d4001: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x0d6001: @@ -381,11 +381,11 @@ static UINT8 __fastcall xexex_sound_read(UINT16 address) return BurnYM2151ReadStatus(); case 0xf002: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xf003: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch2; } @@ -719,20 +719,20 @@ static INT32 DrvFrame() nCyclesDone[0] += nCyclesSegment; if (i == 0 && control_data & 0x20) { - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); } if (i != 0 && i != ((nInterleave/2)-1)) { if (irq5_timer > 0) { irq5_timer--; if (irq5_timer == 0 && control_data & 0x40) { - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); } } } if (i == ((nInterleave/2)-1) && control_data & 0x0800) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); if (K053246_is_IRQ_enabled()) { xexex_objdma(); diff --git a/src/burn/drv/konami/d_xmen.cpp b/src/burn/drv/konami/d_xmen.cpp index 8982d1075..dd09153f9 100644 --- a/src/burn/drv/konami/d_xmen.cpp +++ b/src/burn/drv/konami/d_xmen.cpp @@ -140,7 +140,7 @@ void __fastcall xmen_main_write_byte(UINT32 address, UINT8 data) case 0x10804e: case 0x10804f: - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x10a001: @@ -281,7 +281,7 @@ UINT8 __fastcall xmen_sound_read(UINT16 address) return BurnYM2151ReadStatus(); case 0xf002: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -591,7 +591,7 @@ static INT32 DrvFrame() nCyclesDone[0] += nCyclesSegment; if (i == (nInterleave / 2) && interrupt_enable) { - SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); } nNext = (i + 1) * nCyclesTotal[1] / nInterleave; @@ -608,7 +608,7 @@ static INT32 DrvFrame() } } - if (interrupt_enable) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (interrupt_enable) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/konami/d_yiear.cpp b/src/burn/drv/konami/d_yiear.cpp index 201ae47f2..4701f98e2 100644 --- a/src/burn/drv/konami/d_yiear.cpp +++ b/src/burn/drv/konami/d_yiear.cpp @@ -473,9 +473,9 @@ static INT32 DrvFrame() nCyclesDone[0] += M6809Run(nCyclesTotal[0] / nInterleave); if (*nmi_enable && (i & 0x1f) == 0) // copy shao-lin's road - M6809SetIRQLine(0x20, M6809_IRQSTATUS_AUTO); // 480x/second (8x/frame) + M6809SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); // 480x/second (8x/frame) - if (i == 240 && *irq_enable) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + if (i == 240 && *irq_enable) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); // Render Sound Segment if (pBurnSoundOut) { diff --git a/src/burn/drv/konami/timeplt_snd.cpp b/src/burn/drv/konami/timeplt_snd.cpp index c442e53eb..52a14444a 100644 --- a/src/burn/drv/konami/timeplt_snd.cpp +++ b/src/burn/drv/konami/timeplt_snd.cpp @@ -68,7 +68,7 @@ static UINT8 __fastcall timeplt_sound_read(UINT16 address) static UINT8 AY8910_0_portA(UINT32) { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch; } diff --git a/src/burn/drv/megadrive/megadrive.cpp b/src/burn/drv/megadrive/megadrive.cpp index 8507937a7..dbcbb7f47 100644 --- a/src/burn/drv/megadrive/megadrive.cpp +++ b/src/burn/drv/megadrive/megadrive.cpp @@ -978,9 +978,9 @@ void __fastcall MegadriveVideoWriteWord(UINT32 sekAddress, UINT16 wordValue) INT32 lines = (RamVReg->reg[1] & 0x20) | (RamVReg->reg[0] & 0x10); INT32 pints = (RamVReg->pending_ints & lines); - if(pints & 0x20) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); - else if(pints & 0x10) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - else SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + if(pints & 0x20) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); + else if(pints & 0x10) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + else SekSetIRQLine(0, CPU_IRQSTATUS_NONE); } @@ -4232,7 +4232,7 @@ INT32 MegadriveFrame() hint = RamVReg->reg[10]; // Reload H-Int counter RamVReg->pending_ints |= 0x10; if (RamVReg->reg[0] & 0x10) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } @@ -4246,7 +4246,7 @@ INT32 MegadriveFrame() RamVReg->pending_ints |= 0x20; if(RamVReg->reg[1] & 0x20) { - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); } } @@ -4259,8 +4259,8 @@ INT32 MegadriveFrame() if (Z80HasBus && !MegadriveZ80Reset) { done_z80 += ZetRun(((y + 1) * cycles_z80) - done_z80); - if (y == line_sample) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (y == line_sample + 1) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (y == line_sample) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (y == line_sample + 1) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/neogeo/neo_run.cpp b/src/burn/drv/neogeo/neo_run.cpp index c2e0ce9a6..c797bbe1d 100644 --- a/src/burn/drv/neogeo/neo_run.cpp +++ b/src/burn/drv/neogeo/neo_run.cpp @@ -975,9 +975,9 @@ static void neogeoFMIRQHandler(INT32, INT32 nStatus) // bprintf(PRINT_NORMAL, _T(" YM2610 IRQ status: 0x%02X (%6i cycles)\n"), nStatus, ZetTotalCycles()); if (nStatus & 1) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1680,16 +1680,16 @@ static inline void NeoIRQUpdate(UINT16 wordValue) // bprintf(PRINT_NORMAL, _T(" - IRQ Ack -> %02X (at line %3i).\n"), nIRQAcknowledge, SekCurrentScanline()); if ((nIRQAcknowledge & 7) == 7) { - SekSetIRQLine(7, SEK_IRQSTATUS_NONE); + SekSetIRQLine(7, CPU_IRQSTATUS_NONE); } else { if ((nIRQAcknowledge & 1) == 0) { - SekSetIRQLine(3, SEK_IRQSTATUS_ACK); + SekSetIRQLine(3, CPU_IRQSTATUS_ACK); } if ((nIRQAcknowledge & 2) == 0) { - SekSetIRQLine(nScanlineIRQ, SEK_IRQSTATUS_ACK); + SekSetIRQLine(nScanlineIRQ, CPU_IRQSTATUS_ACK); } if ((nIRQAcknowledge & 4) == 0) { - SekSetIRQLine(nVBLankIRQ, SEK_IRQSTATUS_ACK); + SekSetIRQLine(nVBLankIRQ, CPU_IRQSTATUS_ACK); } } } @@ -1701,7 +1701,7 @@ static inline void NeoCDIRQUpdate(UINT8 byteValue) // bprintf(PRINT_NORMAL, _T(" - IRQ Ack -> %02X (CD, at line %3i).\n"), nIRQAcknowledge, SekCurrentScanline()); if ((nIRQAcknowledge & 0x3F) == 0x3F) { - SekSetIRQLine(7, SEK_IRQSTATUS_NONE); + SekSetIRQLine(7, CPU_IRQSTATUS_NONE); } else { if ((nIRQAcknowledge & 0x07) != 7) { NeoIRQUpdate(0); @@ -1710,19 +1710,19 @@ static inline void NeoCDIRQUpdate(UINT8 byteValue) if ((nIRQAcknowledge & 0x08) == 0) { nNeoCDIRQVector = 0x17; nNeoCDIRQVectorAck = 1; - SekSetIRQLine(4, SEK_IRQSTATUS_ACK /*| SEK_IRQSTATUS_CALLBACK*/); + SekSetIRQLine(4, CPU_IRQSTATUS_ACK /*| CPU_IRQSTATUS_CALLBACK*/); return; } if ((nIRQAcknowledge & 0x10) == 0) { nNeoCDIRQVector = 0x16; nNeoCDIRQVectorAck = 1; - SekSetIRQLine(4, SEK_IRQSTATUS_ACK /*| SEK_IRQSTATUS_CALLBACK*/); + SekSetIRQLine(4, CPU_IRQSTATUS_ACK /*| CPU_IRQSTATUS_CALLBACK*/); return; } if ((nIRQAcknowledge & 0x20) == 0) { nNeoCDIRQVector = 0x15; nNeoCDIRQVectorAck = 1; - SekSetIRQLine(4, SEK_IRQSTATUS_ACK /*| SEK_IRQSTATUS_CALLBACK*/); + SekSetIRQLine(4, CPU_IRQSTATUS_ACK /*| CPU_IRQSTATUS_CALLBACK*/); return; } } @@ -4613,7 +4613,7 @@ INT32 NeoFrame() if ((nIRQControl & 0x10) && (nIRQCycles < NO_IRQ_PENDING) && (SekTotalCycles() >= nIRQCycles)) { nIRQAcknowledge &= ~2; - SekSetIRQLine(nScanlineIRQ, SEK_IRQSTATUS_ACK); + SekSetIRQLine(nScanlineIRQ, CPU_IRQSTATUS_ACK); #if 0 || defined LOG_IRQ bprintf(PRINT_NORMAL, _T(" - IRQ triggered (line %3i + %3i cycles).\n"), SekCurrentScanline(), SekTotalCycles() - SekCurrentScanline() * SekCyclesScanline()); @@ -4650,7 +4650,7 @@ INT32 NeoFrame() if ((nIRQControl & 0x10) && (nIRQCycles < NO_IRQ_PENDING) && (nLastIRQ < nIRQCycles) && (SekTotalCycles() >= nIRQCycles)) { nLastIRQ = nIRQCycles; nIRQAcknowledge &= ~2; - SekSetIRQLine(nScanlineIRQ, SEK_IRQSTATUS_ACK); + SekSetIRQLine(nScanlineIRQ, CPU_IRQSTATUS_ACK); #if 0 || defined LOG_IRQ bprintf(PRINT_NORMAL, _T(" - IRQ triggered (line %3i + %3i cycles).\n"), SekCurrentScanline(), SekTotalCycles() - SekCurrentScanline() * SekCyclesScanline()); #endif @@ -4708,7 +4708,7 @@ INT32 NeoFrame() if ((nIRQControl & 0x10) && (nIRQCycles < NO_IRQ_PENDING) && (SekTotalCycles() >= nIRQCycles)) { nIRQAcknowledge &= ~2; - SekSetIRQLine(nScanlineIRQ, SEK_IRQSTATUS_ACK); + SekSetIRQLine(nScanlineIRQ, CPU_IRQSTATUS_ACK); #if 0 || defined LOG_IRQ bprintf(PRINT_NORMAL, _T(" - IRQ triggered (line %3i + %3i cycles).\n"), SekCurrentScanline(), SekTotalCycles() - SekCurrentScanline() * SekCyclesScanline()); @@ -4778,7 +4778,7 @@ INT32 NeoFrame() } nIRQAcknowledge &= ~4; - SekSetIRQLine(nVBLankIRQ, SEK_IRQSTATUS_ACK); + SekSetIRQLine(nVBLankIRQ, CPU_IRQSTATUS_ACK); #if 0 || defined LOG_IRQ bprintf(PRINT_NORMAL, _T(" - VBLank.\n")); @@ -4801,7 +4801,7 @@ INT32 NeoFrame() if ((nIRQControl & 0x10) && (nIRQCycles < NO_IRQ_PENDING) && (SekTotalCycles() >= nIRQCycles)) { nIRQAcknowledge &= ~2; - SekSetIRQLine(nScanlineIRQ, SEK_IRQSTATUS_ACK); + SekSetIRQLine(nScanlineIRQ, CPU_IRQSTATUS_ACK); #if 0 || defined LOG_IRQ bprintf(PRINT_NORMAL, _T(" - IRQ triggered (line %3i + %3i cycles).\n"), SekCurrentScanline(), SekTotalCycles() - SekCurrentScanline() * SekCyclesScanline()); diff --git a/src/burn/drv/pgm/pgm_asic27a_type2.cpp b/src/burn/drv/pgm/pgm_asic27a_type2.cpp index a78292033..980237f8e 100644 --- a/src/burn/drv/pgm/pgm_asic27a_type2.cpp +++ b/src/burn/drv/pgm/pgm_asic27a_type2.cpp @@ -29,7 +29,7 @@ static void __fastcall asic27a_write_byte(UINT32 address, UINT8 data) if ((address & 0xfffffe) == 0xd10000) { // ddp2 pgm_cpu_sync(); asic27a_to_arm = data; - Arm7SetIRQLine(ARM7_FIRQ_LINE, ARM7_IRQSTATUS_ACK); + Arm7SetIRQLine(ARM7_FIRQ_LINE, CPU_IRQSTATUS_ACK); return; } } @@ -39,7 +39,7 @@ static void __fastcall asic27a_write_word(UINT32 address, UINT16 data) if ((address & 0xfffffe) == 0xd10000) { pgm_cpu_sync(); asic27a_to_arm = data & 0xff; - Arm7SetIRQLine(ARM7_FIRQ_LINE, ARM7_IRQSTATUS_ACK); + Arm7SetIRQLine(ARM7_FIRQ_LINE, CPU_IRQSTATUS_ACK); return; } } @@ -79,7 +79,7 @@ static UINT8 asic27a_arm7_read_byte(UINT32 address) switch (address) { case 0x38000000: - Arm7SetIRQLine(ARM7_FIRQ_LINE, ARM7_IRQSTATUS_NONE); + Arm7SetIRQLine(ARM7_FIRQ_LINE, CPU_IRQSTATUS_NONE); return asic27a_to_arm; } diff --git a/src/burn/drv/pgm/pgm_asic27a_type3.cpp b/src/burn/drv/pgm/pgm_asic27a_type3.cpp index 84ac86778..71efdfbbc 100644 --- a/src/burn/drv/pgm/pgm_asic27a_type3.cpp +++ b/src/burn/drv/pgm/pgm_asic27a_type3.cpp @@ -39,7 +39,7 @@ static void __fastcall svg_write_byte(UINT32 address, UINT8 data) switch (address) { case 0x5c0000: - Arm7SetIRQLine(ARM7_FIRQ_LINE, ARM7_IRQSTATUS_AUTO); + Arm7SetIRQLine(ARM7_FIRQ_LINE, CPU_IRQSTATUS_AUTO); return; } } diff --git a/src/burn/drv/pgm/pgm_run.cpp b/src/burn/drv/pgm/pgm_run.cpp index dfee7e26c..1c8a768fd 100644 --- a/src/burn/drv/pgm/pgm_run.cpp +++ b/src/burn/drv/pgm/pgm_run.cpp @@ -852,11 +852,11 @@ INT32 pgmFrame() } if (i == ((PGM_INTER_LEAVE / 2)-1) && !nPGMDisableIRQ4) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); ics2115_frame(); diff --git a/src/burn/drv/pre90s/d_1942.cpp b/src/burn/drv/pre90s/d_1942.cpp index 781b7c0b7..23ab954bc 100644 --- a/src/burn/drv/pre90s/d_1942.cpp +++ b/src/burn/drv/pre90s/d_1942.cpp @@ -965,7 +965,7 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); if (i == 0 || i == 7) { ZetSetVector((i == 0) ? 0xcf : 0xd7); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); @@ -977,9 +977,9 @@ static INT32 DrvFrame() nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; if (i & 1) { // 4 times per frame - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(100); // needs long ack - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); diff --git a/src/burn/drv/pre90s/d_1943.cpp b/src/burn/drv/pre90s/d_1943.cpp index 5ad40bedc..04b0589da 100644 --- a/src/burn/drv/pre90s/d_1943.cpp +++ b/src/burn/drv/pre90s/d_1943.cpp @@ -1598,16 +1598,16 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == 95) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == 96) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 95) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 96) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); // Run Z80 #2 nCurrentCPU = 1; ZetOpen(nCurrentCPU); BurnTimerUpdate(i * (nCyclesTotal[1] / nInterleave)); - if (i == 20 || i == 40 || i == 60 || i == 80) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == 21 || i == 41 || i == 61 || i == 81) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 20 || i == 40 || i == 60 || i == 80) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 21 || i == 41 || i == 61 || i == 81) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_4enraya.cpp b/src/burn/drv/pre90s/d_4enraya.cpp index 43bdebe7a..b97026ce0 100644 --- a/src/burn/drv/pre90s/d_4enraya.cpp +++ b/src/burn/drv/pre90s/d_4enraya.cpp @@ -407,7 +407,7 @@ static INT32 DrvFrame() nCyclesDone += ZetRun(nSegment); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); diff --git a/src/burn/drv/pre90s/d_alinvade.cpp b/src/burn/drv/pre90s/d_alinvade.cpp index e38f1a984..562b5fdbb 100644 --- a/src/burn/drv/pre90s/d_alinvade.cpp +++ b/src/burn/drv/pre90s/d_alinvade.cpp @@ -234,7 +234,7 @@ static INT32 DrvFrame() M6502Open(0); M6502Run(nTotalCycles); - if (irqmask) M6502SetIRQLine(0, M6502_IRQSTATUS_AUTO); + if (irqmask) M6502SetIRQLine(0, CPU_IRQSTATUS_AUTO); M6502Close(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_alpha68k.cpp b/src/burn/drv/pre90s/d_alpha68k.cpp index 6f39a564b..7fe8cd117 100644 --- a/src/burn/drv/pre90s/d_alpha68k.cpp +++ b/src/burn/drv/pre90s/d_alpha68k.cpp @@ -1151,11 +1151,11 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[0] / nInterleave; nCyclesSegment = nNext - nCyclesDone[0]; nCyclesDone[0] += SekRun(nCyclesSegment); - if (i == 125) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); - if (i == 66) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 125) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); + if (i == 66) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); BurnTimerUpdate((i + 1) * (nCyclesTotal[1] / nInterleave)); - if (i == 44 || i == 88) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == 44 || i == 88) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); if (i & 1) ZetNmi(); } diff --git a/src/burn/drv/pre90s/d_ambush.cpp b/src/burn/drv/pre90s/d_ambush.cpp index 3cc3ed22b..6db337634 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_arabian.cpp b/src/burn/drv/pre90s/d_arabian.cpp index 7788f93d8..77324623a 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_armedf.cpp b/src/burn/drv/pre90s/d_armedf.cpp index da3befce2..46bd5c366 100644 --- a/src/burn/drv/pre90s/d_armedf.cpp +++ b/src/burn/drv/pre90s/d_armedf.cpp @@ -450,7 +450,7 @@ void __fastcall cclimbr2_write_word(UINT32 address, UINT16 data) if ((data & 0x4000) && (OldData & 0x4000) == 0) { ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(0); } @@ -1139,9 +1139,9 @@ static INT32 DrvFrame() for (INT32 j = 0; j < 9; j++) { if (i == Z80IRQSlice[j]) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); nCyclesDone[1] += ZetRun(3000); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1164,7 +1164,7 @@ static INT32 DrvFrame() DACUpdate(pBurnSoundOut, nBurnSoundLen); } - SekSetIRQLine(irqline, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(irqline, CPU_IRQSTATUS_AUTO); ZetClose(); SekClose(); diff --git a/src/burn/drv/pre90s/d_atetris.cpp b/src/burn/drv/pre90s/d_atetris.cpp index e8f4c5d60..217424b7d 100644 --- a/src/burn/drv/pre90s/d_atetris.cpp +++ b/src/burn/drv/pre90s/d_atetris.cpp @@ -211,7 +211,7 @@ static void atetris_write(UINT16 address, UINT8 data) return; case 0x3800: - M6502SetIRQLine(0, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(0, CPU_IRQSTATUS_NONE); return; case 0x3c00: @@ -414,7 +414,7 @@ static INT32 DrvFrame() nCyclesDone[0] += M6502Run(nCyclesTotal[0] / nInterleave); if (i == 16 || i == 48 || i == 80 || i == 112 || i == 146 || i == 176 || i == 208 || i == 240) - M6502SetIRQLine(0, (i & 0x20) ? M6502_IRQSTATUS_ACK : M6502_IRQSTATUS_NONE); + M6502SetIRQLine(0, (i & 0x20) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); if (i == 240) vblank = 0x40; } diff --git a/src/burn/drv/pre90s/d_aztarac.cpp b/src/burn/drv/pre90s/d_aztarac.cpp index 341d9b5f4..cd166df87 100644 --- a/src/burn/drv/pre90s/d_aztarac.cpp +++ b/src/burn/drv/pre90s/d_aztarac.cpp @@ -159,7 +159,7 @@ void __fastcall aztarac_write_byte(UINT32 address, UINT8 data) *soundlatch = data; sound_status ^= 0x21; - if (sound_status & 0x20) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (sound_status & 0x20) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); return; } @@ -509,14 +509,14 @@ static INT32 DrvFrame() for (INT32 i = 0; i < nInterleave; i++, sound_irq_timer++) { nCyclesDone[0] += SekRun(nCyclesTotal[0] / nInterleave); - if (i == (nInterleave - 1)) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); //nCyclesDone[1] += ZetRun((SekTotalCycles() / 4) - ZetTotalCycles()); sync_cpu(); if ((sound_irq_timer % 40) == 39) { // every 20000 cycles, 50000 / frame sound_status ^= 0x10; - if (sound_status & 0x10) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (sound_status & 0x10) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/pre90s/d_baraduke.cpp b/src/burn/drv/pre90s/d_baraduke.cpp index 6faddaedc..b8e833b4d 100644 --- a/src/burn/drv/pre90s/d_baraduke.cpp +++ b/src/burn/drv/pre90s/d_baraduke.cpp @@ -204,7 +204,7 @@ void baraduke_main_write(UINT16 address, UINT8 data) return; case 0x8800: - M6809SetIRQLine(0, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0, CPU_IRQSTATUS_NONE); return; case 0xb000: @@ -746,7 +746,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[0] / nInterleave; nCyclesDone[0] += M6809Run(nNext - nCyclesDone[0]); if (i == (nInterleave - 1)) { - M6809SetIRQLine(0, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(0, CPU_IRQSTATUS_ACK); } M6809Close(); @@ -754,7 +754,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[1] / nInterleave; nCyclesDone[1] += HD63701Run(nNext - nCyclesDone[1]); if (i == (nInterleave - 1)) { - HD63701SetIRQLine(0, M6800_IRQSTATUS_AUTO); + HD63701SetIRQLine(0, CPU_IRQSTATUS_AUTO); } // HD63701Close(); } diff --git a/src/burn/drv/pre90s/d_bionicc.cpp b/src/burn/drv/pre90s/d_bionicc.cpp index 7f26a62fa..b2279f69c 100644 --- a/src/burn/drv/pre90s/d_bionicc.cpp +++ b/src/burn/drv/pre90s/d_bionicc.cpp @@ -663,7 +663,7 @@ static INT32 DrvFrame() for (INT32 i = 0; i < nInterleave; i++) { nTotalCycles[0] -= SekRun(nTotalCycles[0] / (nInterleave - i)); - if (i != (nInterleave - 1)) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i != (nInterleave - 1)) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); nTotalCycles[1] -= ZetRun(nTotalCycles[1] / (nInterleave - i)); if ((i & 1) == 1) ZetNmi(); @@ -676,7 +676,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/pre90s/d_blktiger.cpp b/src/burn/drv/pre90s/d_blktiger.cpp index dc0cda76f..4a889268b 100644 --- a/src/burn/drv/pre90s/d_blktiger.cpp +++ b/src/burn/drv/pre90s/d_blktiger.cpp @@ -454,9 +454,9 @@ static INT32 DrvGfxDecode() static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -772,8 +772,8 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == 98) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == 99) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 98) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 99) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); // Run Z80 #2 diff --git a/src/burn/drv/pre90s/d_blockout.cpp b/src/burn/drv/pre90s/d_blockout.cpp index 5066f4a04..9bdfdd2e5 100644 --- a/src/burn/drv/pre90s/d_blockout.cpp +++ b/src/burn/drv/pre90s/d_blockout.cpp @@ -348,9 +348,9 @@ UINT8 __fastcall blockout_sound_read(UINT16 address) void BlockoutYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -562,7 +562,7 @@ static INT32 DrvFrame() nSoundBufferPos += nSegment; } - if (i == (nInterleave / 2)-1) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave / 2)-1) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); } if (pBurnSoundOut) { @@ -574,7 +574,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); ZetClose(); SekClose(); diff --git a/src/burn/drv/pre90s/d_blueprnt.cpp b/src/burn/drv/pre90s/d_blueprnt.cpp index 046616d90..a9ba6e82d 100644 --- a/src/burn/drv/pre90s/d_blueprnt.cpp +++ b/src/burn/drv/pre90s/d_blueprnt.cpp @@ -648,14 +648,14 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == 255) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == 255) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); nSegment = (nTotalCycles[1] - nCyclesDone[1]) / (nInterleave - i); ZetOpen(1); nCyclesDone[1] += ZetRun(nSegment); - if ((i & 0x3f) == 0x3f) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if ((i & 0x3f) == 0x3f) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_capbowl.cpp b/src/burn/drv/pre90s/d_capbowl.cpp index 512a06d5e..a31ccb0d8 100644 --- a/src/burn/drv/pre90s/d_capbowl.cpp +++ b/src/burn/drv/pre90s/d_capbowl.cpp @@ -117,7 +117,7 @@ static void main_write(UINT16 a, UINT8 d) *soundlatch = d; M6809Close(); M6809Open(1); - M6809SetIRQLine(M6809_IRQ_LINE, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(M6809_IRQ_LINE, CPU_IRQSTATUS_AUTO); M6809Close(); M6809Open(0); } @@ -227,12 +227,12 @@ static double DrvGetTime() static void DrvFMIRQCallback(INT32 , INT32 state) { - M6809SetIRQLine(M6809_FIRQ_LINE, state ? M6809_IRQSTATUS_ACK : M6809_IRQSTATUS_NONE); + M6809SetIRQLine(M6809_FIRQ_LINE, state ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static void tms34061_interrupt(INT32 state) { - M6809SetIRQLine(M6809_FIRQ_LINE, state ? M6809_IRQSTATUS_ACK : M6809_IRQSTATUS_NONE); + M6809SetIRQLine(M6809_FIRQ_LINE, state ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static void draw_layer() @@ -488,7 +488,7 @@ static INT32 DrvFrame() M6809Open(0); if (DrvDips[1] & 0x01) { - M6809SetIRQLine(0x20, M6809_IRQSTATUS_AUTO); // NMI + M6809SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); // NMI } M6809Close(); diff --git a/src/burn/drv/pre90s/d_commando.cpp b/src/burn/drv/pre90s/d_commando.cpp index 79e94376f..745513f2a 100644 --- a/src/burn/drv/pre90s/d_commando.cpp +++ b/src/burn/drv/pre90s/d_commando.cpp @@ -570,7 +570,7 @@ UINT8 __fastcall CommandoRead2(UINT16 a) { switch (a) { case 0x6000: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return DrvSoundLatch; } @@ -1026,7 +1026,7 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); if (i == 24) { ZetSetVector(0xd7); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); @@ -1037,7 +1037,7 @@ static INT32 DrvFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 5 || i == 10 || i == 15 || i == 20) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + if (i == 5 || i == 10 || i == 15 || i == 20) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); // Render Sound Segment diff --git a/src/burn/drv/pre90s/d_cybertnk.cpp b/src/burn/drv/pre90s/d_cybertnk.cpp index a487c587d..944bceb4b 100644 --- a/src/burn/drv/pre90s/d_cybertnk.cpp +++ b/src/burn/drv/pre90s/d_cybertnk.cpp @@ -192,7 +192,7 @@ static void __fastcall cybertnk_main_write_byte(UINT32 address, UINT8 data) { case 0x110001: *soundlatch = data; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x110003: // watchdog? @@ -203,7 +203,7 @@ static void __fastcall cybertnk_main_write_byte(UINT32 address, UINT8 data) return; case 0x11000d: - SekSetIRQLine(1, SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, CPU_IRQSTATUS_NONE); return; } } @@ -330,7 +330,7 @@ static UINT8 __fastcall cybertnk_sound_read(UINT16 address) return BurnY8950Read(0, address & 1); case 0xa001: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xc000: @@ -861,12 +861,12 @@ static INT32 DrvFrame() SekOpen(0); nCyclesDone[0] += SekRun(nCyclesTotal[0] / nInterleave); INT32 nCycles = SekTotalCycles(); - if (i == ((nScreenHeight * 100) / 256)) SekSetIRQLine(1, SEK_IRQSTATUS_ACK); + if (i == ((nScreenHeight * 100) / 256)) SekSetIRQLine(1, CPU_IRQSTATUS_ACK); SekClose(); SekOpen(1); nCyclesDone[1] += SekRun(nCycles - SekTotalCycles()); - if (i == ((nScreenHeight * 100) / 256)) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); + if (i == ((nScreenHeight * 100) / 256)) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); SekClose(); BurnTimerUpdateY8950(i * (nCyclesTotal[2] / nInterleave)); diff --git a/src/burn/drv/pre90s/d_ddragon.cpp b/src/burn/drv/pre90s/d_ddragon.cpp index 94505ca47..da284a137 100644 --- a/src/burn/drv/pre90s/d_ddragon.cpp +++ b/src/burn/drv/pre90s/d_ddragon.cpp @@ -1067,19 +1067,19 @@ void DrvDdragonHD6309WriteByte(UINT16 Address, UINT8 Data) } else { if (DrvSubCPUBusy == 0) { if (DrvSubCPUType == DD_CPU_TYPE_HD63701) { - HD63701SetIRQLine(HD63701_INPUT_LINE_NMI, HD63701_IRQSTATUS_ACK); + HD63701SetIRQLine(HD63701_INPUT_LINE_NMI, CPU_IRQSTATUS_ACK); } if (DrvSubCPUType == DD_CPU_TYPE_HD6309) { HD6309Close(); HD6309Open(1); - HD6309SetIRQLine(HD6309_INPUT_LINE_NMI, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(HD6309_INPUT_LINE_NMI, CPU_IRQSTATUS_ACK); HD6309Close(); HD6309Open(0); } if (DrvSubCPUType == DD_CPU_TYPE_M6803) { - M6803SetIRQLine(M6803_INPUT_LINE_NMI, M6803_IRQSTATUS_ACK); + M6803SetIRQLine(M6803_INPUT_LINE_NMI, CPU_IRQSTATUS_ACK); } if (DrvSubCPUType == DD_CPU_TYPE_Z80) { @@ -1114,17 +1114,17 @@ void DrvDdragonHD6309WriteByte(UINT16 Address, UINT8 Data) } case 0x380b: { - HD6309SetIRQLine(HD6309_INPUT_LINE_NMI, HD6309_IRQSTATUS_NONE); + HD6309SetIRQLine(HD6309_INPUT_LINE_NMI, CPU_IRQSTATUS_NONE); return; } case 0x380c: { - HD6309SetIRQLine(HD6309_FIRQ_LINE, HD6309_IRQSTATUS_NONE); + HD6309SetIRQLine(HD6309_FIRQ_LINE, CPU_IRQSTATUS_NONE); return; } case 0x380d: { - HD6309SetIRQLine(HD6309_IRQ_LINE, HD6309_IRQSTATUS_NONE); + HD6309SetIRQLine(HD6309_IRQ_LINE, CPU_IRQSTATUS_NONE); return; } @@ -1132,7 +1132,7 @@ void DrvDdragonHD6309WriteByte(UINT16 Address, UINT8 Data) DrvSoundLatch = Data; if (DrvSoundCPUType == DD_CPU_TYPE_M6809) { M6809Open(0); - M6809SetIRQLine(M6809_IRQ_LINE, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(M6809_IRQ_LINE, CPU_IRQSTATUS_ACK); M6809Close(); } @@ -1175,10 +1175,10 @@ void DrvDdragonHD63701WriteByte(UINT16 Address, UINT8 Data) if (Address == 0x17) { if (Data & 3) { HD6309Open(0); - HD6309SetIRQLine(HD6309_IRQ_LINE, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(HD6309_IRQ_LINE, CPU_IRQSTATUS_ACK); HD6309Close(); - HD63701SetIRQLine(HD63701_INPUT_LINE_NMI, HD63701_IRQSTATUS_NONE); + HD63701SetIRQLine(HD63701_INPUT_LINE_NMI, CPU_IRQSTATUS_NONE); } } return; @@ -1221,11 +1221,11 @@ void DrvDdragonbSubHD6309WriteByte(UINT16 Address, UINT8 Data) HD6309Close(); HD6309Open(0); - HD6309SetIRQLine(HD6309_IRQ_LINE, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(HD6309_IRQ_LINE, CPU_IRQSTATUS_ACK); HD6309Close(); HD6309Open(1); - HD6309SetIRQLine(HD6309_INPUT_LINE_NMI, HD6309_IRQSTATUS_NONE); + HD6309SetIRQLine(HD6309_INPUT_LINE_NMI, CPU_IRQSTATUS_NONE); } } return; @@ -1283,10 +1283,10 @@ void DrvDdragonbaM6803WriteByte(UINT16 Address, UINT8 Data) void DrvDdragonbaM6803WritePort(UINT16, UINT8) { - M6803SetIRQLine(M6803_INPUT_LINE_NMI, M6803_IRQSTATUS_NONE); + M6803SetIRQLine(M6803_INPUT_LINE_NMI, CPU_IRQSTATUS_NONE); HD6309Open(0); - HD6309SetIRQLine(HD6309_IRQ_LINE, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(HD6309_IRQ_LINE, CPU_IRQSTATUS_ACK); HD6309Close(); } @@ -1306,7 +1306,7 @@ void __fastcall Ddragon2SubZ80Write(UINT16 Address, UINT8 Data) case 0xe000: { HD6309Open(0); - HD6309SetIRQLine(HD6309_IRQ_LINE, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(HD6309_IRQ_LINE, CPU_IRQSTATUS_ACK); HD6309Close(); return; } @@ -1321,7 +1321,7 @@ UINT8 DrvDdragonM6809ReadByte(UINT16 Address) { switch (Address) { case 0x1000: { - M6809SetIRQLine(M6809_IRQ_LINE, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(M6809_IRQ_LINE, CPU_IRQSTATUS_NONE); return DrvSoundLatch; } @@ -1482,23 +1482,23 @@ static INT32 Dd2SpritePlaneOffsets[4] = { 0x300000, 0x300004, 0, 4 }; static void DrvYM2151IrqHandler(INT32 Irq) { if (Irq) { - M6809SetIRQLine(M6809_FIRQ_LINE, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(M6809_FIRQ_LINE, CPU_IRQSTATUS_ACK); #if 1 // This fixes music tempo but breaks MSM5205 sound if we use the M6809 for the MSM5205 timing, // because the interleave run count is 190 cycles nCyclesDone[2] += M6809Run(1000); #endif } else { - M6809SetIRQLine(M6809_FIRQ_LINE, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(M6809_FIRQ_LINE, CPU_IRQSTATUS_NONE); } } static void Ddragon2YM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -2495,14 +2495,14 @@ static INT32 DrvFrame() if (i == VBlankSlice) { DrvVBlank = 1; HD6309Open(0); - HD6309SetIRQLine(HD6309_INPUT_LINE_NMI, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(HD6309_INPUT_LINE_NMI, CPU_IRQSTATUS_ACK); HD6309Close(); } for (INT32 j = 0; j < 16; j++) { if (i == FIRQFireSlice[j]) { HD6309Open(0); - HD6309SetIRQLine(HD6309_FIRQ_LINE, HD6309_IRQSTATUS_ACK); + HD6309SetIRQLine(HD6309_FIRQ_LINE, CPU_IRQSTATUS_ACK); HD6309Close(); } } @@ -2612,11 +2612,11 @@ static INT32 DrvScan(INT32 nAction, INT32 *pnMin) if (DrvSubCPUBusy == 0) { if (DrvSubCPUType == DD_CPU_TYPE_HD63701) { - HD63701SetIRQLine(HD63701_INPUT_LINE_NMI, HD63701_IRQSTATUS_ACK); + HD63701SetIRQLine(HD63701_INPUT_LINE_NMI, CPU_IRQSTATUS_ACK); } if (DrvSubCPUType == DD_CPU_TYPE_M6803) { - M6803SetIRQLine(M6803_INPUT_LINE_NMI, M6803_IRQSTATUS_ACK); + M6803SetIRQLine(M6803_INPUT_LINE_NMI, CPU_IRQSTATUS_ACK); } } } diff --git a/src/burn/drv/pre90s/d_djboy.cpp b/src/burn/drv/pre90s/d_djboy.cpp index 6a93c74fd..b8cb0371d 100644 --- a/src/burn/drv/pre90s/d_djboy.cpp +++ b/src/burn/drv/pre90s/d_djboy.cpp @@ -1060,20 +1060,20 @@ static INT32 DrvFrame() if (i == 64*4 || i == 240*4) { if (i == 64*4) ZetSetVector(0xff); if (i == 240*4) ZetSetVector(0xfd); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } nSegment = ZetTotalCycles(); ZetClose(); ZetOpen(1); nCyclesDone[1] += ZetRun(nSegment - ZetTotalCycles()); - if (i == 1023) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == 1023) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); nSegment = ZetTotalCycles(); ZetClose(); ZetOpen(2); BurnTimerUpdate(nSegment /*sync with sub cpu*/); - if (i == 1023) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == 1023) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_dkong.cpp b/src/burn/drv/pre90s/d_dkong.cpp index 6949ae6c0..b01afbdd1 100644 --- a/src/burn/drv/pre90s/d_dkong.cpp +++ b/src/burn/drv/pre90s/d_dkong.cpp @@ -1920,7 +1920,7 @@ static INT32 Dkong3Frame() M6502Idle(1789773 / 60 / nInterleave); } else { M6502Run(1789773 / 60 / nInterleave); - if (i == (nInterleave - 10)) M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + if (i == (nInterleave - 10)) M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); } M6502Close(); @@ -1930,7 +1930,7 @@ static INT32 Dkong3Frame() M6502Idle(1789773 / 60 / nInterleave); } else { M6502Run(1789773 / 60 / nInterleave); - if (i == (nInterleave - 10)) M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + if (i == (nInterleave - 10)) M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); } M6502Close(); } @@ -1979,9 +1979,9 @@ static INT32 s2650DkongFrame() if (i == 30) { vblank = 0x80; - s2650SetIRQLine(0, S2650_IRQSTATUS_ACK); + s2650SetIRQLine(0, CPU_IRQSTATUS_ACK); s2650Run(10); - s2650SetIRQLine(0, S2650_IRQSTATUS_NONE); + s2650SetIRQLine(0, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/pre90s/d_dynduke.cpp b/src/burn/drv/pre90s/d_dynduke.cpp index 6471d7dec..23a4ba266 100644 --- a/src/burn/drv/pre90s/d_dynduke.cpp +++ b/src/burn/drv/pre90s/d_dynduke.cpp @@ -714,13 +714,13 @@ static INT32 DrvFrame() VezOpen(0); nCyclesDone[0] += VezRun(nSegment); - if (i == (nInterleave-1)) VezSetIRQLineAndVector(0, 0xc8/4, VEZ_IRQSTATUS_ACK); + if (i == (nInterleave-1)) VezSetIRQLineAndVector(0, 0xc8/4, CPU_IRQSTATUS_ACK); VezClose(); VezOpen(1); nCyclesDone[1] += VezRun(nSegment); - if (i == (nInterleave-1)) VezSetIRQLineAndVector(0, 0xc8/4, VEZ_IRQSTATUS_ACK); + if (i == (nInterleave-1)) VezSetIRQLineAndVector(0, 0xc8/4, CPU_IRQSTATUS_ACK); VezClose(); nSegment = nCyclesTotal[2] / nInterleave; diff --git a/src/burn/drv/pre90s/d_epos.cpp b/src/burn/drv/pre90s/d_epos.cpp index 3b54f0d9e..b3beb68e0 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_exedexes.cpp b/src/burn/drv/pre90s/d_exedexes.cpp index 7264b6232..beaefb6db 100644 --- a/src/burn/drv/pre90s/d_exedexes.cpp +++ b/src/burn/drv/pre90s/d_exedexes.cpp @@ -619,15 +619,15 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += nCyclesSegment; if (i == 0) { ZetSetVector(0xcf); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); nCyclesDone[nCurrentCPU] += ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } if (i == ( nInterleave - 2)) { ZetSetVector(0xd7); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); nCyclesDone[nCurrentCPU] += ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); @@ -638,9 +638,9 @@ static INT32 DrvFrame() nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; if ((i & 3) == 3) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); nCyclesDone[nCurrentCPU] += ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); } diff --git a/src/burn/drv/pre90s/d_funkybee.cpp b/src/burn/drv/pre90s/d_funkybee.cpp index 949dddf30..0be14709d 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_galaga.cpp b/src/burn/drv/pre90s/d_galaga.cpp index 93a0b59d9..a3994b093 100644 --- a/src/burn/drv/pre90s/d_galaga.cpp +++ b/src/burn/drv/pre90s/d_galaga.cpp @@ -1475,7 +1475,7 @@ static INT32 DrvFrame() nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; if (i == (nInterleave - 1) && DrvCPU1FireIRQ) { - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } if ((i == 0 || i == (nInterleave / 3) || i == (nInterleave / 3 * 2)) && IOChipCPU1FireIRQ) { ZetNmi(); @@ -1490,7 +1490,7 @@ static INT32 DrvFrame() nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; if (i == (nInterleave - 1) && DrvCPU2FireIRQ) { - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); } diff --git a/src/burn/drv/pre90s/d_gauntlet.cpp b/src/burn/drv/pre90s/d_gauntlet.cpp index 52bbbbaa5..f76ea5808 100644 --- a/src/burn/drv/pre90s/d_gauntlet.cpp +++ b/src/burn/drv/pre90s/d_gauntlet.cpp @@ -1684,7 +1684,7 @@ UINT8 __fastcall Gauntlet68KReadByte(UINT32 a) case 0x80300f: { DrvSoundtoCPUReady = 0; - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); return DrvSoundtoCPU; } @@ -1743,7 +1743,7 @@ UINT16 __fastcall Gauntlet68KReadWord(UINT32 a) case 0x80300e: { DrvSoundtoCPUReady = 0; - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); return 0xff00 | DrvSoundtoCPU; } @@ -1798,7 +1798,7 @@ void __fastcall Gauntlet68KWriteWord(UINT32 a, UINT16 d) DrvCPUtoSoundReady = 1; M6502Open(0); nCyclesDone[1] += M6502Run(100); - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); nCyclesDone[1] += M6502Run(100); M6502Close(); return; @@ -1903,10 +1903,10 @@ void GauntletSoundWrite(UINT16 Address, UINT8 Data) DrvSoundtoCPUReady = 1; if (SekGetActive() == -1) { SekOpen(0); - SekSetIRQLine(6, SEK_IRQSTATUS_ACK); + SekSetIRQLine(6, CPU_IRQSTATUS_ACK); SekClose(); } else { - SekSetIRQLine(6, SEK_IRQSTATUS_ACK); + SekSetIRQLine(6, CPU_IRQSTATUS_ACK); } return; } @@ -1957,7 +1957,7 @@ void GauntletSoundWrite(UINT16 Address, UINT8 Data) } case 0x1830: { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_NONE); return; } @@ -2514,7 +2514,7 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); if (i == 11) DrvVBlank = 0; if (i == 250) DrvVBlank = 1; - if (i == 261) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == 261) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); if (i == NextScanline) { @@ -2534,7 +2534,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += M6502Run(nCyclesSegment); - if (i == 64 || i == 128 || i == 192 || i == 256) M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_ACK); + if (i == 64 || i == 128 || i == 192 || i == 256) M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_ACK); M6502Close(); } diff --git a/src/burn/drv/pre90s/d_ginganin.cpp b/src/burn/drv/pre90s/d_ginganin.cpp index 01edd6f6d..fc21ce903 100644 --- a/src/burn/drv/pre90s/d_ginganin.cpp +++ b/src/burn/drv/pre90s/d_ginganin.cpp @@ -160,7 +160,7 @@ void __fastcall ginganin_write_word(UINT32 address, UINT16 data) case 0x06000e: *soundlatch = data & 0xff; - M6809SetIRQLine(0x20, M6809_IRQSTATUS_AUTO); // nmi + M6809SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); // nmi return; } } @@ -577,7 +577,7 @@ static void sound_interrupt() if (MC6840_flag) { if (MC6840_ctr > MC6840_tempo) { MC6840_ctr = 0; - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); } else { MC6840_ctr++; } @@ -613,7 +613,7 @@ static INT32 DrvFrame() nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(nSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); nSegment = nCyclesTotal[1] / nInterleave; BurnTimerUpdateY8950(i * (nCyclesTotal[1] / nInterleave)); diff --git a/src/burn/drv/pre90s/d_gng.cpp b/src/burn/drv/pre90s/d_gng.cpp index a26b3fd97..5de8ac69b 100644 --- a/src/burn/drv/pre90s/d_gng.cpp +++ b/src/burn/drv/pre90s/d_gng.cpp @@ -1370,7 +1370,7 @@ static INT32 DrvFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += M6809Run(nCyclesSegment); if (i == 24) { - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); } M6809Close(); @@ -1378,8 +1378,8 @@ static INT32 DrvFrame() nCurrentCPU = 1; ZetOpen(0); BurnTimerUpdate(i * (nCyclesTotal[1] / nInterleave)); - if (i == 5 || i == 10 || i == 15 || i == 20) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == 6 || i == 11 || i == 16 || i == 21) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 5 || i == 10 || i == 15 || i == 20) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 6 || i == 11 || i == 16 || i == 21) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); // Render Sound Segment diff --git a/src/burn/drv/pre90s/d_gunsmoke.cpp b/src/burn/drv/pre90s/d_gunsmoke.cpp index ed84900b6..ada1266f6 100644 --- a/src/burn/drv/pre90s/d_gunsmoke.cpp +++ b/src/burn/drv/pre90s/d_gunsmoke.cpp @@ -681,8 +681,8 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == 274) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == 276) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 274) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 276) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); // Run Z80 #1 @@ -693,9 +693,9 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); BurnTimerUpdate(i * (nCyclesTotal[1] / nInterleave)); // execute IRQ quarterly 68.5 (or 69) is 25% of 278 (nInterleave) - if (i%69 == 0 && i>0) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - // execute ZET_IRQSTATUS_NONE 1 interleave past the last one - if ((i-1)%69 == 0 && i>1) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i%69 == 0 && i>0) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + // execute CPU_IRQSTATUS_NONE 1 interleave past the last one + if ((i-1)%69 == 0 && i>1) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_higemaru.cpp b/src/burn/drv/pre90s/d_higemaru.cpp index fae23ba16..ea3b9f635 100644 --- a/src/burn/drv/pre90s/d_higemaru.cpp +++ b/src/burn/drv/pre90s/d_higemaru.cpp @@ -433,13 +433,11 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(33333); -// ZetRaiseIrq(0xd7); ZetSetVector(0xd7); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetRun(33334); -// ZetRaiseIrq(0xcf); ZetSetVector(0xcf); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_ikki.cpp b/src/burn/drv/pre90s/d_ikki.cpp index 1a91f1211..c43101d4e 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; - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } if (i == 239) { - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); vblank = 1; } ZetClose(); @@ -532,8 +532,8 @@ static INT32 DrvFrame() ZetOpen(1); nCyclesDone[1] += ZetRun(nCycleSegment); - if (i == 15) ZetRaiseIrq(0); - if (i == 239)ZetRaiseIrq(0); + if (i == 15) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == 239) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_invaders.cpp b/src/burn/drv/pre90s/d_invaders.cpp index 187be22b3..252d5f66e 100644 --- a/src/burn/drv/pre90s/d_invaders.cpp +++ b/src/burn/drv/pre90s/d_invaders.cpp @@ -355,11 +355,11 @@ static INT32 DrvFrame() nCyclesDone[0] += ZetRun(nSegment); if (i == 96) { ZetSetVector(0xd7); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } if (i == 224) { ZetSetVector(0xcf); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/pre90s/d_jack.cpp b/src/burn/drv/pre90s/d_jack.cpp index 4837ffab9..1dd7368a2 100644 --- a/src/burn/drv/pre90s/d_jack.cpp +++ b/src/burn/drv/pre90s/d_jack.cpp @@ -713,7 +713,7 @@ static UINT8 timer_r(UINT32) static UINT8 soundlatch_r(UINT32) { - //ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + //ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch; } @@ -857,9 +857,9 @@ void __fastcall jack_cpu0_write(UINT16 address, UINT8 data) soundlatch = data; ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); ZetOpen(0); break; @@ -1279,9 +1279,9 @@ static INT32 DrvFrame() //if (joinem) //if (i == (nInterleave / 3) || i == ((nInterleave / 3) * 2)) if (joinem && (i % 249) == 0) - ZetRaiseIrq(0); // game speed (joinem, uncle poo) + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); // game speed (joinem, uncle poo) - if (tri_fix && i == (nInterleave / 2)) ZetRaiseIrq(0); + if (tri_fix && i == (nInterleave / 2)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); if (i == (nInterleave - 1)) // vblank { @@ -1292,7 +1292,7 @@ static INT32 DrvFrame() ZetNmi(); } else { // other - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/pre90s/d_kangaroo.cpp b/src/burn/drv/pre90s/d_kangaroo.cpp index d258a293f..e42112b5a 100644 --- a/src/burn/drv/pre90s/d_kangaroo.cpp +++ b/src/burn/drv/pre90s/d_kangaroo.cpp @@ -564,7 +564,7 @@ INT32 DrvFrame() nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; if (i == (nInterleave - 1)) { - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); @@ -575,19 +575,19 @@ INT32 DrvFrame() nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; if (i == (nInterleave - 1)) { - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); /* ZetOpen(0); nCyclesDone[0] -= ZetRun(nCyclesDone[0] / (nInterleave - i)); - if (i == (nInterleave - 1)) ZetRaiseIrq(0); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); // Run Z80 #1 ZetOpen(1); nCyclesDone[1] -= ZetRun(nCyclesDone[1] / (nInterleave - i)); - if (i == (nInterleave - 1)) ZetRaiseIrq(0); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose();*/ // Render Sound Segment diff --git a/src/burn/drv/pre90s/d_kncljoe.cpp b/src/burn/drv/pre90s/d_kncljoe.cpp index 169d92e5e..f5b6275b3 100644 --- a/src/burn/drv/pre90s/d_kncljoe.cpp +++ b/src/burn/drv/pre90s/d_kncljoe.cpp @@ -145,7 +145,7 @@ static void __fastcall kncljoe_main_write(UINT16 address, UINT8 data) case 0xd800: if (data & 0x80) { - M6803SetIRQLine(0, M6803_IRQSTATUS_ACK); + M6803SetIRQLine(0, CPU_IRQSTATUS_ACK); } else { *soundlatch = data; } @@ -235,7 +235,7 @@ static void kncljoe_sound_write(UINT16 address, UINT8 data) } if ((address & 0x7000) == 0x1000) { - M6803SetIRQLine(0, M6803_IRQSTATUS_NONE); + M6803SetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -635,11 +635,11 @@ static INT32 DrvFrame() nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += ZetRun(nSegment); - if (i == 60) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == 60) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); nSegment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += M6803Run(nSegment); - M6803SetIRQLine(M6803_INPUT_LINE_NMI, M6803_IRQSTATUS_AUTO); + M6803SetIRQLine(M6803_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); } // M6803Close(); diff --git a/src/burn/drv/pre90s/d_kyugo.cpp b/src/burn/drv/pre90s/d_kyugo.cpp index a82a0d88a..d8e8fb112 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) ZetRaiseIrq(0); + if (i == 2 || i == 4 || i == 6 || i == 8) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_ladybug.cpp b/src/burn/drv/pre90s/d_ladybug.cpp index 3ae3947e7..d652f4cbe 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)) ZetRaiseIrq(0); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); ZetRun(nTotalCycles[1] / nInterleave); - if (i == (nInterleave - 1)) ZetRaiseIrq(0); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_lastduel.cpp b/src/burn/drv/pre90s/d_lastduel.cpp index 741d2fa5c..25d9e4c1f 100644 --- a/src/burn/drv/pre90s/d_lastduel.cpp +++ b/src/burn/drv/pre90s/d_lastduel.cpp @@ -867,9 +867,9 @@ void __fastcall LastduelZ80Write(UINT16 a, UINT8 d) inline static void DrvYM2203IRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1728,7 +1728,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 33 || i == 66) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + if (i == 33 || i == 66) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); SekClose(); ZetOpen(0); @@ -1744,7 +1744,7 @@ static INT32 DrvFrame() if (pBurnDraw) DrvDraw(); SekOpen(0); - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); memcpy(DrvSpriteRamBuffer, DrvSpriteRam, 0x800); @@ -1776,7 +1776,7 @@ static INT32 LastduelFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 33 || i == 66) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == 33 || i == 66) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); ZetOpen(0); @@ -1792,7 +1792,7 @@ static INT32 LastduelFrame() if (pBurnDraw) LastduelDraw(); SekOpen(0); - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); SekClose(); memcpy(DrvSpriteRamBuffer, DrvSpriteRam, 0x800); diff --git a/src/burn/drv/pre90s/d_lwings.cpp b/src/burn/drv/pre90s/d_lwings.cpp index 6c07fc266..3ade0d2ed 100644 --- a/src/burn/drv/pre90s/d_lwings.cpp +++ b/src/burn/drv/pre90s/d_lwings.cpp @@ -1507,7 +1507,7 @@ static INT32 DrvFrame() ZetNmi(); } else { ZetSetVector(0xd7); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } } if (MSM5205InUse) MSM5205Update(); @@ -1517,9 +1517,9 @@ static INT32 DrvFrame() ZetOpen(nCurrentCPU); BurnTimerUpdate((i + 1) * (nCyclesTotal[nCurrentCPU] / nInterleave)); if ((i % (nInterleave / 4)) == ((nInterleave / 4) - 1)) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(500); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); @@ -1531,7 +1531,7 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); for (INT32 j = 0; j < 133; j++) { if (i == MSMIRQSlice[j]) { - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); nCyclesDone[nCurrentCPU] += ZetRun(1000); } } diff --git a/src/burn/drv/pre90s/d_mario.cpp b/src/burn/drv/pre90s/d_mario.cpp index 34ddd3e2f..164c3858b 100644 --- a/src/burn/drv/pre90s/d_mario.cpp +++ b/src/burn/drv/pre90s/d_mario.cpp @@ -212,7 +212,7 @@ static void __fastcall mario_main_write(unsigned short address, UINT8 data) ZetClose(); // masao ZetOpen(1); ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -312,7 +312,7 @@ static UINT8 __fastcall masao_sound_read(UINT16 address) static UINT8 masao_ay8910_read_port_A(UINT32) { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } diff --git a/src/burn/drv/pre90s/d_markham.cpp b/src/burn/drv/pre90s/d_markham.cpp index 91cd8b0a1..de770eb29 100644 --- a/src/burn/drv/pre90s/d_markham.cpp +++ b/src/burn/drv/pre90s/d_markham.cpp @@ -443,12 +443,12 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); nCyclesDone[1] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_meijinsn.cpp b/src/burn/drv/pre90s/d_meijinsn.cpp index d046bb86c..ea45e7af7 100644 --- a/src/burn/drv/pre90s/d_meijinsn.cpp +++ b/src/burn/drv/pre90s/d_meijinsn.cpp @@ -449,14 +449,14 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[0] / nInterleave; nCyclesSegment = nNext - nCyclesDone[0]; nCyclesDone[0] += SekRun(nCyclesSegment); - if (i == 0) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); - if (i == 159) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == 0) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); + if (i == 159) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); nNext = (i + 1) * nCyclesTotal[1] / nInterleave; nCyclesSegment = nNext - nCyclesDone[1]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[1] += nCyclesSegment; - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); diff --git a/src/burn/drv/pre90s/d_mitchell.cpp b/src/burn/drv/pre90s/d_mitchell.cpp index da8194c73..51e5da99d 100644 --- a/src/burn/drv/pre90s/d_mitchell.cpp +++ b/src/burn/drv/pre90s/d_mitchell.cpp @@ -1500,7 +1500,7 @@ void __fastcall MstworldZ80PortWrite(UINT16 a, UINT8 d) DrvSoundLatch = d; ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); } @@ -1536,7 +1536,7 @@ UINT8 __fastcall MstworldSoundZ80Read(UINT16 a) } case 0xa000: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return DrvSoundLatch; } @@ -2889,11 +2889,11 @@ static INT32 DrvFrame() nCyclesSegment = nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); if (i == 0 || i == 237) { // Needs to be ACK'd for one full scanline twice per frame. -dink - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); DrvInput5Toggle = (i == 237); } if (i == 1 || i == 238) { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); @@ -2945,9 +2945,9 @@ static INT32 MstworldFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); if (i == 9) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); nCyclesDone[nCurrentCPU] += ZetRun(500); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); diff --git a/src/burn/drv/pre90s/d_mole.cpp b/src/burn/drv/pre90s/d_mole.cpp index 6f52922e0..e0414aebf 100644 --- a/src/burn/drv/pre90s/d_mole.cpp +++ b/src/burn/drv/pre90s/d_mole.cpp @@ -393,7 +393,7 @@ static INT32 DrvFrame() M6502Open(0); M6502Run(4000000 / 60); - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_AUTO); M6502Close(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_momoko.cpp b/src/burn/drv/pre90s/d_momoko.cpp index 7f0a7e289..a5bce525d 100644 --- a/src/burn/drv/pre90s/d_momoko.cpp +++ b/src/burn/drv/pre90s/d_momoko.cpp @@ -697,7 +697,7 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nCycleSegment); - if (i == 66) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == 66) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); nCycleSegment = nCyclesTotal[1] / nInterleave; diff --git a/src/burn/drv/pre90s/d_mrdo.cpp b/src/burn/drv/pre90s/d_mrdo.cpp index 7c696251a..81f33f832 100644 --- a/src/burn/drv/pre90s/d_mrdo.cpp +++ b/src/burn/drv/pre90s/d_mrdo.cpp @@ -481,7 +481,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(4000000 / 60); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnDraw) { diff --git a/src/burn/drv/pre90s/d_mrflea.cpp b/src/burn/drv/pre90s/d_mrflea.cpp index 9a9ecff38..77c170bc0 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); 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)) ZetRaiseIrq(0); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); 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)) ZetRaiseIrq(0); + if ((mrflea_status&0x08) || i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); // Render Sound Segment diff --git a/src/burn/drv/pre90s/d_mustache.cpp b/src/burn/drv/pre90s/d_mustache.cpp index 5c85d4d60..8130db909 100644 --- a/src/burn/drv/pre90s/d_mustache.cpp +++ b/src/burn/drv/pre90s/d_mustache.cpp @@ -548,12 +548,12 @@ static INT32 DrvFrame() if (i == 0) { ZetSetVector(0x08); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } if (i == 12) { ZetSetVector(0x10); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); diff --git a/src/burn/drv/pre90s/d_mystston.cpp b/src/burn/drv/pre90s/d_mystston.cpp index b6cd0cdd3..fe0fe712d 100644 --- a/src/burn/drv/pre90s/d_mystston.cpp +++ b/src/burn/drv/pre90s/d_mystston.cpp @@ -158,7 +158,7 @@ void mystston_write(UINT16 address, UINT8 data) return; case 0x2010: - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_NONE); break; case 0x2020: @@ -496,7 +496,7 @@ static void mystston_interrupt_handler(INT32 scanline) if (coin == 0) { coin = 1; - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); return; } } @@ -504,7 +504,7 @@ static void mystston_interrupt_handler(INT32 scanline) if (scanline == 8) vblank = 0; if (scanline == 248) vblank = 0x80; - if ((scanline & 0x0f) == 0) M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_ACK); + if ((scanline & 0x0f) == 0) M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_ACK); } static INT32 DrvFrame() diff --git a/src/burn/drv/pre90s/d_ninjakd2.cpp b/src/burn/drv/pre90s/d_ninjakd2.cpp index 221b79825..a121f9516 100644 --- a/src/burn/drv/pre90s/d_ninjakd2.cpp +++ b/src/burn/drv/pre90s/d_ninjakd2.cpp @@ -1053,7 +1053,7 @@ static void __fastcall ninjakd2_sound_write_port(UINT16 port, UINT8 data) inline static void DrvYM2203IRQHandler(INT32, INT32 nStatus) { - ZetSetIRQLine(0, (nStatus) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (nStatus) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } inline static INT32 DrvSynchroniseStream(INT32 nSoundRate) @@ -1938,7 +1938,7 @@ static INT32 DrvFrame() if (i == (nInterleave-1)) { ZetSetVector(0xd7); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); diff --git a/src/burn/drv/pre90s/d_pac2650.cpp b/src/burn/drv/pre90s/d_pac2650.cpp index a0d15eda6..45351c00c 100644 --- a/src/burn/drv/pre90s/d_pac2650.cpp +++ b/src/burn/drv/pre90s/d_pac2650.cpp @@ -479,14 +479,14 @@ static INT32 DrvFrame() for (INT32 i = 0; i < 32; i++) { if (i == 31) { vblank = 1; - s2650SetIRQLine(0x03, S2650_IRQSTATUS_ACK); + s2650SetIRQLine(0x03, CPU_IRQSTATUS_ACK); } INT32 nSegment = (1536000 / 60) / 32; s2650Run(nSegment); if (i == 31) { - s2650SetIRQLine(0x03, S2650_IRQSTATUS_NONE); + s2650SetIRQLine(0x03, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/pre90s/d_pacland.cpp b/src/burn/drv/pre90s/d_pacland.cpp index a8ca0ead2..d3d917806 100644 --- a/src/burn/drv/pre90s/d_pacland.cpp +++ b/src/burn/drv/pre90s/d_pacland.cpp @@ -155,7 +155,7 @@ static void pacland_main_write(UINT16 address, UINT8 data) if ((address & 0xf000) == 0x7000) { INT32 bit = ~address & (1 << 11); interrupt_enable[0] = bit ? 1 : 0; - if (!bit) M6809SetIRQLine(0, M6809_IRQSTATUS_NONE); + if (!bit) M6809SetIRQLine(0, CPU_IRQSTATUS_NONE); return; } @@ -235,7 +235,7 @@ static void pacland_mcu_write(UINT16 address, UINT8 data) if ((address & 0xc000) == 0x4000) { INT32 bit = (~address >> 13) & 1; interrupt_enable[1] = bit; - if (!bit) HD63701SetIRQLine(0, HD63701_IRQSTATUS_NONE); + if (!bit) HD63701SetIRQLine(0, CPU_IRQSTATUS_NONE); return; } } @@ -773,14 +773,14 @@ static INT32 DrvFrame() INT32 nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += M6809Run(nSegment); - if (i == (nInterleave - 1) && interrupt_enable[0]) M6809SetIRQLine(0, M6809_IRQSTATUS_ACK); + if (i == (nInterleave - 1) && interrupt_enable[0]) M6809SetIRQLine(0, CPU_IRQSTATUS_ACK); nSegment = nCyclesTotal[1] / nInterleave; if (mcu_reset) { nCyclesDone[1] += nSegment; } else { nCyclesDone[1] += HD63701Run(nSegment); - if (i == (nInterleave - 1) && interrupt_enable[1]) HD63701SetIRQLine(0, HD63701_IRQSTATUS_ACK); + if (i == (nInterleave - 1) && interrupt_enable[1]) HD63701SetIRQLine(0, CPU_IRQSTATUS_ACK); } if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_pacman.cpp b/src/burn/drv/pre90s/d_pacman.cpp index 554309c76..fbbadaa57 100644 --- a/src/burn/drv/pre90s/d_pacman.cpp +++ b/src/burn/drv/pre90s/d_pacman.cpp @@ -1792,7 +1792,7 @@ void __fastcall pacman_write(UINT16 a, UINT8 d) case ALIBABA: { if (a == 0x50c2) { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); interrupt_mask = d; return; } @@ -1958,7 +1958,7 @@ void __fastcall pacman_out_port(UINT16 a, UINT8 d) { interrupt_mode = d; ZetSetVector(d); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -2702,7 +2702,7 @@ static INT32 DrvFrame() if (game_select == BIGBUCKS) { INT32 nInterleaveIRQFire = nBurnSoundLen / 20; for (INT32 j = 0; j < 20; j++) { - if (i == (nInterleaveIRQFire * j) - 1) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleaveIRQFire * j) - 1) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } } else { if (game_select == DREMSHPR || game_select == VANVAN) { @@ -2710,7 +2710,7 @@ static INT32 DrvFrame() } else { if (i == (nInterleave - 1) && interrupt_mask) { ZetSetVector(interrupt_mode); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } } } diff --git a/src/burn/drv/pre90s/d_pkunwar.cpp b/src/burn/drv/pre90s/d_pkunwar.cpp index 0cfe17345..5b4d5bfd9 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_prehisle.cpp b/src/burn/drv/pre90s/d_prehisle.cpp index 828fa0ca2..3b5c7019d 100644 --- a/src/burn/drv/pre90s/d_prehisle.cpp +++ b/src/burn/drv/pre90s/d_prehisle.cpp @@ -271,9 +271,9 @@ INT32 PrehisleDoReset() static void prehisleFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -795,7 +795,7 @@ INT32 PrehisleFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } BurnTimerEndFrameYM3812(nCyclesTotal[1]); diff --git a/src/burn/drv/pre90s/d_psychic5.cpp b/src/burn/drv/pre90s/d_psychic5.cpp index f59c2f676..cb8cc966c 100644 --- a/src/burn/drv/pre90s/d_psychic5.cpp +++ b/src/burn/drv/pre90s/d_psychic5.cpp @@ -489,9 +489,9 @@ static INT32 SpriteYOffsets[16] = { 0, 32, 64, 96, 128, 160, 192, 224, 256, inline static void DrvYM2203IRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1086,11 +1086,11 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); if (i == 0) { ZetSetVector(0xd7); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } if (i == 240) { ZetSetVector(0xcf); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); diff --git a/src/burn/drv/pre90s/d_punchout.cpp b/src/burn/drv/pre90s/d_punchout.cpp index 61327fdd8..e7ee87b77 100644 --- a/src/burn/drv/pre90s/d_punchout.cpp +++ b/src/burn/drv/pre90s/d_punchout.cpp @@ -1083,7 +1083,7 @@ static INT32 DrvFrame() if (*interrupt_enable) ZetNmi(); - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); nesapuUpdate(0, pBurnSoundOut, nBurnSoundLen); vlm5030Update(0, pBurnSoundOut, nBurnSoundLen); diff --git a/src/burn/drv/pre90s/d_quizo.cpp b/src/burn/drv/pre90s/d_quizo.cpp index 72dacba26..5cb8c2012 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); - ZetRaiseIrq(1); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_rallyx.cpp b/src/burn/drv/pre90s/d_rallyx.cpp index 2b6b31f28..108d678bc 100644 --- a/src/burn/drv/pre90s/d_rallyx.cpp +++ b/src/burn/drv/pre90s/d_rallyx.cpp @@ -505,7 +505,7 @@ void __fastcall RallyxZ80ProgWrite(UINT16 a, UINT8 d) case 0xa181: { DrvCPUFireIRQ = d & 0x01; - if (!DrvCPUFireIRQ) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (!DrvCPUFireIRQ) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return; } @@ -565,7 +565,7 @@ void __fastcall RallyxZ80PortWrite(UINT16 a, UINT8 d) switch (a) { case 0x00: { DrvCPUIRQVector = d; - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return; } @@ -1403,7 +1403,7 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += nCyclesSegment; if (i == (nInterleave - 1) && DrvCPUFireIRQ) { ZetSetVector(DrvCPUIRQVector); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } ZetClose(); diff --git a/src/burn/drv/pre90s/d_renegade.cpp b/src/burn/drv/pre90s/d_renegade.cpp index a1a218007..c3610428b 100644 --- a/src/burn/drv/pre90s/d_renegade.cpp +++ b/src/burn/drv/pre90s/d_renegade.cpp @@ -651,7 +651,7 @@ void RenegadeWriteByte(UINT16 Address, UINT8 Data) case 0x3802: { DrvSoundLatch = Data; M6809Open(0); - M6809SetIRQLine(M6809_IRQ_LINE, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(M6809_IRQ_LINE, CPU_IRQSTATUS_AUTO); M6809Close(); return; } @@ -839,9 +839,9 @@ static INT32 TileYOffsets[16] = { 0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - M6809SetIRQLine(M6809_FIRQ_LINE, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(M6809_FIRQ_LINE, CPU_IRQSTATUS_ACK); } else { - M6809SetIRQLine(M6809_FIRQ_LINE, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(M6809_FIRQ_LINE, CPU_IRQSTATUS_NONE); } } @@ -860,7 +860,7 @@ static void DrvMSM5205Int() if (DrvADPCMPos >= DrvADPCMEnd) { MSM5205ResetWrite(0, 1); DrvADPCMPlaying = false; - M6809SetIRQLine(0x20, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0x20, CPU_IRQSTATUS_AUTO); } else { UINT8 const data = DrvADPCMRom[DrvADPCMPos / 2]; MSM5205DataWrite(0, DrvADPCMPos & 1 ? data & 0xf : data >> 4); @@ -1224,9 +1224,9 @@ static void DrvInterrupt() static INT32 Count; Count = !Count; if (Count) { - M6502SetIRQLine(M6502_INPUT_LINE_NMI, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_INPUT_LINE_NMI, CPU_IRQSTATUS_AUTO); } else { - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_AUTO); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/pre90s/d_route16.cpp b/src/burn/drv/pre90s/d_route16.cpp index 956391cbc..cbd255bd6 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) ZetRaiseIrq(1); + if (i+1 == nInterleave) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); // Run Z80 #1 @@ -610,7 +610,7 @@ static INT32 DrvFrame() if (draw_type == 3) { // space echo for (INT32 j = 0; j < 48; j++) { if (i == DACIRQFireSlice[j]) { - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } } } diff --git a/src/burn/drv/pre90s/d_rpunch.cpp b/src/burn/drv/pre90s/d_rpunch.cpp index 3296007d4..709fc9d7c 100644 --- a/src/burn/drv/pre90s/d_rpunch.cpp +++ b/src/burn/drv/pre90s/d_rpunch.cpp @@ -337,7 +337,7 @@ void __fastcall rpunch_main_write_byte(UINT32 address, UINT8 data) case 0x0c000f: *soundlatch = data; *sound_busy = 1; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; case 0x0c0029: @@ -429,7 +429,7 @@ UINT8 __fastcall rpunch_sound_read(UINT16 address) case 0xf200: *sound_busy = 0; - ZetSetIRQLine(0, (*sound_irq) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (*sound_irq) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -440,7 +440,7 @@ static void DrvYM2151IrqHandler(INT32 irq) { *sound_irq = irq; - ZetSetIRQLine(0, (*sound_irq | *sound_busy) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (*sound_irq | *sound_busy) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static INT32 DrvDoReset() @@ -765,7 +765,7 @@ static INT32 DrvFrame() nSegment = (nCyclesTotal[0] - nCyclesDone[0]) / (nInterleave - i); nCyclesDone[0] += SekRun(nSegment); - if (crtc_timer == 2 && i == ((nInterleave / 2) - 1)) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (crtc_timer == 2 && i == ((nInterleave / 2) - 1)) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); nSegment = (nCyclesTotal[1] - nCyclesDone[1]) / (nInterleave - i); nCyclesDone[1] += ZetRun(nSegment); @@ -780,7 +780,7 @@ static INT32 DrvFrame() } } - if (crtc_timer) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (crtc_timer) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { nSegment = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/pre90s/d_scregg.cpp b/src/burn/drv/pre90s/d_scregg.cpp index be73b195d..bd4602744 100644 --- a/src/burn/drv/pre90s/d_scregg.cpp +++ b/src/burn/drv/pre90s/d_scregg.cpp @@ -168,7 +168,7 @@ void eggs_write(UINT16 address, UINT8 data) break; case 0x2001: - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_NONE); break; case 0x2004: @@ -214,7 +214,7 @@ static void dommy_write(UINT16 address, UINT8 data) switch (address) { case 0x4000: - M6502SetIRQLine(M6502_IRQ_LINE, M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_IRQ_LINE, CPU_IRQSTATUS_NONE); break; case 0x4001: @@ -556,7 +556,7 @@ static INT32 DrvFrame() for (INT32 i = 0; i < nInterleave; i++) { nCyclesRun += M6502Run(nTotalCycles / nInterleave); - M6502SetIRQLine(M6502_IRQ_LINE, (i & 1) ? M6502_IRQSTATUS_ACK : M6502_IRQSTATUS_NONE); + M6502SetIRQLine(M6502_IRQ_LINE, (i & 1) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); if (i == 28) vblank = 0x80; } diff --git a/src/burn/drv/pre90s/d_sf.cpp b/src/burn/drv/pre90s/d_sf.cpp index 75792721a..dd575e3e1 100644 --- a/src/burn/drv/pre90s/d_sf.cpp +++ b/src/burn/drv/pre90s/d_sf.cpp @@ -614,7 +614,7 @@ UINT8 __fastcall sf_sound2_in(UINT16 port) switch (port & 0xff) { case 0x01: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch; } @@ -743,9 +743,9 @@ static INT32 MemIndex() void sfYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1262,11 +1262,11 @@ static INT32 DrvFrame() ZetOpen(1); nNext[2] += nCyclesTotal[2] / nInterleave; nCyclesDone[2] += ZetRun(nNext[2] - nCyclesDone[2]); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); } - SekSetIRQLine((version == 4) ? 6 : 1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine((version == 4) ? 6 : 1, CPU_IRQSTATUS_AUTO); SekClose(); diff --git a/src/burn/drv/pre90s/d_sidearms.cpp b/src/burn/drv/pre90s/d_sidearms.cpp index 4abe91554..b5aaf119d 100644 --- a/src/burn/drv/pre90s/d_sidearms.cpp +++ b/src/burn/drv/pre90s/d_sidearms.cpp @@ -724,12 +724,12 @@ static UINT8 __fastcall whizz_sound_read_port(UINT16 port) inline static void DrvYM2203IRQHandler(INT32, INT32 nStatus) { - ZetSetIRQLine(0, (nStatus) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (nStatus) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static void DrvYM2151IrqHandler(INT32 nStatus) { - ZetSetIRQLine(0, (nStatus) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (nStatus) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } inline static INT32 DrvSynchroniseStream(INT32 nSoundRate) @@ -1356,16 +1356,16 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == 274) {ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); vblank = 1; } - if (i == 276) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 274) {ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); vblank = 1; } + if (i == 276) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); nSegment = ZetTotalCycles(); ZetClose(); ZetOpen(1); if (is_whizz) { nCyclesDone[1] += ZetRun(nSegment - ZetTotalCycles()); - if (i == 274) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == 276) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 274) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 276) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen / nInterleave; diff --git a/src/burn/drv/pre90s/d_skykid.cpp b/src/burn/drv/pre90s/d_skykid.cpp index 682cc1224..bb8fd24a1 100644 --- a/src/burn/drv/pre90s/d_skykid.cpp +++ b/src/burn/drv/pre90s/d_skykid.cpp @@ -304,7 +304,7 @@ void skykid_main_write(UINT16 address, UINT8 data) INT32 b = (~address & 0x0800) / 0x0800; interrupt_enable[0] = b; - if (b == 0) M6809SetIRQLine(0, M6809_IRQSTATUS_NONE); + if (b == 0) M6809SetIRQLine(0, CPU_IRQSTATUS_NONE); return; } @@ -384,7 +384,7 @@ void skykid_mcu_write(UINT16 address, UINT8 data) interrupt_enable[1] = b; - if (b == 0) HD63701SetIRQLine(0, HD63701_IRQSTATUS_NONE); + if (b == 0) HD63701SetIRQLine(0, CPU_IRQSTATUS_NONE); return; } } @@ -818,7 +818,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[0] / nInterleave; nCyclesDone[0] += M6809Run(nNext - nCyclesDone[0]); if (i == (nInterleave - 1) && interrupt_enable[0]) { - M6809SetIRQLine(0, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(0, CPU_IRQSTATUS_ACK); } M6809Close(); @@ -827,7 +827,7 @@ static INT32 DrvFrame() sync_HD63701(1); if (i == (nInterleave - 1) && interrupt_enable[1]) { - HD63701SetIRQLine(0, M6800_IRQSTATUS_ACK); + HD63701SetIRQLine(0, CPU_IRQSTATUS_ACK); } } else { sync_HD63701(0); diff --git a/src/burn/drv/pre90s/d_snk68.cpp b/src/burn/drv/pre90s/d_snk68.cpp index edd9fc6d1..8ed7822af 100644 --- a/src/burn/drv/pre90s/d_snk68.cpp +++ b/src/burn/drv/pre90s/d_snk68.cpp @@ -702,9 +702,9 @@ UINT8 __fastcall pow_sound_in(UINT16 address) static void powFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1293,7 +1293,7 @@ static INT32 DrvFrame() ZetNewFrame(); SekRun(nTotalCycles[0]); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); BurnTimerEndFrameYM3812(nTotalCycles[1]); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_solomon.cpp b/src/burn/drv/pre90s/d_solomon.cpp index e1a16be3c..22d2dddfc 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; - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); // Render Sound Segment diff --git a/src/burn/drv/pre90s/d_sonson.cpp b/src/burn/drv/pre90s/d_sonson.cpp index bf85c2547..5618b9827 100644 --- a/src/burn/drv/pre90s/d_sonson.cpp +++ b/src/burn/drv/pre90s/d_sonson.cpp @@ -569,7 +569,7 @@ static INT32 DrvFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += M6809Run(nCyclesSegment); if (i == (nInterleave - 1)) { - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); } M6809Close(); @@ -578,12 +578,12 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; if (DrvSoundIrqTrigger) { - M6809SetIRQLine(1, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(1, CPU_IRQSTATUS_AUTO); DrvSoundIrqTrigger = 0; } nCyclesDone[nCurrentCPU] += M6809Run(nCyclesSegment); if (i == 3 || i == 7 || i == 11 || i == 15) { - M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); } M6809Close(); diff --git a/src/burn/drv/pre90s/d_srumbler.cpp b/src/burn/drv/pre90s/d_srumbler.cpp index a43f59410..3cbc95f54 100644 --- a/src/burn/drv/pre90s/d_srumbler.cpp +++ b/src/burn/drv/pre90s/d_srumbler.cpp @@ -617,11 +617,11 @@ static INT32 DrvFrame() for (INT32 i = 0; i < nInterleave; i++) { nCyclesDone[0] += M6809Run(nCyclesTotal[0] / nInterleave); - if (i == (nInterleave / 2) - 1) M6809SetIRQLine(1, M6809_IRQSTATUS_AUTO); - if (i == (nInterleave / 1) - 1) M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); + if (i == (nInterleave / 2) - 1) M6809SetIRQLine(1, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave / 1) - 1) M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); BurnTimerUpdate(i * (nCyclesTotal[1] / nInterleave)); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } BurnTimerEndFrame(nCyclesTotal[1]); diff --git a/src/burn/drv/pre90s/d_suna8.cpp b/src/burn/drv/pre90s/d_suna8.cpp index 72b38a69d..2d4b3473c 100644 --- a/src/burn/drv/pre90s/d_suna8.cpp +++ b/src/burn/drv/pre90s/d_suna8.cpp @@ -1027,7 +1027,7 @@ static void rranger_ay8910_write_A(UINT32, UINT32 data) static void sound_type1_fm_irq_handler(INT32, INT32 nStatus) { - ZetSetIRQLine(0, (nStatus) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (nStatus) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } inline static INT32 hardhead_fm_syncronize(INT32 nSoundRate) @@ -2152,16 +2152,16 @@ static INT32 HardheadFrame() ZetOpen(0); nCyclesSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += ZetRun(nCyclesSegment); - if (i == (nInterleave-1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave-1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); nCyclesSegment = (nCyclesTotal[1] / nInterleave) * (i + 1); BurnTimerUpdateYM3812(nCyclesSegment); if ((i % (nInterleave/4)) == ((nInterleave / 4) - 1)) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); } @@ -2215,16 +2215,16 @@ static INT32 RrangerFrame() ZetOpen(0); nCyclesSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += ZetRun(nCyclesSegment); - if (i == (nInterleave-1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave-1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); nCyclesSegment = (nCyclesTotal[1] / nInterleave) * (i + 1); BurnTimerUpdate(nCyclesSegment); if ((i % (nInterleave/4)) == ((nInterleave / 4) - 1)) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); } @@ -2275,16 +2275,16 @@ static INT32 Hardhea2Frame() nCyclesSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += ZetRun(nCyclesSegment); if (i == 112 && *nmi_enable) ZetNmi(); - if (i == 240) { vblank = 1; ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); } + if (i == 240) { vblank = 1; ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); ZetOpen(1); nCyclesSegment = (nCyclesTotal[1] / nInterleave) * (i + 1); BurnTimerUpdateYM3812(nCyclesSegment); if ((i % (nInterleave/4)) == ((nInterleave / 4) - 1)) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); @@ -2350,9 +2350,9 @@ static INT32 SparkmanFrame() // & starfigh if (i == 112 && *nmi_enable) ZetNmi(); if (i == (Sparkman ? 250 : 255)) { // any other value and the sprites glitch (MAME uses 240 here, hmmm) vblank = 1; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); @@ -2360,9 +2360,9 @@ static INT32 SparkmanFrame() // & starfigh nCyclesSegment = (nCyclesTotal[1] / nInterleave) * (i + 1); BurnTimerUpdateYM3812(nCyclesSegment); if ((i % (nInterleave/4)) == ((nInterleave / 4) - 1)) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); } diff --git a/src/burn/drv/pre90s/d_tail2nose.cpp b/src/burn/drv/pre90s/d_tail2nose.cpp index c01953a2c..f8cdb3947 100644 --- a/src/burn/drv/pre90s/d_tail2nose.cpp +++ b/src/burn/drv/pre90s/d_tail2nose.cpp @@ -299,7 +299,7 @@ static UINT8 __fastcall tail2nose_sound_in(UINT16 port) static void tail2noseFMIRQHandler(INT32, INT32 status) { - ZetSetIRQLine(0, (status & 1) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE ); + ZetSetIRQLine(0, (status & 1) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE ); } static INT32 tail2noseSynchroniseStream(INT32 nSoundRate) @@ -622,7 +622,7 @@ static INT32 DrvFrame() BurnTimerUpdate(SekTotalCycles() / 2); } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(nCyclesTotal[1]); diff --git a/src/burn/drv/pre90s/d_tbowl.cpp b/src/burn/drv/pre90s/d_tbowl.cpp index 5b4a28a99..341e3a791 100644 --- a/src/burn/drv/pre90s/d_tbowl.cpp +++ b/src/burn/drv/pre90s/d_tbowl.cpp @@ -341,7 +341,7 @@ static void tbowl_vclk_1() static void DrvFMIRQHandler(int, INT32 nStatus) { - ZetSetIRQLine(0, ((nStatus) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE)); + ZetSetIRQLine(0, ((nStatus) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE)); } static INT32 DrvSynchroniseStream(INT32 nSoundRate) @@ -710,14 +710,14 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave-1)) ZetRaiseIrq(0); + if (i == (nInterleave-1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); nSegment = (nTotalCycles[1] - nCyclesDone[1]) / (nInterleave - i); ZetOpen(1); nCyclesDone[1] += ZetRun(nSegment); - if (i == (nInterleave-1)) ZetRaiseIrq(0); + if (i == (nInterleave-1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(2); diff --git a/src/burn/drv/pre90s/d_tecmo.cpp b/src/burn/drv/pre90s/d_tecmo.cpp index ea5a2b1cc..6bfc759ab 100644 --- a/src/burn/drv/pre90s/d_tecmo.cpp +++ b/src/burn/drv/pre90s/d_tecmo.cpp @@ -677,9 +677,9 @@ static INT32 DrvDoReset() static void TecmoFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1163,7 +1163,7 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave-1)) ZetRaiseIrq(0); + if (i == (nInterleave-1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); diff --git a/src/burn/drv/pre90s/d_terracre.cpp b/src/burn/drv/pre90s/d_terracre.cpp index e6dd15479..faae7b741 100644 --- a/src/burn/drv/pre90s/d_terracre.cpp +++ b/src/burn/drv/pre90s/d_terracre.cpp @@ -1724,7 +1724,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekClose(); nCurrentCPU = 1; @@ -1735,9 +1735,9 @@ static INT32 DrvFrame() BurnTimerUpdateYM3526((i + 1) * (nCyclesTotal[nCurrentCPU] / nInterleave)); } { // 136 times per frame. - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); nCyclesDone[1] += ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); } diff --git a/src/burn/drv/pre90s/d_tigeroad.cpp b/src/burn/drv/pre90s/d_tigeroad.cpp index 3448cb69c..33b611191 100644 --- a/src/burn/drv/pre90s/d_tigeroad.cpp +++ b/src/burn/drv/pre90s/d_tigeroad.cpp @@ -536,9 +536,9 @@ UINT8 __fastcall tigeroad_sample_in(UINT16 port) static void TigeroadIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1019,7 +1019,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); if (toramich) MSM5205Update(); SekClose(); @@ -1035,7 +1035,7 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); for (INT32 j = 0; j < 67; j++) { if (i == MSMIRQSlice[j]) { - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); nCyclesDone[nCurrentCPU] += ZetRun(1000); } } diff --git a/src/burn/drv/pre90s/d_timelimt.cpp b/src/burn/drv/pre90s/d_timelimt.cpp index 00ad5bb99..c056cbca9 100644 --- a/src/burn/drv/pre90s/d_timelimt.cpp +++ b/src/burn/drv/pre90s/d_timelimt.cpp @@ -555,7 +555,7 @@ static INT32 DrvFrame() ZetOpen(1); nCyclesDone[1] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } diff --git a/src/burn/drv/pre90s/d_toki.cpp b/src/burn/drv/pre90s/d_toki.cpp index 07f5a7008..b8663278c 100644 --- a/src/burn/drv/pre90s/d_toki.cpp +++ b/src/burn/drv/pre90s/d_toki.cpp @@ -265,7 +265,7 @@ static void __fastcall toki_write_byte(UINT32 address, UINT8 data) { *soundlatch = data & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); } return; @@ -442,7 +442,7 @@ static UINT8 __fastcall tokib_sound_read(UINT16 address) return BurnYM3812Read(0, 0); case 0xf800: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -1256,7 +1256,7 @@ static INT32 DrvFrame() } // when the line clears, the timer starts counting for the scroll regs to be written! - if (i == 250) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == 250) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); } BurnTimerEndFrameYM3812(nCyclesTotal[1]); @@ -1303,7 +1303,7 @@ static INT32 TokibFrame() nNext = (i + 1) * nCyclesToDo[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); SekClose(); ZetOpen(0); diff --git a/src/burn/drv/pre90s/d_tsamurai.cpp b/src/burn/drv/pre90s/d_tsamurai.cpp index 3f9456f79..8969570c1 100644 --- a/src/burn/drv/pre90s/d_tsamurai.cpp +++ b/src/burn/drv/pre90s/d_tsamurai.cpp @@ -403,7 +403,7 @@ static void __fastcall tsamurai_main_write(UINT16 address, UINT8 data) soundlatch0 = data; ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -412,7 +412,7 @@ static void __fastcall tsamurai_main_write(UINT16 address, UINT8 data) soundlatch1 = data; ZetClose(); ZetOpen(2); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -494,7 +494,7 @@ static void __fastcall m660_main_write(UINT16 address, UINT8 data) soundlatch2 = data; ZetClose(); ZetOpen(3); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -503,7 +503,7 @@ static void __fastcall m660_main_write(UINT16 address, UINT8 data) soundlatch1 = data; ZetClose(); ZetOpen(2); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -512,7 +512,7 @@ static void __fastcall m660_main_write(UINT16 address, UINT8 data) soundlatch0 = data; ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -627,7 +627,7 @@ static UINT8 __fastcall tsamurai_sound0_read(UINT16 address) { case 0x6000: case 0xc000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch0; } @@ -655,7 +655,7 @@ static UINT8 __fastcall tsamurai_sound1_read(UINT16 address) { case 0x6000: case 0xc000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch1; } @@ -667,7 +667,7 @@ static UINT8 __fastcall m660_sound2_read(UINT16 address) switch (address) { case 0xc000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch2; } diff --git a/src/burn/drv/pre90s/d_vulgus.cpp b/src/burn/drv/pre90s/d_vulgus.cpp index 5907389c0..6ae79f353 100644 --- a/src/burn/drv/pre90s/d_vulgus.cpp +++ b/src/burn/drv/pre90s/d_vulgus.cpp @@ -570,23 +570,23 @@ static INT32 DrvFrame() nCycles[0] -= ZetRun(nCycles[0] / (nInterleave - i)); if (i == ((nInterleave / 2) - 1)) { ZetSetVector(0xd7); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } if (i == ( nInterleave - 1)) { ZetSetVector(0xcf); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); ZetOpen(1); nCycles[1] -= ZetRun(nCycles[1] / (nInterleave - i)); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(100); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_wallc.cpp b/src/burn/drv/pre90s/d_wallc.cpp index e7abf55c4..76786fdc2 100644 --- a/src/burn/drv/pre90s/d_wallc.cpp +++ b/src/burn/drv/pre90s/d_wallc.cpp @@ -330,11 +330,11 @@ static INT32 DrvFrame() ZetOpen(0); // ZetRun(3072000 / 60); -// ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); +// ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetRun(3000000 / 60); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(72000 / 60); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pre90s/d_wc90.cpp b/src/burn/drv/pre90s/d_wc90.cpp index 75c1f746a..5a87ae39e 100644 --- a/src/burn/drv/pre90s/d_wc90.cpp +++ b/src/burn/drv/pre90s/d_wc90.cpp @@ -313,9 +313,9 @@ static INT32 Wc90DoReset() static void wc90FMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1013,7 +1013,7 @@ static INT32 Wc90Frame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == 261) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == 261) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); nCurrentCPU = 1; @@ -1021,7 +1021,7 @@ static INT32 Wc90Frame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == 261) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == 261) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); nCurrentCPU = 2; diff --git a/src/burn/drv/pre90s/d_wc90b.cpp b/src/burn/drv/pre90s/d_wc90b.cpp index eb6e4ff62..427285d38 100644 --- a/src/burn/drv/pre90s/d_wc90b.cpp +++ b/src/burn/drv/pre90s/d_wc90b.cpp @@ -439,7 +439,7 @@ void __fastcall Wc90b1Write1(UINT16 a, UINT8 d) Wc90b1SoundLatch = d; ZetClose(); ZetOpen(2); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -518,7 +518,7 @@ UINT8 __fastcall Wc90b1Read3(UINT16 a) } case 0xf800: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return Wc90b1SoundLatch; } @@ -998,8 +998,8 @@ static INT32 Wc90b1Frame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == nVBlankIRQFire) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == nVBlankIRQFire + 1) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == nVBlankIRQFire) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == nVBlankIRQFire + 1) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); nCurrentCPU = 1; @@ -1007,8 +1007,8 @@ static INT32 Wc90b1Frame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == nVBlankIRQFire) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == nVBlankIRQFire + 1) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == nVBlankIRQFire) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == nVBlankIRQFire + 1) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); nCurrentCPU = 2; diff --git a/src/burn/drv/pre90s/d_wwfsstar.cpp b/src/burn/drv/pre90s/d_wwfsstar.cpp index 3ca523c08..c58c20af2 100644 --- a/src/burn/drv/pre90s/d_wwfsstar.cpp +++ b/src/burn/drv/pre90s/d_wwfsstar.cpp @@ -134,11 +134,11 @@ void __fastcall wwfsstar_main_write_word(UINT32 address, UINT16 data) switch (address) { case 0x180000: - SekSetIRQLine(6, SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, CPU_IRQSTATUS_NONE); return; case 0x180002: - SekSetIRQLine(5, SEK_IRQSTATUS_NONE); + SekSetIRQLine(5, CPU_IRQSTATUS_NONE); return; case 0x180004: @@ -251,9 +251,9 @@ UINT8 __fastcall wwfsstar_sound_read(UINT16 address) static void DrvYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -671,8 +671,8 @@ static inline void interrupt(INT32 scanline) { if (scanline == 0) vblank = 0; if (scanline == (240-1)) vblank = 1; - if ((scanline & 0x0f) == 0) SekSetIRQLine(5, SEK_IRQSTATUS_ACK); - if (scanline == 240) SekSetIRQLine(6, SEK_IRQSTATUS_ACK); + if ((scanline & 0x0f) == 0) SekSetIRQLine(5, CPU_IRQSTATUS_ACK); + if (scanline == 240) SekSetIRQLine(6, CPU_IRQSTATUS_ACK); } static INT32 DrvFrame() diff --git a/src/burn/drv/pre90s/d_xain.cpp b/src/burn/drv/pre90s/d_xain.cpp index 255aa8150..f82706485 100644 --- a/src/burn/drv/pre90s/d_xain.cpp +++ b/src/burn/drv/pre90s/d_xain.cpp @@ -204,30 +204,30 @@ static void xain_main_write(UINT16 address, UINT8 data) M6809Open(2); BurnTimerUpdate(cycles); soundlatch = data; - // M6809SetIRQLine(0, M6809_IRQSTATUS_AUTO); - M6809SetIRQLine(0, M6809_IRQSTATUS_ACK); // hold line until soundlatch is read to ensure commands are read + // M6809SetIRQLine(0, CPU_IRQSTATUS_AUTO); + M6809SetIRQLine(0, CPU_IRQSTATUS_ACK); // hold line until soundlatch is read to ensure commands are read M6809Close(); M6809Open(0); } return; case 0x3a09: - M6809SetIRQLine(0x20, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0x20, CPU_IRQSTATUS_NONE); return; case 0x3a0a: - M6809SetIRQLine(0x01, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0x01, CPU_IRQSTATUS_NONE); return; case 0x3a0b: - M6809SetIRQLine(0x00, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0x00, CPU_IRQSTATUS_NONE); return; case 0x3a0c: { M6809Close(); M6809Open(1); - M6809SetIRQLine(0x00, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(0x00, CPU_IRQSTATUS_ACK); M6809Close(); M6809Open(0); } @@ -329,14 +329,14 @@ static void xain_sub_write(UINT16 address, UINT8 data) { M6809Close(); M6809Open(0); - M6809SetIRQLine(0x00, M6809_IRQSTATUS_ACK); // maincpu irq + M6809SetIRQLine(0x00, CPU_IRQSTATUS_ACK); // maincpu irq M6809Close(); M6809Open(1); } return; case 0x2800: - M6809SetIRQLine(0x00, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0x00, CPU_IRQSTATUS_NONE); return; case 0x3000: @@ -371,7 +371,7 @@ static UINT8 xain_sound_read(UINT16 address) switch (address) { case 0x1000: - M6809SetIRQLine(0, M6809_IRQSTATUS_NONE); + M6809SetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch; } @@ -455,7 +455,7 @@ static UINT8 xain_68705_read_ports(UINT16 address) inline static void DrvYM2203IRQHandler(INT32, INT32 nStatus) { - M6809SetIRQLine(0x01, ((nStatus) ? M6809_IRQSTATUS_ACK : M6809_IRQSTATUS_NONE)); + M6809SetIRQLine(0x01, ((nStatus) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE)); } inline static INT32 DrvSynchroniseStream(INT32 nSoundRate) @@ -721,12 +721,12 @@ static void xain_scanline(INT32 scanline) // ripped directly from MAME if (!(vcount_old & 8) && (vcount & 8)) { - M6809SetIRQLine(0x01, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(0x01, CPU_IRQSTATUS_ACK); } if (vcount == 0xf8) { - M6809SetIRQLine(0x20, M6809_IRQSTATUS_ACK); + M6809SetIRQLine(0x20, CPU_IRQSTATUS_ACK); } vblank = (vcount >= (248 - 1)) ? 1 : 0; // -1 is a hack diff --git a/src/burn/drv/pre90s/d_xxmissio.cpp b/src/burn/drv/pre90s/d_xxmissio.cpp index 2fc33f058..4c48a5372 100644 --- a/src/burn/drv/pre90s/d_xxmissio.cpp +++ b/src/burn/drv/pre90s/d_xxmissio.cpp @@ -166,7 +166,7 @@ static void __fastcall xxmission_main_write(UINT16 address, UINT8 data) ZetClose(); ZetOpen(1); ZetSetVector(0x10); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(0); } @@ -226,7 +226,7 @@ static void __fastcall xxmission_sub_write(UINT16 address, UINT8 data) ZetClose(); ZetOpen(0); ZetSetVector(0x10); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); } @@ -585,7 +585,7 @@ static INT32 DrvFrame() if (i == 241) { vblank = 1; cpu_status &= ~0x20; - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); @@ -593,7 +593,7 @@ static INT32 DrvFrame() BurnTimerUpdate(nSegment); if (i == ((nInterleave / 2) - 1) || i == (nInterleave - 1)) { // 120hz cpu_status &= ~0x10; - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); } diff --git a/src/burn/drv/psikyo/d_psikyo.cpp b/src/burn/drv/psikyo/d_psikyo.cpp index 2ff74ef9d..764ea2de4 100644 --- a/src/burn/drv/psikyo/d_psikyo.cpp +++ b/src/burn/drv/psikyo/d_psikyo.cpp @@ -599,9 +599,9 @@ static void PsikyoFMIRQHandler(INT32, INT32 nStatus) // bprintf(PRINT_NORMAL, _T(" - IRQ -> %i.\n"), nStatus); if (nStatus) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1374,7 +1374,7 @@ static INT32 DrvFrame() } PsikyoSpriteBuffer(); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); bVBlank = 0x00; } diff --git a/src/burn/drv/psikyo/d_psikyo4.cpp b/src/burn/drv/psikyo/d_psikyo4.cpp index 30b375149..ba3317a04 100644 --- a/src/burn/drv/psikyo/d_psikyo4.cpp +++ b/src/burn/drv/psikyo/d_psikyo4.cpp @@ -671,9 +671,9 @@ static INT32 DrvSynchroniseStream(INT32 nSoundRate) static void DrvIRQCallback(INT32, INT32 nStatus) { if (nStatus) - Sh2SetIRQLine(12, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(12, CPU_IRQSTATUS_AUTO); else - Sh2SetIRQLine(12, SH2_IRQSTATUS_NONE); + Sh2SetIRQLine(12, CPU_IRQSTATUS_NONE); } static INT32 DrvInit(INT32 (*LoadCallback)(), INT32 gfx_len) @@ -919,9 +919,9 @@ static INT32 DrvFrame() } BurnTimerEndFrame(28636350 / 60); - Sh2SetIRQLine(4, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(4, CPU_IRQSTATUS_AUTO); Sh2Run(0); - Sh2SetIRQLine(4, SH2_IRQSTATUS_NONE); + Sh2SetIRQLine(4, CPU_IRQSTATUS_NONE); if (pBurnSoundOut) { BurnYMF278BUpdate(nBurnSoundLen); } diff --git a/src/burn/drv/psikyo/d_psikyosh.cpp b/src/burn/drv/psikyo/d_psikyosh.cpp index 7b70376eb..53556998c 100644 --- a/src/burn/drv/psikyo/d_psikyosh.cpp +++ b/src/burn/drv/psikyo/d_psikyosh.cpp @@ -343,7 +343,7 @@ void __fastcall ps3v1_write_byte(UINT32 address, UINT8 data) { case 0x305ffdc: case 0x305ffdd: - if (!(data & 0xc0)) Sh2SetIRQLine(4, SH2_IRQSTATUS_NONE); + if (!(data & 0xc0)) Sh2SetIRQLine(4, CPU_IRQSTATUS_NONE); return; case 0x5000000: @@ -435,7 +435,7 @@ void __fastcall ps5_write_byte(UINT32 address, UINT8 data) switch (address) { case 0x405ffdd: - if (!(data & 0xc0)) Sh2SetIRQLine(4, SH2_IRQSTATUS_NONE); + if (!(data & 0xc0)) Sh2SetIRQLine(4, CPU_IRQSTATUS_NONE); return; case 0x3100000: @@ -535,9 +535,9 @@ static INT32 DrvSynchroniseStream(INT32 nSoundRate) static void DrvIRQCallback(INT32, INT32 nStatus) { if (nStatus) - Sh2SetIRQLine(12, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(12, CPU_IRQSTATUS_AUTO); else - Sh2SetIRQLine(12, SH2_IRQSTATUS_NONE); + Sh2SetIRQLine(12, CPU_IRQSTATUS_NONE); } static INT32 DrvDoReset() @@ -746,7 +746,7 @@ static INT32 DrvFrame() BurnTimerEndFrame(28636350 / 60); - Sh2SetIRQLine(4, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(4, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { BurnYMF278BUpdate(nBurnSoundLen); diff --git a/src/burn/drv/pst90s/d_1945kiii.cpp b/src/burn/drv/pst90s/d_1945kiii.cpp index a5d3f82ae..eb74d75e7 100644 --- a/src/burn/drv/pst90s/d_1945kiii.cpp +++ b/src/burn/drv/pst90s/d_1945kiii.cpp @@ -403,7 +403,7 @@ static INT32 DrvFrame() SekOpen(0); SekRun(nTotalCycles); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_aerofgt.cpp b/src/burn/drv/pst90s/d_aerofgt.cpp index 55b010860..eacb35aa7 100644 --- a/src/burn/drv/pst90s/d_aerofgt.cpp +++ b/src/burn/drv/pst90s/d_aerofgt.cpp @@ -1210,9 +1210,9 @@ static void aerofgtFMIRQHandler(INT32, INT32 nStatus) if (ZetGetActive() == -1) return; // bprintf(PRINT_NORMAL, _T(" - IRQ -> %i.\n"), nStatus); if (nStatus) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1733,7 +1733,7 @@ static INT32 DrvDoReset() nAerofgtZ80Bank = -1; SekOpen(0); - //SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + //SekSetIRQLine(0, CPU_IRQSTATUS_NONE); SekReset(); SekClose(); @@ -2679,7 +2679,7 @@ static INT32 DrvFrame() ZetOpen(0); SekRun(nCyclesTotal[0]); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(nCyclesTotal[1]); diff --git a/src/burn/drv/pst90s/d_airbustr.cpp b/src/burn/drv/pst90s/d_airbustr.cpp index 7e5fed581..83d051051 100644 --- a/src/burn/drv/pst90s/d_airbustr.cpp +++ b/src/burn/drv/pst90s/d_airbustr.cpp @@ -759,7 +759,7 @@ static INT32 DrvFrame() if (i == 49 || i == 99) { interrupt_vectors[0] ^= 2; ZetSetVector(interrupt_vectors[0]); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); @@ -768,14 +768,14 @@ static INT32 DrvFrame() if (i == 49 || i == 99) { interrupt_vectors[1] ^= 2; ZetSetVector(interrupt_vectors[1]); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); ZetOpen(2); BurnTimerUpdate(nCyclesDone[1] /*sync with sub cpu*/); if (i == 99) { - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); } diff --git a/src/burn/drv/pst90s/d_aquarium.cpp b/src/burn/drv/pst90s/d_aquarium.cpp index 776ff5088..ab1995133 100644 --- a/src/burn/drv/pst90s/d_aquarium.cpp +++ b/src/burn/drv/pst90s/d_aquarium.cpp @@ -235,9 +235,9 @@ UINT8 __fastcall aquarium_sound_in(UINT16 port) void aquariumYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -681,7 +681,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { nSegment = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/pst90s/d_blmbycar.cpp b/src/burn/drv/pst90s/d_blmbycar.cpp index 70130139e..f1e56c5b3 100644 --- a/src/burn/drv/pst90s/d_blmbycar.cpp +++ b/src/burn/drv/pst90s/d_blmbycar.cpp @@ -768,7 +768,7 @@ static INT32 DrvFrame() SekNewFrame(); SekOpen(0); SekRun(nCyclesTotal); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) MSM6295Render(0, pBurnSoundOut, nBurnSoundLen); diff --git a/src/burn/drv/pst90s/d_bloodbro.cpp b/src/burn/drv/pst90s/d_bloodbro.cpp index 9ae838278..5f9ddfd69 100644 --- a/src/burn/drv/pst90s/d_bloodbro.cpp +++ b/src/burn/drv/pst90s/d_bloodbro.cpp @@ -878,9 +878,9 @@ static INT32 DrvFrame() BurnTimerUpdateYM3812((nTotalCycles[1] / nInterleave) * (i+1)); } - if (nGameSelect == 0) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); // bloodbro - if (nGameSelect == 1) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); // skysmash - if (nGameSelect == 2) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); // weststry + if (nGameSelect == 0) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); // bloodbro + if (nGameSelect == 1) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); // skysmash + if (nGameSelect == 2) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); // weststry BurnTimerEndFrameYM3812(nTotalCycles[1]); diff --git a/src/burn/drv/pst90s/d_crospang.cpp b/src/burn/drv/pst90s/d_crospang.cpp index ae2264def..1b022f425 100644 --- a/src/burn/drv/pst90s/d_crospang.cpp +++ b/src/burn/drv/pst90s/d_crospang.cpp @@ -270,9 +270,9 @@ inline static INT32 crospangSynchroniseStream(INT32 nSoundRate) void crospangYM3812IrqHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -628,7 +628,7 @@ static INT32 DrvFrame() ZetOpen(0); SekRun(nTotalCycles[0]); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { BurnTimerEndFrameYM3812(nTotalCycles[1]); diff --git a/src/burn/drv/pst90s/d_crshrace.cpp b/src/burn/drv/pst90s/d_crshrace.cpp index 2061f7d4d..759d07818 100644 --- a/src/burn/drv/pst90s/d_crshrace.cpp +++ b/src/burn/drv/pst90s/d_crshrace.cpp @@ -352,9 +352,9 @@ UINT8 __fastcall crshrace_sound_in(UINT16 port) static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -757,7 +757,7 @@ static INT32 DrvFrame() ZetOpen(0); SekRun(nCyclesTotal[0]); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(nCyclesTotal[1]); diff --git a/src/burn/drv/pst90s/d_dcon.cpp b/src/burn/drv/pst90s/d_dcon.cpp index cdad50161..d36090700 100644 --- a/src/burn/drv/pst90s/d_dcon.cpp +++ b/src/burn/drv/pst90s/d_dcon.cpp @@ -650,7 +650,7 @@ static INT32 DrvFrame() BurnTimerEndFrameYM3812(nTotalCycles[1]); } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut && !is_sdgndmps) { seibu_sound_update(pBurnSoundOut, nBurnSoundLen); diff --git a/src/burn/drv/pst90s/d_ddragon3.cpp b/src/burn/drv/pst90s/d_ddragon3.cpp index bfba5b59b..0d3a64495 100644 --- a/src/burn/drv/pst90s/d_ddragon3.cpp +++ b/src/burn/drv/pst90s/d_ddragon3.cpp @@ -1170,9 +1170,9 @@ static INT32 SpriteYOffsets[16] = { 0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 8 static void DrvYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1931,7 +1931,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 5) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (i == 5) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); if (i == 5) DrvVBlank = 1; SekClose(); @@ -1956,7 +1956,7 @@ static INT32 DrvFrame() } SekOpen(0); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); SekClose(); // Make sure the buffer is entirely filled. diff --git a/src/burn/drv/pst90s/d_deniam.cpp b/src/burn/drv/pst90s/d_deniam.cpp index 67576bec5..5a51c0df9 100644 --- a/src/burn/drv/pst90s/d_deniam.cpp +++ b/src/burn/drv/pst90s/d_deniam.cpp @@ -265,9 +265,9 @@ inline static INT32 deniam16SekSynchroniseStream(INT32 nSoundRate) void deniam16YM3812IrqHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -776,7 +776,7 @@ static INT32 DrvFrame() BurnTimerUpdateYM3812(i * nCyclesSegment); } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { if (nGame != 2) BurnTimerEndFrameYM3812(nCyclesTotal[1]); diff --git a/src/burn/drv/pst90s/d_diverboy.cpp b/src/burn/drv/pst90s/d_diverboy.cpp index 7abf065f6..a970eb705 100644 --- a/src/burn/drv/pst90s/d_diverboy.cpp +++ b/src/burn/drv/pst90s/d_diverboy.cpp @@ -102,7 +102,7 @@ void __fastcall diverboy_write_word(UINT32 address, UINT16 data) { if (address == 0x100000) { *soundlatch = data; - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); return; } } @@ -417,7 +417,7 @@ static INT32 DrvFrame() nCyclesDone[1] += ZetRun(nSegment); } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { MSM6295Render(0, pBurnSoundOut, nBurnSoundLen); diff --git a/src/burn/drv/pst90s/d_dooyong.cpp b/src/burn/drv/pst90s/d_dooyong.cpp index 80752a257..b0165af7f 100644 --- a/src/burn/drv/pst90s/d_dooyong.cpp +++ b/src/burn/drv/pst90s/d_dooyong.cpp @@ -1343,12 +1343,12 @@ inline static void DrvYM2203IRQHandler(INT32 n, INT32 nStatus) { sound_irq_line[n] = nStatus; - ZetSetIRQLine(0, ((sound_irq_line[0] | sound_irq_line[1]) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE)); + ZetSetIRQLine(0, ((sound_irq_line[0] | sound_irq_line[1]) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE)); } static void DrvYM2151IrqHandler(INT32 nStatus) { - ZetSetIRQLine(0, (nStatus ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE)); + ZetSetIRQLine(0, (nStatus ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE)); } inline static INT32 DrvSynchroniseStream(INT32 nSoundRate) @@ -2854,11 +2854,11 @@ static INT32 LastdayFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nCyclesTotal[0] / nInterleave); if (gulf_storm) { - if (i == 92) { ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); vblank = 1; } - if (i == 93) { ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); vblank = 0; } + if (i == 92) { ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); vblank = 1; } + if (i == 93) { ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); vblank = 0; } } else { - if (i == (nInterleave - 2)) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == (nInterleave - 2)) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } ZetClose(); @@ -2866,9 +2866,9 @@ static INT32 LastdayFrame() BurnTimerUpdate((i + 1) * nCyclesTotal[1] / nInterleave); if (pollux_gulfstrm_irq_kicker_hack && (i % pollux_gulfstrm_irq_kicker_hack) == 0) { // ugly hack for pollux musix+sfx if (!(sound_irq_line[0] | sound_irq_line[1])) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetRun(60); - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } ZetClose(); @@ -2920,8 +2920,8 @@ static INT32 FlytigerFrame() { ZetOpen(0); nCyclesDone[0] += ZetRun(nCyclesTotal[0] / nInterleave); - if (i == (nInterleave - 2)) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == (nInterleave - 2)) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); ZetOpen(1); @@ -2990,8 +2990,8 @@ static INT32 RsharkFrame() for (INT32 i = 0; i < nInterleave; i++) { nCyclesDone[0] += SekRun(nCyclesTotal[0] / nInterleave); - if (i == 250) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); - if (i == 120) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + if (i == 250) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); + if (i == 120) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); nCyclesDone[1] += ZetRun(nCyclesTotal[1] / nInterleave); diff --git a/src/burn/drv/pst90s/d_drgnmst.cpp b/src/burn/drv/pst90s/d_drgnmst.cpp index 5df1fabf8..a7847dfd8 100644 --- a/src/burn/drv/pst90s/d_drgnmst.cpp +++ b/src/burn/drv/pst90s/d_drgnmst.cpp @@ -931,7 +931,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_drtomy.cpp b/src/burn/drv/pst90s/d_drtomy.cpp index f5e48c69f..753c52dc2 100644 --- a/src/burn/drv/pst90s/d_drtomy.cpp +++ b/src/burn/drv/pst90s/d_drtomy.cpp @@ -434,7 +434,7 @@ static INT32 DrvFrame() SekOpen(0); SekRun(12000000 / 60); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_egghunt.cpp b/src/burn/drv/pst90s/d_egghunt.cpp index 52efc540e..4bc7d4cf2 100644 --- a/src/burn/drv/pst90s/d_egghunt.cpp +++ b/src/burn/drv/pst90s/d_egghunt.cpp @@ -141,7 +141,7 @@ void __fastcall egghunt_main_write_port(UINT16 port, UINT8 data) case 0x03: ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); *soundlatch = data; @@ -205,7 +205,7 @@ UINT8 __fastcall egghunt_sound_read(UINT16 address) switch (address) { case 0xe000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xe001: @@ -468,7 +468,7 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); diff --git a/src/burn/drv/pst90s/d_esd16.cpp b/src/burn/drv/pst90s/d_esd16.cpp index df24b80da..7806df9d4 100644 --- a/src/burn/drv/pst90s/d_esd16.cpp +++ b/src/burn/drv/pst90s/d_esd16.cpp @@ -208,7 +208,7 @@ static void palette_write(INT32 offset, UINT16 data) static inline void esd_sound_command_w(UINT8 data) { soundlatch = data; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } //---------------------------------------------------------------------------------------------------------- @@ -596,7 +596,7 @@ UINT8 __fastcall esd16_sound_in(UINT16 port) return MSM6295ReadStatus(0); case 0x03: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return soundlatch; case 0x06: @@ -1148,7 +1148,7 @@ static INT32 DrvFrame() if (i & 1) ZetNmi(); } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); BurnTimerEndFrameYM3812(nCyclesTotal[1]); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_f1gp.cpp b/src/burn/drv/pst90s/d_f1gp.cpp index 009704637..5a9ed82dc 100644 --- a/src/burn/drv/pst90s/d_f1gp.cpp +++ b/src/burn/drv/pst90s/d_f1gp.cpp @@ -441,9 +441,9 @@ UINT8 __fastcall f1gp_sound_in(UINT16 port) static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1184,12 +1184,12 @@ static INT32 DrvFrame() SekOpen(0); nCyclesDone[0] += SekRun(nCycleSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekClose(); SekOpen(1); nCyclesDone[1] += SekRun(nCycleSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekClose(); } diff --git a/src/burn/drv/pst90s/d_fstarfrc.cpp b/src/burn/drv/pst90s/d_fstarfrc.cpp index 04bcb6e33..46af17619 100644 --- a/src/burn/drv/pst90s/d_fstarfrc.cpp +++ b/src/burn/drv/pst90s/d_fstarfrc.cpp @@ -380,9 +380,9 @@ INT32 FstarfrcDoReset() void FstarfrcYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0 , ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0 , CPU_IRQSTATUS_NONE); } } @@ -1182,7 +1182,7 @@ INT32 FstarfrcFrame() } } - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); // Make sure the buffer is entirely filled. diff --git a/src/burn/drv/pst90s/d_funybubl.cpp b/src/burn/drv/pst90s/d_funybubl.cpp index a9ab117a2..265ecdf19 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); 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)) ZetRaiseIrq(0); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); diff --git a/src/burn/drv/pst90s/d_fuukifg3.cpp b/src/burn/drv/pst90s/d_fuukifg3.cpp index 1938db4e8..55f543389 100644 --- a/src/burn/drv/pst90s/d_fuukifg3.cpp +++ b/src/burn/drv/pst90s/d_fuukifg3.cpp @@ -418,9 +418,9 @@ UINT8 __fastcall fuuki32_sound_in(UINT16 port) static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1255,15 +1255,15 @@ static INT32 DrvFrame() { nSegment = (nCyclesTotal[0] / nInterleave) * (i + 1); nCyclesDone[0] += SekRun(nSegment - nCyclesDone[0]); - // if (i == 16) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); // raster line -- 0 not 16? + // if (i == 16) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); // raster line -- 0 not 16? if (i == DrvRasterPos[0]) { - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); DrvRasterPos[0] = 0x1000; } - if (i == 247) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); // level 1 or 8 ? - if (i == 239) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); // vblank + if (i == 247) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); // level 1 or 8 ? + if (i == 239) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); // vblank // hack -- save scroll/offset registers so the // lines can be drawn in one pass -- should save diff --git a/src/burn/drv/pst90s/d_gaelco.cpp b/src/burn/drv/pst90s/d_gaelco.cpp index 44c8e2ff7..e973e0341 100644 --- a/src/burn/drv/pst90s/d_gaelco.cpp +++ b/src/burn/drv/pst90s/d_gaelco.cpp @@ -597,7 +597,7 @@ void __fastcall main_write_byte(UINT32 address, UINT8 data) case 0x70000f: if (has_sound_cpu) { *soundlatch = data; - M6809SetIRQLine(1, M6809_IRQSTATUS_AUTO); + M6809SetIRQLine(1, CPU_IRQSTATUS_AUTO); } else { MSM6295Command(0, data); } @@ -1212,7 +1212,7 @@ static INT32 DrvFrame() SekOpen(0); SekRun(12000000 / 60); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { @@ -1249,7 +1249,7 @@ static INT32 BigkarnkFrame() M6809Open(0); SekRun(10000000 / 60); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { BurnTimerEndFrameYM3812(2216750 / 60); diff --git a/src/burn/drv/pst90s/d_gaiden.cpp b/src/burn/drv/pst90s/d_gaiden.cpp index 94b9f438f..045d8b2f2 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; - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); return; case 0x7a802: // Tecmo Knight @@ -981,9 +981,9 @@ static INT32 DrvGetRoms() inline static void DrvYM2203IRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1477,7 +1477,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); nCurrentCPU = 1; if (game == 1) { diff --git a/src/burn/drv/pst90s/d_galpanic.cpp b/src/burn/drv/pst90s/d_galpanic.cpp index 8451a63d6..0e8e9257b 100644 --- a/src/burn/drv/pst90s/d_galpanic.cpp +++ b/src/burn/drv/pst90s/d_galpanic.cpp @@ -1003,7 +1003,7 @@ UINT8 __fastcall GalhustlReadByte(UINT32 sekAddress) static INT32 DrvDoReset() { SekOpen(0); - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); SekReset(); SekClose(); SndBank = 0; @@ -1946,9 +1946,9 @@ static INT32 GalpanicFrame() SekOpen(0); SekRun(nCyclesTotal[0] / 2); - SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); // let game run ??? + SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); // let game run ??? SekRun(nCyclesTotal[0] / 2); - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); // update palette + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); // update palette SekClose(); @@ -1990,11 +1990,11 @@ static INT32 ComadFrame() SekNewFrame(); SekRun(nCyclesTotal[0] / 4); - SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); // let game run + SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); // let game run SekRun(nCyclesTotal[0] / 4); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); // enable icons + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); // enable icons SekRun(nCyclesTotal[0] / 4); - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); // update palette + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); // update palette SekRun(nCyclesTotal[0] / 4); SekClose(); @@ -2037,9 +2037,9 @@ static INT32 GalhustlFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 1) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 2) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 3) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (i == 1) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 2) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 3) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); } diff --git a/src/burn/drv/pst90s/d_galspnbl.cpp b/src/burn/drv/pst90s/d_galspnbl.cpp index 86075fa86..671b64a49 100644 --- a/src/burn/drv/pst90s/d_galspnbl.cpp +++ b/src/burn/drv/pst90s/d_galspnbl.cpp @@ -218,9 +218,9 @@ static INT32 DrvSynchroniseStream(INT32 nSoundRate) static void DrvYM3812IrqHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -542,7 +542,7 @@ static INT32 DrvFrame() for (INT32 i = 0; i < nInterleave; i++) { INT32 nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(nSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); nSegment = nCyclesTotal[1] / nInterleave; BurnTimerUpdateYM3812((1 + i) * nSegment); diff --git a/src/burn/drv/pst90s/d_gotcha.cpp b/src/burn/drv/pst90s/d_gotcha.cpp index 551db0683..eed619474 100644 --- a/src/burn/drv/pst90s/d_gotcha.cpp +++ b/src/burn/drv/pst90s/d_gotcha.cpp @@ -314,9 +314,9 @@ static INT32 DrvGfxDecode() void DrvYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -546,7 +546,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { nSegment = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/pst90s/d_gumbo.cpp b/src/burn/drv/pst90s/d_gumbo.cpp index f6dbb64f2..cb77a3796 100644 --- a/src/burn/drv/pst90s/d_gumbo.cpp +++ b/src/burn/drv/pst90s/d_gumbo.cpp @@ -528,7 +528,7 @@ static INT32 DrvFrame() SekOpen(0); SekRun(7159090 / 60); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_hyperpac.cpp b/src/burn/drv/pst90s/d_hyperpac.cpp index 589e62a84..610b97f73 100644 --- a/src/burn/drv/pst90s/d_hyperpac.cpp +++ b/src/burn/drv/pst90s/d_hyperpac.cpp @@ -1205,9 +1205,9 @@ static INT32 Snowbro3DoReset() static void HyperpacYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1234,9 +1234,9 @@ static inline void snowbrosSynchroniseZ80(INT32 nExtraCycles) static void snowbrosFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -3522,9 +3522,9 @@ static INT32 HyperpacFrame() nSoundBufferPos += nSegmentLength; } - if (i == 1) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 2) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 3) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 1) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 2) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 3) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } SekClose(); @@ -3590,9 +3590,9 @@ static INT32 PzlbreakFrame() nSoundBufferPos += nSegmentLength; } - if (i == 1) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 2) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 3) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 1) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 2) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 3) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } SekClose(); @@ -3658,9 +3658,9 @@ static INT32 FinalttrFrame() nSoundBufferPos += nSegmentLength; } - if (i == 1) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 2) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 3) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 1) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 2) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 3) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } SekClose(); @@ -3717,7 +3717,7 @@ static INT32 TwinadvFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 2) ZetRaiseIrq(0); + if (i == 2) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen / nInterleave; @@ -3726,9 +3726,9 @@ static INT32 TwinadvFrame() nSoundBufferPos += nSegmentLength; } - if (i == 1) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 2) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 3) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 1) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 2) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 3) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } SekClose(); @@ -3778,9 +3778,9 @@ static INT32 HoneydolFrame() nCyclesSegment = nNext - SekTotalCycles(); SekRun(nCyclesSegment); - if (i == 1) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 2) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 3) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 1) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 2) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 3) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } nCycles68KSync = SekTotalCycles(); @@ -3832,9 +3832,9 @@ static INT32 SnowbrosFrame() nCyclesSegment = nNext - SekTotalCycles(); SekRun(nCyclesSegment); - if (i == 1) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 2) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 3) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 1) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 2) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 3) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } nCycles68KSync = SekTotalCycles(); @@ -3879,9 +3879,9 @@ static INT32 Snowbro3Frame() nCyclesSegment = nNext - SekTotalCycles(); SekRun(nCyclesSegment); - if (i == 1) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 2) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 3) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 1) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 2) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 3) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); INT32 Status = MSM6295ReadStatus(0); if (Snowbro3MusicPlaying) { diff --git a/src/burn/drv/pst90s/d_jchan.cpp b/src/burn/drv/pst90s/d_jchan.cpp index f0ec0e1df..46f7c6a9b 100644 --- a/src/burn/drv/pst90s/d_jchan.cpp +++ b/src/burn/drv/pst90s/d_jchan.cpp @@ -281,7 +281,7 @@ void __fastcall jchan_main_command_write_word(UINT32 address, UINT16 data) if (address == 0x403ffe) { SekClose(); SekOpen(1); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); SekOpen(0); } @@ -299,7 +299,7 @@ void __fastcall jchan_sub_command_write_word(UINT32 address, UINT16 data) if (address == 0x400000) { // not used? SekClose(); SekOpen(0); - SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); SekClose(); SekOpen(1); } @@ -649,17 +649,17 @@ static INT32 DrvFrame() SekOpen(0); nCyclesDone[0] += SekRun(nSegment); - if (i == 11) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); - if (i == 240) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == 11) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); + if (i == 240) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); nSegment = SekTotalCycles(); SekClose(); SekOpen(1); nCyclesDone[1] += SekRun(nSegment - SekTotalCycles()); if (enable_sub_irq) { - if (i == 11) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 240) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); - if (i == 249) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 11) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 240) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); + if (i == 249) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } SekClose(); } diff --git a/src/burn/drv/pst90s/d_kaneko16.cpp b/src/burn/drv/pst90s/d_kaneko16.cpp index ca177538d..bfbcf03cd 100644 --- a/src/burn/drv/pst90s/d_kaneko16.cpp +++ b/src/burn/drv/pst90s/d_kaneko16.cpp @@ -6100,9 +6100,9 @@ static INT32 ExplbrkrFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 3) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 6) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 9) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (i == 3) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 6) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 9) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); // Render Sound Segment @@ -6152,9 +6152,9 @@ static INT32 BlazeonFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 3) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (i == 6) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); - if (i == 9) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (i == 3) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (i == 6) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); + if (i == 9) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); // Run Z80 @@ -6205,11 +6205,11 @@ static INT32 GtmrFrame() SekNewFrame(); SekRun((16000000 / 60) / 4); - SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); SekRun((16000000 / 60) / 4); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekRun((16000000 / 60) / 4); - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekRun((16000000 / 60) / 4); SekClose(); @@ -6246,14 +6246,14 @@ static INT32 ShogwarrFrame() SekRun(nSegment); - if (nScanline == 64) SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); - if (nScanline == 144) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (nScanline == 64) SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); + if (nScanline == 144) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); if (nScanline == 223) { - SekSetIRQLine(4, SEK_IRQSTATUS_ACK); //AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_ACK); //AUTO); shogwarr_calc3_mcu_run(); } if (nScanline == 224) { - SekSetIRQLine(4, SEK_IRQSTATUS_NONE); //AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_NONE); //AUTO); } } diff --git a/src/burn/drv/pst90s/d_lordgun.cpp b/src/burn/drv/pst90s/d_lordgun.cpp index 0b5ba75ea..ea76e6306 100644 --- a/src/burn/drv/pst90s/d_lordgun.cpp +++ b/src/burn/drv/pst90s/d_lordgun.cpp @@ -669,7 +669,7 @@ static UINT8 aliencha_dip_read() static void DrvFMIRQHandler(INT32, INT32 nStatus) { - ZetSetIRQLine(0, nStatus ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, nStatus ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static INT32 DrvSynchroniseStream(INT32 nSoundRate) @@ -1346,7 +1346,7 @@ static INT32 lordgunFrame() nNext = (i + 1) * nTotalCycles[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); BurnTimerUpdateYM3812(i * (nTotalCycles[1] / nInterleave)); } @@ -1394,7 +1394,7 @@ static INT32 alienchaFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); BurnTimerUpdate(i * (nCyclesTotal[1] / nInterleave)); } diff --git a/src/burn/drv/pst90s/d_mcatadv.cpp b/src/burn/drv/pst90s/d_mcatadv.cpp index fdc8bf781..370fc970e 100644 --- a/src/burn/drv/pst90s/d_mcatadv.cpp +++ b/src/burn/drv/pst90s/d_mcatadv.cpp @@ -421,9 +421,9 @@ UINT8 __fastcall mcatadv_sound_in(UINT16 port) static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -885,7 +885,7 @@ static INT32 DrvFrame() } SekRun(nCyclesTotal[0]); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(nCyclesTotal[1]); diff --git a/src/burn/drv/pst90s/d_midas.cpp b/src/burn/drv/pst90s/d_midas.cpp index 7a44931d3..1a5ebf9ba 100644 --- a/src/burn/drv/pst90s/d_midas.cpp +++ b/src/burn/drv/pst90s/d_midas.cpp @@ -598,7 +598,7 @@ static INT32 DrvFrame() SekOpen(0); SekRun(12000000 / 60); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_mugsmash.cpp b/src/burn/drv/pst90s/d_mugsmash.cpp index 3aca7c191..c2d40d643 100644 --- a/src/burn/drv/pst90s/d_mugsmash.cpp +++ b/src/burn/drv/pst90s/d_mugsmash.cpp @@ -392,9 +392,9 @@ static INT32 DrvDoReset() void MugsmashYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -601,7 +601,7 @@ static INT32 DrvFrame() nSegment = (nCyclesTotal[0] - nCyclesDone[0]) / (nInterleave - i); nCyclesDone[0] += SekRun(nSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); nSegment = (nCyclesTotal[1] - nCyclesDone[1]) / (nInterleave - i); nCyclesDone[1] += ZetRun(nSegment); diff --git a/src/burn/drv/pst90s/d_mwarr.cpp b/src/burn/drv/pst90s/d_mwarr.cpp index c87c4bc36..f60e9ff4a 100644 --- a/src/burn/drv/pst90s/d_mwarr.cpp +++ b/src/burn/drv/pst90s/d_mwarr.cpp @@ -940,7 +940,7 @@ static INT32 stlforceFrame() } } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); nCycleSegment = nBurnSoundLen - (nSoundBufferPos>>1); if (pBurnSoundOut && nCycleSegment > 0) { @@ -1005,7 +1005,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); nCycleSegment = nBurnSoundLen - (nSoundBufferPos>>1); if (pBurnSoundOut && nCycleSegment > 0) { diff --git a/src/burn/drv/pst90s/d_news.cpp b/src/burn/drv/pst90s/d_news.cpp index c6c981a5b..81b27e652 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnDraw) NewsDraw(); diff --git a/src/burn/drv/pst90s/d_nmg5.cpp b/src/burn/drv/pst90s/d_nmg5.cpp index 198d73812..1a8aa67c2 100644 --- a/src/burn/drv/pst90s/d_nmg5.cpp +++ b/src/burn/drv/pst90s/d_nmg5.cpp @@ -1050,9 +1050,9 @@ static INT32 DrvSynchroniseStream(INT32 nSoundRate) static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1356,7 +1356,7 @@ static INT32 DrvFrame() SekRun(nTotalCycles[0]); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { BurnTimerEndFrameYM3812(nTotalCycles[1]); diff --git a/src/burn/drv/pst90s/d_nmk16.cpp b/src/burn/drv/pst90s/d_nmk16.cpp index 5017b2ad1..c9c7aaabb 100644 --- a/src/burn/drv/pst90s/d_nmk16.cpp +++ b/src/burn/drv/pst90s/d_nmk16.cpp @@ -2429,7 +2429,7 @@ void __fastcall ssmissin_main_write_byte(UINT32 address, UINT8 data) case 0x0c001e: case 0x0c001f: *soundlatch = data; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -2450,7 +2450,7 @@ void __fastcall ssmissin_main_write_word(UINT32 address, UINT16 data) case 0x0c001e: *soundlatch = data; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -2614,7 +2614,7 @@ void __fastcall afega_main_write_word(UINT32 address, UINT16 data) case 0x08001e: *soundlatch = data & 0xff; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -2639,7 +2639,7 @@ void __fastcall afega_main_write_byte(UINT32 address, UINT8 data) case 0x08001e: case 0x08001f: *soundlatch = data & 0xff; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); return; } } @@ -3671,7 +3671,7 @@ UINT8 __fastcall ssmissin_sound_read(UINT16 address) return MSM6295ReadStatus(0); case 0xa000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -3701,7 +3701,7 @@ UINT8 __fastcall afega_sound_read(UINT16 address) switch (address) { case 0xf800: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xf808: @@ -3746,7 +3746,7 @@ UINT8 __fastcall firehawk_sound_read(UINT16 address) switch (address) { case 0xfff0: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; case 0xfff8: @@ -3848,18 +3848,18 @@ UINT8 __fastcall macross2_sound_in(UINT16 port) static void DrvYM2203IrqHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } static void DrvYM2151IrqHandler(INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -5358,11 +5358,11 @@ static INT32 DrvFrame() nSegment = nTotalCycles[0] / nInterleave; nCyclesDone[0] += SekRun(nSegment); if (i == (nInterleave-1) || i == ((nInterleave / 2) - 1)) { - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekRun(0); } - if (i == ((nInterleave/2)-1)) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); - if (i == (nInterleave-1)) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == ((nInterleave/2)-1)) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave-1)) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); BurnTimerUpdate(i * (nTotalCycles[1] / nInterleave)); } @@ -5478,23 +5478,23 @@ static INT32 SsmissinFrame() nCyclesDone[0] += SekRun(nSegment); /* if (i == (nInterleave-1) || i == ((nInterleave / 2) - 1)) { - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekRun(0); } if (i == ((nInterleave/2)-1) && nNMK004EnableIrq2) - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); if (i == (nInterleave-1)) - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); */ if (i == 25 || i == 148) { // 25, 153 in MAME - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); } if (i == 0) { - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } if (i == 235) { // 240 in MAME, but causes a missing life-bar in VanDyke. 236 causes a little flicker in the life-bar, 235 = perfect. - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } ZetRun(nTotalCycles[1] / nInterleave); @@ -5546,10 +5546,10 @@ static INT32 Macross2Frame() nSegment = nTotalCycles[0] / nInterleave; nCyclesDone[0] += SekRun(nSegment); if (i == 1 || i == (nInterleave / 2)) { - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); } if (i == (nInterleave-1)) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } if (macross2_sound_enable) { @@ -5610,8 +5610,8 @@ static INT32 AfegaFrame() nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(nSegment); - if (i == (nInterleave / 2) - 1) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); - if (i == (nInterleave) - 1) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave / 2) - 1) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave) - 1) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); nSegment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += ZetRun(nSegment); @@ -5676,11 +5676,11 @@ static INT32 BjtwinFrame() nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(nSegment); if (i == (nInterleave-1) || i == ((nInterleave / 2) - 1)) { - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); } if (i == (nInterleave-1)) { SekRun(0); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } @@ -5731,17 +5731,17 @@ static INT32 SeibuSoundFrame() nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(nSegment); if (i == (nInterleave-1) || i == ((nInterleave / 2) - 1)) { - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); } if (i == ((nInterleave/2)-1)) { SekRun(0); - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } if (i == (nInterleave-1)) { SekRun(0); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } BurnTimerUpdateYM3812(i * (nCyclesTotal[1] / nInterleave)); @@ -5806,13 +5806,13 @@ static INT32 NMK004Frame() } if (i == 25 || i == 148) { // 25, 153 in MAME - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); } if (i == 0) { - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } if (i == 235) { // 240 in MAME, but causes a missing life-bar in VanDyke. 236 causes a little flicker in the life-bar, 235 = perfect. - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nSegment = i * (nTotalCycles[1] / nInterleave); @@ -9685,7 +9685,7 @@ static UINT8 raphero_sound_read(UINT32 address) static void RapheroYM2203IrqHandler(INT32, INT32 nStatus) { - tlcs90SetIRQLine(0, (nStatus) ? TLCS90_IRQSTATUS_ACK : TLCS90_IRQSTATUS_NONE); + tlcs90SetIRQLine(0, (nStatus) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } inline static double RapheroGetTime() @@ -9851,11 +9851,11 @@ static INT32 RapheroFrame() SekRun(nTotalCycles[0] / nInterleave); if (i == (nInterleave-16) || i == (nInterleave/2)-16) { // ?? - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); } if (i == (nInterleave-1)) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nSegment = (nTotalCycles[1] / nInterleave) * (i + 1); diff --git a/src/burn/drv/pst90s/d_ohmygod.cpp b/src/burn/drv/pst90s/d_ohmygod.cpp index 1d3787c15..1311ee939 100644 --- a/src/burn/drv/pst90s/d_ohmygod.cpp +++ b/src/burn/drv/pst90s/d_ohmygod.cpp @@ -625,7 +625,7 @@ INT32 OhmygodFrame() SekOpen(0); SekRun(12000000 / 60); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekClose(); do_watchtick(); if (pBurnDraw) OhmygodDraw(); diff --git a/src/burn/drv/pst90s/d_pass.cpp b/src/burn/drv/pst90s/d_pass.cpp index 776aa3fff..54816b379 100644 --- a/src/burn/drv/pst90s/d_pass.cpp +++ b/src/burn/drv/pst90s/d_pass.cpp @@ -434,7 +434,7 @@ static INT32 DrvFrame() BurnTimerUpdate(i * nSegment); } - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(nTotalCycles[1]); if (pBurnSoundOut) { @@ -442,7 +442,7 @@ static INT32 DrvFrame() MSM6295Render(0, pBurnSoundOut, nBurnSoundLen); } - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); ZetClose(); SekClose(); diff --git a/src/burn/drv/pst90s/d_pirates.cpp b/src/burn/drv/pst90s/d_pirates.cpp index a811b96a1..9e6935815 100644 --- a/src/burn/drv/pst90s/d_pirates.cpp +++ b/src/burn/drv/pst90s/d_pirates.cpp @@ -582,7 +582,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_playmark.cpp b/src/burn/drv/pst90s/d_playmark.cpp index dbb91dcd1..00a902699 100644 --- a/src/burn/drv/pst90s/d_playmark.cpp +++ b/src/burn/drv/pst90s/d_playmark.cpp @@ -1642,7 +1642,7 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); if (i == 90) { DrvVBlank = 1; - SekSetIRQLine(nIRQLine, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(nIRQLine, CPU_IRQSTATUS_AUTO); } nCurrentCPU = 1; diff --git a/src/burn/drv/pst90s/d_powerins.cpp b/src/burn/drv/pst90s/d_powerins.cpp index 7394060ee..3e0a34024 100644 --- a/src/burn/drv/pst90s/d_powerins.cpp +++ b/src/burn/drv/pst90s/d_powerins.cpp @@ -580,9 +580,9 @@ static void powerinsIRQHandler(INT32, INT32 nStatus) // bprintf(PRINT_NORMAL, _T("powerinsIRQHandler %i\n"), nStatus); if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -599,7 +599,7 @@ static double powerinsGetTime() static INT32 DrvDoReset() { SekOpen(0); - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); SekReset(); SekClose(); @@ -1043,7 +1043,7 @@ static INT32 powerinsFrame() if ( game_drv == GAME_POWERINA ) { nCyclesTotal[0] = (INT32)((INT64)12000000 * nBurnCPUSpeedAdjust / (0x0100 * 60)); SekRun(nCyclesTotal[0]); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) MSM6295Render(0, pBurnSoundOut, nBurnSoundLen); } @@ -1060,7 +1060,7 @@ static INT32 powerinsFrame() BurnTimerUpdate(i * (nCyclesTotal[1] / nInterleave)); } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } if (game_drv == GAME_POWERINB) { @@ -1077,11 +1077,11 @@ static INT32 powerinsFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); if ((i & 180) == 0) { - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } SekClose(); diff --git a/src/burn/drv/pst90s/d_pushman.cpp b/src/burn/drv/pst90s/d_pushman.cpp index ce08defad..42f8df76d 100644 --- a/src/burn/drv/pst90s/d_pushman.cpp +++ b/src/burn/drv/pst90s/d_pushman.cpp @@ -377,9 +377,9 @@ UINT8 pushman_mcu_read(UINT16 address) static void DrvIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -752,7 +752,7 @@ static INT32 DrvFrame() INT32 segment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(segment); - if (i == (nInterleave - 1)) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); if (no_mcu == 0) { nCyclesDone[1] += m6805Run(segment / 2); diff --git a/src/burn/drv/pst90s/d_raiden.cpp b/src/burn/drv/pst90s/d_raiden.cpp index d67e37af5..0ce5acc01 100644 --- a/src/burn/drv/pst90s/d_raiden.cpp +++ b/src/burn/drv/pst90s/d_raiden.cpp @@ -869,12 +869,12 @@ static INT32 DrvFrame() { VezOpen(0); nCyclesDone[0] += VezRun(nCyclesTotal[0] / nInterleave); - if (i == (nInterleave - 1)) VezSetIRQLineAndVector(0, 0xc8/4, VEZ_IRQSTATUS_ACK); + if (i == (nInterleave - 1)) VezSetIRQLineAndVector(0, 0xc8/4, CPU_IRQSTATUS_ACK); VezClose(); VezOpen(1); nCyclesDone[1] += VezRun(nCyclesTotal[1] / nInterleave); - if (i == (nInterleave - 1)) VezSetIRQLineAndVector(0, 0xc8/4, VEZ_IRQSTATUS_ACK); + if (i == (nInterleave - 1)) VezSetIRQLineAndVector(0, 0xc8/4, CPU_IRQSTATUS_ACK); VezClose(); BurnTimerUpdateYM3812(i * (nCyclesTotal[2] / nInterleave)); diff --git a/src/burn/drv/pst90s/d_raiden2.cpp b/src/burn/drv/pst90s/d_raiden2.cpp index 169b17aa7..d17178482 100644 --- a/src/burn/drv/pst90s/d_raiden2.cpp +++ b/src/burn/drv/pst90s/d_raiden2.cpp @@ -2579,7 +2579,7 @@ static INT32 DrvFrame() INT32 nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += VezRun(nSegment); - if (i == (nInterleave-2)) VezSetIRQLineAndVector(0, 0xc0/4, VEZ_IRQSTATUS_AUTO); + if (i == (nInterleave-2)) VezSetIRQLineAndVector(0, 0xc0/4, CPU_IRQSTATUS_AUTO); nSegment = (nCyclesTotal[1] / nInterleave) * (i+1); nCyclesDone[1] += ZetRun(nSegment - ZetTotalCycles()); @@ -2633,7 +2633,7 @@ static INT32 ZeroteamFrame() INT32 nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += VezRun(nSegment); - if (i == (nInterleave-2)) VezSetIRQLineAndVector(0, 0xc0/4, VEZ_IRQSTATUS_AUTO); + if (i == (nInterleave-2)) VezSetIRQLineAndVector(0, 0xc0/4, CPU_IRQSTATUS_AUTO); BurnTimerUpdateYM3812(i * (nCyclesTotal[1] / nInterleave)); } diff --git a/src/burn/drv/pst90s/d_sandscrp.cpp b/src/burn/drv/pst90s/d_sandscrp.cpp index 49d8eac7e..6d0fb0be6 100644 --- a/src/burn/drv/pst90s/d_sandscrp.cpp +++ b/src/burn/drv/pst90s/d_sandscrp.cpp @@ -245,7 +245,7 @@ static void update_irq_state() { INT32 irq = (vblank_irq || sprite_irq || unknown_irq) ? 1 : 0; - SekSetIRQLine(1, irq ? SEK_IRQSTATUS_ACK : SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, irq ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static void __fastcall sandscrp_main_write_word(UINT32 address, UINT16 data) @@ -440,7 +440,7 @@ static UINT8 DrvYM2203PortB(UINT32) static void DrvFMIRQHandler(INT32, INT32 nStatus) { - ZetSetIRQLine(0, (nStatus) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (nStatus) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static INT32 DrvSynchroniseStream(INT32 nSoundRate) diff --git a/src/burn/drv/pst90s/d_seta.cpp b/src/burn/drv/pst90s/d_seta.cpp index 1d00d174f..9a4523496 100644 --- a/src/burn/drv/pst90s/d_seta.cpp +++ b/src/burn/drv/pst90s/d_seta.cpp @@ -4838,7 +4838,7 @@ UINT8 __fastcall utoukond_sound_read_port(UINT16 port) return BurnYM3438Read(0, port & 3);// right? case 0xc0: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -4858,7 +4858,7 @@ void __fastcall wiggie_sound_write_byte(UINT32 address, UINT8 data) if (address != 0xb00008 && address != 0xc00000) return; // wiggie *soundlatch = data; - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } void __fastcall wiggie_sound_write(UINT16 address, UINT8 data) @@ -4879,7 +4879,7 @@ UINT8 __fastcall wiggie_sound_read(UINT16 address) return MSM6295ReadStatus(0); case 0xa000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -6367,9 +6367,9 @@ static void calibr5068kInit() static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0x20, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0x20, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0x20, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0x20, CPU_IRQSTATUS_NONE); } } @@ -7249,7 +7249,7 @@ static void irq_generator(INT32 loop) INT32 line = (irqtype >> (loop * 8)) & 0xff; if (line & 0x80) return; - SekSetIRQLine(line, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(line, CPU_IRQSTATUS_AUTO); } static void sprite_buffer() @@ -7362,8 +7362,8 @@ static void Drv68k_5IRQ_FrameCallback() { nCyclesDone[0] += SekRun(nCyclesTotal[0] / nInterleave); - if (i & 1 && i == 1) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); - if (i & 1 && i != 1) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i & 1 && i == 1) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); + if (i & 1 && i != 1) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } SekClose(); @@ -7385,11 +7385,11 @@ static void Drv68k_KM_FrameCallback() // kamenrid & madshark { nCyclesDone[0] += SekRun(nCyclesTotal[0] / nInterleave); - if (i & 1 && i == 1) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i & 1 && i == 1) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } if (flipflop==0) { // IRQ4 is fired every other frame - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); flipflop=1; } else { flipflop=0; @@ -7520,7 +7520,7 @@ static void CrzyfghtFrameCallback() SekRun(nCyclesTotal[0] / nInterleave); - SekSetIRQLine(irq[i], SEK_IRQSTATUS_AUTO); + SekSetIRQLine(irq[i], CPU_IRQSTATUS_AUTO); } BurnTimerUpdateEndYM3812(); @@ -10432,7 +10432,7 @@ static void jockeycFrameCallback() { nCyclesDone[0] += SekRun(nCyclesTotal[0] / nInterleave); - SekSetIRQLine(irqs[9-i], SEK_IRQSTATUS_AUTO); // ? + SekSetIRQLine(irqs[9-i], CPU_IRQSTATUS_AUTO); // ? } SekClose(); diff --git a/src/burn/drv/pst90s/d_seta2.cpp b/src/burn/drv/pst90s/d_seta2.cpp index a2dde4173..1c1d7688b 100644 --- a/src/burn/drv/pst90s/d_seta2.cpp +++ b/src/burn/drv/pst90s/d_seta2.cpp @@ -1312,10 +1312,10 @@ static void tmp68301_timer_callback(INT32 i) //cpunum_set_input_line(0,level,HOLD_LINE); //bprintf(PRINT_NORMAL, _T("Tmp68301: CB IRQ[%x] %04x timer[%d]\n"), level, tmp68301_irq_vector[level], i); - //SekSetIRQLine(tmp68301_irq_vector[level], SEK_IRQSTATUS_AUTO); + //SekSetIRQLine(tmp68301_irq_vector[level], CPU_IRQSTATUS_AUTO); - //SekSetIRQLine(level, SEK_IRQSTATUS_ACK); - SekSetIRQLine(level, SEK_IRQSTATUS_AUTO); + //SekSetIRQLine(level, CPU_IRQSTATUS_ACK); + SekSetIRQLine(level, CPU_IRQSTATUS_AUTO); } if (TCR & 0x0080) { // N/1 @@ -1346,8 +1346,8 @@ static void tmp68301_update_irq_state(INT32 i) //cpunum_set_input_line(0,level,HOLD_LINE); //bprintf(PRINT_NORMAL, _T("Tmp68301: UP IRQ[%x] %04x timer[%d] IMR:%04x IVNR:%04x ICR:%04x\n"), level, tmp68301_irq_vector[level], i, IMR, IVNR, ICR); - //SekSetIRQLine(level, SEK_IRQSTATUS_ACK); - SekSetIRQLine(level, SEK_IRQSTATUS_AUTO); + //SekSetIRQLine(level, CPU_IRQSTATUS_ACK); + SekSetIRQLine(level, CPU_IRQSTATUS_AUTO); } } @@ -1525,7 +1525,7 @@ INT32 __fastcall grdiansSekIrqCallback(INT32 irq) static INT32 DrvDoReset() { SekOpen(0); -// SekSetIRQLine(0, SEK_IRQSTATUS_NONE); +// SekSetIRQLine(0, CPU_IRQSTATUS_NONE); SekReset(); SekClose(); diff --git a/src/burn/drv/pst90s/d_shadfrce.cpp b/src/burn/drv/pst90s/d_shadfrce.cpp index c694a8d80..0059422ef 100644 --- a/src/burn/drv/pst90s/d_shadfrce.cpp +++ b/src/burn/drv/pst90s/d_shadfrce.cpp @@ -443,18 +443,17 @@ void __fastcall shadfrceZWrite(UINT16 a, UINT8 d) static void shadfrceYM2151IRQHandler(INT32 nStatus) { if (nStatus) { - //ZetRaiseIrq(255); - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); ZetRun(0x0400); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } static INT32 DrvDoReset() { SekOpen(0); - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); SekReset(); SekClose(); @@ -1479,7 +1478,7 @@ static INT32 shadfrceFrame() bVBlink = 0; SekRun(3500000 / 60); - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); ZetRun(nZ80Cycles >> 2); if (pBurnSoundOut) { @@ -1505,7 +1504,7 @@ static INT32 shadfrceFrame() bVBlink = 0; SekRun(3500000 / 60); - SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); ZetRun(nZ80Cycles >> 2); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_silkroad.cpp b/src/burn/drv/pst90s/d_silkroad.cpp index f9e46d652..ef17ec52a 100644 --- a/src/burn/drv/pst90s/d_silkroad.cpp +++ b/src/burn/drv/pst90s/d_silkroad.cpp @@ -609,7 +609,7 @@ static INT32 DrvFrame() SekOpen(0); SekRun(nTotalCycles); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_silvmil.cpp b/src/burn/drv/pst90s/d_silvmil.cpp index b621cfd4a..0334f017a 100644 --- a/src/burn/drv/pst90s/d_silvmil.cpp +++ b/src/burn/drv/pst90s/d_silvmil.cpp @@ -280,7 +280,7 @@ UINT8 __fastcall silvmil_sound_read(UINT16 address) void silvmilYM2151IrqHandler(INT32 nStatus) { if (ZetGetActive() != -1) - ZetSetIRQLine(0, (nStatus) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (nStatus) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static INT32 DrvDoReset() @@ -666,7 +666,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { nSegment = nBurnSoundLen - nSoundBufferPos; diff --git a/src/burn/drv/pst90s/d_speedspn.cpp b/src/burn/drv/pst90s/d_speedspn.cpp index 010a12b1d..46f2d0b53 100644 --- a/src/burn/drv/pst90s/d_speedspn.cpp +++ b/src/burn/drv/pst90s/d_speedspn.cpp @@ -203,7 +203,7 @@ void __fastcall speedspn_main_write_port(UINT16 port, UINT8 data) *soundlatch = data; ZetClose(); ZetOpen(1); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); return; @@ -274,7 +274,7 @@ UINT8 __fastcall speedspn_sound_read(UINT16 address) return MSM6295ReadStatus(0); case 0xa000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -545,7 +545,7 @@ static INT32 DrvFrame() ZetOpen(0); nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); diff --git a/src/burn/drv/pst90s/d_suna16.cpp b/src/burn/drv/pst90s/d_suna16.cpp index cd5ea75bb..bbdba4d3d 100644 --- a/src/burn/drv/pst90s/d_suna16.cpp +++ b/src/burn/drv/pst90s/d_suna16.cpp @@ -1425,9 +1425,9 @@ void bestbest_ay8910_write_a(UINT32,UINT32) static void bestbestFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1963,8 +1963,8 @@ static INT32 BestbestFrame() for (INT32 i = 0; i < nInterleave; i++) { SekRun(nCyclesTotal[0] / nInterleave); - if (i == (nInterleave / 2)-1) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); - if (i == (nInterleave )-1) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave / 2)-1) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave )-1) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); ZetOpen(0); BurnTimerUpdateYM3526(i * (nCyclesTotal[1] / nInterleave)); @@ -2037,7 +2037,7 @@ static INT32 SunaqFrame() for (INT32 i = 0; i < nInterleave; i++) { SekRun(nCyclesTotal[0] / nInterleave); - if (i == (nInterleave )-1) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave )-1) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); for (INT32 j = 0; j < 2; j++) { ZetOpen(j); @@ -2098,7 +2098,7 @@ static INT32 UballoonFrame() for (INT32 i = 0; i < nInterleave; i++) { SekRun(nCyclesTotal[0] / nInterleave); - if (i == (nInterleave )-1) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave )-1) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); for (INT32 j = 0; j < 2; j++) { ZetOpen(j); @@ -2162,8 +2162,8 @@ static INT32 BssoccerFrame() for (INT32 i = 0; i < nInterleave; i++) { SekRun(nCyclesTotal[0] / nInterleave); - if (i == (nInterleave / 2)-1) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); - if (i == (nInterleave )-1) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave / 2)-1) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave )-1) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); for (INT32 j = 0; j < 3; j++) { ZetOpen(j); diff --git a/src/burn/drv/pst90s/d_suprnova.cpp b/src/burn/drv/pst90s/d_suprnova.cpp index b6bf26d69..0069a0f48 100644 --- a/src/burn/drv/pst90s/d_suprnova.cpp +++ b/src/burn/drv/pst90s/d_suprnova.cpp @@ -1631,27 +1631,27 @@ static int DrvFrame() Sh2Run(segment); // irqs if (i == 1) { - Sh2SetIRQLine(1, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(1, CPU_IRQSTATUS_AUTO); Sh2Run(0); - Sh2SetIRQLine(1, SH2_IRQSTATUS_NONE); + Sh2SetIRQLine(1, CPU_IRQSTATUS_NONE); } else if (i == 240) { - Sh2SetIRQLine(5, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(5, CPU_IRQSTATUS_AUTO); Sh2Run(0); - Sh2SetIRQLine(5, SH2_IRQSTATUS_NONE); + Sh2SetIRQLine(5, CPU_IRQSTATUS_NONE); } { // fire irq9 every interleave iteration. - Sh2SetIRQLine(9, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(9, CPU_IRQSTATUS_AUTO); Sh2Run(0); - Sh2SetIRQLine(9, SH2_IRQSTATUS_NONE); + Sh2SetIRQLine(9, CPU_IRQSTATUS_NONE); if (i%125==0 && i!=0) { //125 = every 8 ms (per 261 interleave) - Sh2SetIRQLine(11, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(11, CPU_IRQSTATUS_AUTO); Sh2Run(0); - Sh2SetIRQLine(11, SH2_IRQSTATUS_NONE); + Sh2SetIRQLine(11, CPU_IRQSTATUS_NONE); } if (i%31==0 && i!=0) { //31=every 2 ms - Sh2SetIRQLine(15, SH2_IRQSTATUS_AUTO); + Sh2SetIRQLine(15, CPU_IRQSTATUS_AUTO); Sh2Run(0); - Sh2SetIRQLine(15, SH2_IRQSTATUS_NONE); + Sh2SetIRQLine(15, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/drv/pst90s/d_taotaido.cpp b/src/burn/drv/pst90s/d_taotaido.cpp index b30cb0ecf..189f2b1f6 100644 --- a/src/burn/drv/pst90s/d_taotaido.cpp +++ b/src/burn/drv/pst90s/d_taotaido.cpp @@ -654,9 +654,9 @@ static INT32 MemIndex() static void taotaidoFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -915,7 +915,7 @@ static INT32 DrvFrame() ZetOpen(0); SekRun(nCyclesTotal[0]); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(nCyclesTotal[1]); BurnYM2610Update(pBurnSoundOut, nBurnSoundLen); diff --git a/src/burn/drv/pst90s/d_tecmosys.cpp b/src/burn/drv/pst90s/d_tecmosys.cpp index 1065fdf1b..b12c27c80 100644 --- a/src/burn/drv/pst90s/d_tecmosys.cpp +++ b/src/burn/drv/pst90s/d_tecmosys.cpp @@ -448,9 +448,9 @@ UINT8 __fastcall tecmosys_sound_in(UINT16 port) static void DrvIrqHandler(INT32 irq) // for ymf262 { if (irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } */ @@ -1064,7 +1064,7 @@ static INT32 DrvFrame() { if (i == 240) { vblank = 0; - SekSetIRQLine(1, SEK_IRQSTATUS_ACK); + SekSetIRQLine(1, CPU_IRQSTATUS_ACK); } nSegment = nCyclesTotal[0] / nInterleave; @@ -1083,7 +1083,7 @@ static INT32 DrvFrame() #endif } - SekSetIRQLine(1, SEK_IRQSTATUS_NONE); + SekSetIRQLine(1, CPU_IRQSTATUS_NONE); #ifdef ENABLE_SOUND_HARDWARE if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_tetrisp2.cpp b/src/burn/drv/pst90s/d_tetrisp2.cpp index 4cefc4b7c..6e254a482 100644 --- a/src/burn/drv/pst90s/d_tetrisp2.cpp +++ b/src/burn/drv/pst90s/d_tetrisp2.cpp @@ -1378,7 +1378,7 @@ static int Tetrisp2Frame() SekOpen(0); SekRun(12000000 / 60); - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { @@ -1422,16 +1422,16 @@ static int RocknFrame() if (rockn_14_timer != -1) { if (rockn_14_timer_countdown == 0) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); rockn_14_timer_countdown = rockn_14_timer / 6000; } rockn_14_timer_countdown--; } - if (i == 30 && GetCurrentFrame() & 1) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == 30 && GetCurrentFrame() & 1) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); } - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); SekClose(); diff --git a/src/burn/drv/pst90s/d_tumbleb.cpp b/src/burn/drv/pst90s/d_tumbleb.cpp index dd29ce2ea..bca290261 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); return; } else { @@ -2164,7 +2164,7 @@ void __fastcall Jumppop68KWriteWord(UINT32 a, UINT16 d) case 0x18000c: { DrvSoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -2286,7 +2286,7 @@ UINT8 __fastcall JumppopZ80PortRead(UINT16 a) } case 0x03: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return DrvSoundLatch; } @@ -2996,9 +2996,9 @@ static void SemicomMapZ80() static void SemicomYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -4407,7 +4407,7 @@ static INT32 DrvFrame() if (i == SCANLINE_VBLANK_START) DrvVBlank = 1; if (i == SCANLINE_VBLANK_END) DrvVBlank = 0; if (i == NUM_SCANLINES - 1) { - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (Tumbleb2) Tumbleb2PlayMusic(); } SekClose(); @@ -4479,7 +4479,7 @@ static INT32 JumppopFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); if (i == (nInterleave - 1)) { - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); } SekClose(); diff --git a/src/burn/drv/pst90s/d_unico.cpp b/src/burn/drv/pst90s/d_unico.cpp index 4a682fa01..973601bcf 100644 --- a/src/burn/drv/pst90s/d_unico.cpp +++ b/src/burn/drv/pst90s/d_unico.cpp @@ -1761,7 +1761,7 @@ static INT32 DrvFrame() SekOpen(0); BurnTimerEndFrameYM3812(nCyclesTotal[0]); - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); BurnYM3812Update(pBurnSoundOut, nBurnSoundLen); MSM6295Render(0, pBurnSoundOut, nBurnSoundLen); SekClose(); @@ -1794,7 +1794,7 @@ static INT32 Zeropnt2Frame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 9) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 9) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_vmetal.cpp b/src/burn/drv/pst90s/d_vmetal.cpp index b86c88369..cccdb1d13 100644 --- a/src/burn/drv/pst90s/d_vmetal.cpp +++ b/src/burn/drv/pst90s/d_vmetal.cpp @@ -603,7 +603,7 @@ static INT32 DrvFrame() SekOpen(0); SekRun(nTotalCycles); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); SekClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_welltris.cpp b/src/burn/drv/pst90s/d_welltris.cpp index c4bcf7068..682739a06 100644 --- a/src/burn/drv/pst90s/d_welltris.cpp +++ b/src/burn/drv/pst90s/d_welltris.cpp @@ -419,9 +419,9 @@ UINT8 __fastcall welltris_sound_read_port(UINT16 port) static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -806,7 +806,7 @@ static INT32 DrvFrame() ZetOpen(0); SekRun(10000000 / 60); - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(4000000 / 60); diff --git a/src/burn/drv/pst90s/d_wwfwfest.cpp b/src/burn/drv/pst90s/d_wwfwfest.cpp index 7dd99b438..bd6dc0062 100644 --- a/src/burn/drv/pst90s/d_wwfwfest.cpp +++ b/src/burn/drv/pst90s/d_wwfwfest.cpp @@ -635,9 +635,9 @@ static INT32 SpriteYOffsets[16] = { 0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80 static void DrvYM2151IrqHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1099,7 +1099,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 5) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 5) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); if (i == 5) DrvVBlank = 1; SekClose(); @@ -1124,7 +1124,7 @@ static INT32 DrvFrame() } SekOpen(0); - SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); SekClose(); // Make sure the buffer is entirely filled. diff --git a/src/burn/drv/pst90s/d_xorworld.cpp b/src/burn/drv/pst90s/d_xorworld.cpp index 057547547..4d35bcb5e 100644 --- a/src/burn/drv/pst90s/d_xorworld.cpp +++ b/src/burn/drv/pst90s/d_xorworld.cpp @@ -364,8 +364,8 @@ static INT32 DrvFrame() for (INT32 i = 0; i < 4; i++) { SekRun((10000000 / 60) / 4); - if (i == 0 || i == 2) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); - if (/*i==1||*/i == 3) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 0 || i == 2) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); + if (/*i==1||*/i == 3) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } if (pBurnSoundOut) { diff --git a/src/burn/drv/pst90s/d_yunsun16.cpp b/src/burn/drv/pst90s/d_yunsun16.cpp index 5d84574fd..f2884408b 100644 --- a/src/burn/drv/pst90s/d_yunsun16.cpp +++ b/src/burn/drv/pst90s/d_yunsun16.cpp @@ -459,9 +459,9 @@ static INT32 DrvSynchroniseStream(INT32 nSoundRate) static void DrvYM3812IrqHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -872,7 +872,7 @@ static INT32 DrvFrame() for (INT32 i = 0; i < nInterleave; i++) { INT32 nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(nSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); if (is_magicbub != 1) continue; diff --git a/src/burn/drv/pst90s/d_zerozone.cpp b/src/burn/drv/pst90s/d_zerozone.cpp index 3e17f02c6..504974f4d 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; - ZetRaiseIrq(0xff); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); return; case 0xb4000: @@ -202,7 +202,7 @@ void __fastcall zerozone_write_byte(UINT32 address, UINT8 data) { case 0x84000: soundlatch = data; - ZetRaiseIrq(0xff); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); return; case 0xb4001: @@ -456,7 +456,7 @@ static INT32 DrvFrame() MSM6295Render(0, pBurnSoundOut, nBurnSoundLen); } - SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); ZetClose(); SekClose(); diff --git a/src/burn/drv/sega/d_angelkds.cpp b/src/burn/drv/sega/d_angelkds.cpp index 5ea161f34..8d5dfdd29 100644 --- a/src/burn/drv/sega/d_angelkds.cpp +++ b/src/burn/drv/sega/d_angelkds.cpp @@ -405,9 +405,9 @@ static INT32 DrvDoReset() static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -867,7 +867,7 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetRaiseIrq(0); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); diff --git a/src/burn/drv/sega/d_dotrikun.cpp b/src/burn/drv/sega/d_dotrikun.cpp index 8131c127f..71907cfff 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnDraw) { diff --git a/src/burn/drv/sega/d_hangon.cpp b/src/burn/drv/sega/d_hangon.cpp index 8e210d684..7de2c8c8e 100644 --- a/src/burn/drv/sega/d_hangon.cpp +++ b/src/burn/drv/sega/d_hangon.cpp @@ -859,7 +859,7 @@ void HangonPPI1WritePortA(UINT8 data) INT32 nLastCPU = nSekActive; SekClose(); SekOpen(1); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); SekOpen(nLastCPU); } diff --git a/src/burn/drv/sega/d_suprloco.cpp b/src/burn/drv/sega/d_suprloco.cpp index e90a5b9c4..e54a8bc37 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) ZetRaiseIrq(0); + if (i == 99) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); nCyclesDone[1] += ZetRun(nCyclesSegment); - if (i == 24 || i == 49 || i == 74 || i == 99) ZetRaiseIrq(0); + if (i == 24 || i == 49 || i == 74 || i == 99) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } diff --git a/src/burn/drv/sega/d_sys1.cpp b/src/burn/drv/sega/d_sys1.cpp index b60eefd4b..9b93eb645 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) ZetRaiseIrq(0); + if (i == 9) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); 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) ZetRaiseIrq(0); + if (i == 2 || i == 4 || i == 6 || i == 8) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/sega/d_sys16b.cpp b/src/burn/drv/sega/d_sys16b.cpp index b88f5b150..848de8239 100644 --- a/src/burn/drv/sega/d_sys16b.cpp +++ b/src/burn/drv/sega/d_sys16b.cpp @@ -4544,7 +4544,7 @@ UINT8 __fastcall BootlegZ80Read(UINT16 a) switch (a) { case 0xe000: case 0xe800: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return System16SoundLatch; } } @@ -4637,7 +4637,7 @@ void __fastcall System16BWriteByte(UINT32 a, UINT8 d) case 0xfe0007: { System16SoundLatch = d; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -4666,7 +4666,7 @@ void __fastcall AliensynWriteByte(UINT32 a, UINT8 d) case 0xc00007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -4680,7 +4680,7 @@ void __fastcall AltbeastblSoundWriteByte(UINT32 a, UINT8 d) System16SoundLatch = d; bprintf(PRINT_NORMAL, _T("Sound Latch Wrote %x\n"), d); // ZetOpen(0); -// ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); +// ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); // ZetClose(); return; } @@ -4888,7 +4888,7 @@ void __fastcall BayrouteWriteByte(UINT32 a, UINT8 d) case 0xff0007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -4940,7 +4940,7 @@ void __fastcall BulletWriteByte(UINT32 a, UINT8 d) case 0xc00007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -5021,7 +5021,7 @@ void __fastcall CottonWriteByte(UINT32 a, UINT8 d) case 0xff0007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -5137,7 +5137,7 @@ void __fastcall DduxblWriteByte(UINT32 a, UINT8 d) case 0xc40007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -5297,7 +5297,7 @@ void __fastcall EswatSoundWriteByte(UINT32 a, UINT8 d) case 0x123407: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -5364,7 +5364,7 @@ void __fastcall EswatblSoundWriteByte(UINT32 a, UINT8 d) case 0xc42007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -5572,7 +5572,7 @@ void __fastcall FpointblWriteByte(UINT32 a, UINT8 d) case 0x600007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; @@ -5863,7 +5863,7 @@ void __fastcall PassshtWriteByte(UINT32 a, UINT8 d) case 0xc00007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -5975,7 +5975,7 @@ void __fastcall RiotcityWriteByte(UINT32 a, UINT8 d) case 0xf00007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -6085,7 +6085,7 @@ void __fastcall RyukyuWriteByte(UINT32 a, UINT8 d) case 0xff0007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -6151,7 +6151,7 @@ void __fastcall SdibSoundWriteByte(UINT32 a, UINT8 d) case 0x123407: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -6208,7 +6208,7 @@ void __fastcall SjryukoWriteByte(UINT32 a, UINT8 d) case 0xc00007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -6236,7 +6236,7 @@ void __fastcall SonicbomWriteByte(UINT32 a, UINT8 d) case 0x123407: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -6293,7 +6293,7 @@ void __fastcall TetrisblSndWriteByte(UINT32 a, UINT8 d) case 0xc42007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -6365,7 +6365,7 @@ void __fastcall ToryumonWriteByte(UINT32 a, UINT8 d) case 0xfe0007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -6409,7 +6409,7 @@ void __fastcall Wb3WriteByte(UINT32 a, UINT8 d) case 0xdf0007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -6548,7 +6548,7 @@ void Altbeast_Sim8751() if ((temp & 0xff00) != 0x0000) { System16SoundLatch = temp >> 8; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); *((UINT16*)(System16Ram + 0x30c4)) = BURN_ENDIAN_SWAP_INT16((UINT16)(temp & 0xff)); } @@ -6567,7 +6567,7 @@ void Altbeastj_Sim8751() if ((temp & 0xff00) != 0x0000) { System16SoundLatch = temp >> 8; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); *((UINT16*)(System16Ram + 0x30d4)) = BURN_ENDIAN_SWAP_INT16((UINT16)(temp & 0xff)); } @@ -6586,7 +6586,7 @@ void Altbeast6_Sim8751() if ((temp & 0xff00) != 0x0000) { System16SoundLatch = temp >> 8; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); *((UINT16*)(System16Ram + 0x3098)) = BURN_ENDIAN_SWAP_INT16((UINT16)(temp & 0xff)); } @@ -6936,7 +6936,7 @@ void Ddux_Sim8751() if ((temp & 0xff00) != 0x0000) { System16SoundLatch = temp >> 8; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); *((UINT16*)(System16Ram + 0x0bd0)) = BURN_ENDIAN_SWAP_INT16((UINT16)(temp & 0xff)); } @@ -7476,7 +7476,7 @@ void Goldnaxe_Sim8751() if ((temp & 0xff00) != 0x0000) { System16SoundLatch = temp >> 8; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); *((UINT16*)(System16Ram + 0x2cfc)) = BURN_ENDIAN_SWAP_INT16((UINT16)(temp & 0xff)); } @@ -8096,7 +8096,7 @@ void Tturf_Sim8751() if ((temp & 0xff00) != 0x0000) { System16SoundLatch = temp & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); *((UINT16*)(System16Ram + 0x01d0)) = BURN_ENDIAN_SWAP_INT16((UINT16)(temp & 0xff)); } @@ -8145,7 +8145,7 @@ void Wb3_Sim8751() if ((temp & 0xff00) != 0x0000) { System16SoundLatch = temp >> 8; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); *((UINT16*)(System16Ram + 0x0008)) = BURN_ENDIAN_SWAP_INT16((UINT16)(temp & 0xff)); } @@ -8285,7 +8285,7 @@ void Wrestwar_Sim8751() if ((temp & 0xff00) != 0x0000) { System16SoundLatch = temp & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); *((UINT16*)(System16Ram + 0x208e)) = BURN_ENDIAN_SWAP_INT16((UINT16)(temp & 0xff)); } @@ -9575,7 +9575,7 @@ void __fastcall IsgsmWriteByte(UINT32 a, UINT8 d) case 0xfe0007: { System16SoundLatch = d & 0xff; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } diff --git a/src/burn/drv/sega/d_sys18.cpp b/src/burn/drv/sega/d_sys18.cpp index f54b122e3..0b9e0b2b4 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO);; ZetClose(); return; } diff --git a/src/burn/drv/sega/d_zaxxon.cpp b/src/burn/drv/sega/d_zaxxon.cpp index cd94f152b..ccfce7b6b 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) ZetLowerIrq(); + if (~data & 1) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); 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) ZetLowerIrq(); + if (~data & 1) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return; case 0xc021: @@ -1382,7 +1382,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(3041250 / 60); - if (*interrupt_enable) ZetRaiseIrq(0); + if (*interrupt_enable) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); if (pBurnDraw) { @@ -1425,13 +1425,13 @@ static INT32 CongoFrame() ZetOpen(0); nCyclesSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += ZetRun(nCyclesSegment); - if (i == nInterleave-1 && *interrupt_enable) ZetRaiseIrq(0); + if (i == nInterleave-1 && *interrupt_enable) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(1); nCyclesSegment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += ZetRun(nCyclesSegment); - if ((i%7)==0) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if ((i%7)==0) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/sega/sys16_run.cpp b/src/burn/drv/sega/sys16_run.cpp index e021a17d1..c975db830 100644 --- a/src/burn/drv/sega/sys16_run.cpp +++ b/src/burn/drv/sega/sys16_run.cpp @@ -389,7 +389,7 @@ UINT8 __fastcall System16Z80PortRead(UINT16 a) case 0x40: case 0xc0: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return System16SoundLatch; } @@ -1455,27 +1455,27 @@ inline static INT32 PdriftSndGetBank(INT32 Reg86) inline void System16YM2151IRQHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } inline static void System16YM2203IRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } inline static void System18YM3438IRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -2685,7 +2685,7 @@ INT32 System16AFrame() } } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); if (Simulate8751) Simulate8751(); @@ -2743,7 +2743,7 @@ INT32 System16BFrame() nSystem16CyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); if (BurnDrvGetHardwareCode() & HARDWARE_SEGA_YM2413) { - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } // Run Z80 @@ -2790,7 +2790,7 @@ INT32 System16BFrame() } } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); if (Simulate8751) Simulate8751(); @@ -2854,7 +2854,7 @@ INT32 System18Frame() } } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); ZetOpen(0); @@ -2954,7 +2954,7 @@ INT32 HangonFrame() } SekOpen(0); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); if (Simulate8751) Simulate8751(); @@ -3008,7 +3008,7 @@ INT32 HangonYM2203Frame() } SekOpen(0); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); ZetOpen(0); @@ -3066,7 +3066,7 @@ INT32 OutrunFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nSystem16CyclesDone[nCurrentCPU]; nSystem16CyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 2 || i == 6 || i == 8) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 2 || i == 6 || i == 8) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); SekClose(); // Run 68000 #2 @@ -3114,7 +3114,7 @@ INT32 OutrunFrame() for (i = 0; i < 2; i++) { SekOpen(i); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); } @@ -3159,8 +3159,8 @@ INT32 XBoardFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nSystem16CyclesDone[nCurrentCPU]; nSystem16CyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 20 || i == 40 || i == 60 || i == 80) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); - if (i == 99) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == 20 || i == 40 || i == 60 || i == 80) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); + if (i == 99) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); // Run 68000 #2 @@ -3170,7 +3170,7 @@ INT32 XBoardFrame() nCyclesSegment = nNext - nSystem16CyclesDone[nCurrentCPU]; nCyclesSegment = SekRun(nCyclesSegment); nSystem16CyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 99) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == 99) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); // Run Z80 @@ -3256,10 +3256,10 @@ INT32 XBoardFrameGPRider() nCyclesSegment = nNext - nSystem16CyclesDone[nCurrentCPU]; nSystem16CyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); // ACK for 1 interleave cycle to make gprider happy - if (i == 20 || i == 40 || i == 60 || i == 80) SekSetIRQLine(2, SEK_IRQSTATUS_ACK); - if (i == 21 || i == 41 || i == 61 || i == 81) SekSetIRQLine(2, SEK_IRQSTATUS_NONE); - if (i == 98) SekSetIRQLine(4, SEK_IRQSTATUS_ACK); - if (i == 99) SekSetIRQLine(4, SEK_IRQSTATUS_NONE); + if (i == 20 || i == 40 || i == 60 || i == 80) SekSetIRQLine(2, CPU_IRQSTATUS_ACK); + if (i == 21 || i == 41 || i == 61 || i == 81) SekSetIRQLine(2, CPU_IRQSTATUS_NONE); + if (i == 98) SekSetIRQLine(4, CPU_IRQSTATUS_ACK); + if (i == 99) SekSetIRQLine(4, CPU_IRQSTATUS_NONE); SekClose(); // Run 68000 #2 @@ -3269,7 +3269,7 @@ INT32 XBoardFrameGPRider() nCyclesSegment = nNext - nSystem16CyclesDone[nCurrentCPU]; nCyclesSegment = SekRun(nCyclesSegment); nSystem16CyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 99) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == 99) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); // Run Z80 @@ -3358,10 +3358,10 @@ INT32 YBoardFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nSystem16CyclesDone[nCurrentCPU]; nSystem16CyclesDone[nCurrentCPU] += SekRun(nCyclesSegment); - if (i == 170) SekSetIRQLine(2, SEK_IRQSTATUS_ACK); - if (i == 171) SekSetIRQLine(2, SEK_IRQSTATUS_NONE); - if (i == 223) SekSetIRQLine(4, SEK_IRQSTATUS_ACK); - if (i == 224) SekSetIRQLine(4, SEK_IRQSTATUS_NONE); + if (i == 170) SekSetIRQLine(2, CPU_IRQSTATUS_ACK); + if (i == 171) SekSetIRQLine(2, CPU_IRQSTATUS_NONE); + if (i == 223) SekSetIRQLine(4, CPU_IRQSTATUS_ACK); + if (i == 224) SekSetIRQLine(4, CPU_IRQSTATUS_NONE); SekClose(); // Run 68000 #2 @@ -3371,10 +3371,10 @@ INT32 YBoardFrame() nCyclesSegment = nNext - nSystem16CyclesDone[nCurrentCPU]; nCyclesSegment = SekRun(nCyclesSegment); nSystem16CyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 170) SekSetIRQLine(2, SEK_IRQSTATUS_ACK); - if (i == 171) SekSetIRQLine(2, SEK_IRQSTATUS_NONE); - if (i == 223) SekSetIRQLine(4, SEK_IRQSTATUS_ACK); - if (i == 224) SekSetIRQLine(4, SEK_IRQSTATUS_NONE); + if (i == 170) SekSetIRQLine(2, CPU_IRQSTATUS_ACK); + if (i == 171) SekSetIRQLine(2, CPU_IRQSTATUS_NONE); + if (i == 223) SekSetIRQLine(4, CPU_IRQSTATUS_ACK); + if (i == 224) SekSetIRQLine(4, CPU_IRQSTATUS_NONE); SekClose(); // Run 68000 #3 @@ -3384,10 +3384,10 @@ INT32 YBoardFrame() nCyclesSegment = nNext - nSystem16CyclesDone[nCurrentCPU]; nCyclesSegment = SekRun(nCyclesSegment); nSystem16CyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 170) SekSetIRQLine(2, SEK_IRQSTATUS_ACK); - if (i == 171) SekSetIRQLine(2, SEK_IRQSTATUS_NONE); - if (i == 223) SekSetIRQLine(4, SEK_IRQSTATUS_ACK); - if (i == 224) SekSetIRQLine(4, SEK_IRQSTATUS_NONE); + if (i == 170) SekSetIRQLine(2, CPU_IRQSTATUS_ACK); + if (i == 171) SekSetIRQLine(2, CPU_IRQSTATUS_NONE); + if (i == 223) SekSetIRQLine(4, CPU_IRQSTATUS_ACK); + if (i == 224) SekSetIRQLine(4, CPU_IRQSTATUS_NONE); SekClose(); // Run Z80 diff --git a/src/burn/drv/sg1000/d_sg1000.cpp b/src/burn/drv/sg1000/d_sg1000.cpp index 787a64ead..fdd095143 100644 --- a/src/burn/drv/sg1000/d_sg1000.cpp +++ b/src/burn/drv/sg1000/d_sg1000.cpp @@ -131,7 +131,7 @@ static void sg1000_ppi8255_portC_write(UINT8 data) static void vdp_interrupt(int state) { - ZetSetIRQLine(0, state ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, state ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static int DrvDoReset() diff --git a/src/burn/drv/taito/d_arkanoid.cpp b/src/burn/drv/taito/d_arkanoid.cpp index 5c2881afc..78e89803c 100644 --- a/src/burn/drv/taito/d_arkanoid.cpp +++ b/src/burn/drv/taito/d_arkanoid.cpp @@ -1236,7 +1236,7 @@ static INT32 DrvFrame() } } - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); m6805Close(); ZetClose(); diff --git a/src/burn/drv/taito/d_ashnojoe.cpp b/src/burn/drv/taito/d_ashnojoe.cpp index 50032537f..1a4c570f1 100644 --- a/src/burn/drv/taito/d_ashnojoe.cpp +++ b/src/burn/drv/taito/d_ashnojoe.cpp @@ -231,9 +231,9 @@ void DrvYM2203WritePortB(UINT32, UINT32 d) inline static void DrvIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -579,7 +579,7 @@ static INT32 DrvFrame() nNext[0] += nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(nNext[0] - nCyclesDone[0]); - if (i == (nInterleave - 1)) SekSetIRQLine(1, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(1, CPU_IRQSTATUS_AUTO); nNext[1] += nCyclesTotal[1] / nInterleave; BurnTimerUpdate(nNext[1]); diff --git a/src/burn/drv/taito/d_asuka.cpp b/src/burn/drv/taito/d_asuka.cpp index f85d6591f..51d3f1be6 100644 --- a/src/burn/drv/taito/d_asuka.cpp +++ b/src/burn/drv/taito/d_asuka.cpp @@ -1104,18 +1104,18 @@ static void DrvMakeInputs() static void CadashYM2151IRQHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1445,9 +1445,9 @@ static INT32 CadashFrame() } } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekRun(500); - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; @@ -1506,7 +1506,7 @@ static INT32 EtoFrame() // Using for asuka too, but needs msm5205 } } - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); if (pBurnSoundOut) { INT32 nSegmentLength = nBurnSoundLen - nSoundBufferPos; @@ -1554,7 +1554,7 @@ static INT32 BonzeFrame() ZetOpen(0); SekRun(8000000 / 60); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); BurnTimerEndFrame(4000000 / 60); diff --git a/src/burn/drv/taito/d_bublbobl.cpp b/src/burn/drv/taito/d_bublbobl.cpp index 8eb132025..07b806474 100644 --- a/src/burn/drv/taito/d_bublbobl.cpp +++ b/src/burn/drv/taito/d_bublbobl.cpp @@ -1535,7 +1535,7 @@ void BublboblMcuWriteByte(UINT16 Address, UINT8 Data) if ((port1_out & 0x40) && (~Data & 0x40)) { ZetOpen(0); ZetSetVector(DrvZ80Ram1[0]); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } @@ -1637,7 +1637,7 @@ void bublbobl_68705_portB_out(UINT8 *bytevalue) DrvZ80Ram1[0x7c] = (ZetTotalCycles() ^ ZetGetPC(-1)) % 6; ZetSetVector(DrvZ80Ram1[0]); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } } @@ -1782,9 +1782,9 @@ UINT8 __fastcall TokioSoundRead3(UINT16 a) inline static void DrvYM2203IRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -2474,8 +2474,8 @@ static INT32 DrvFrame() nCurrentCPU = 0; ZetOpen(nCurrentCPU); BurnTimerUpdateYM3526(i * (nCyclesTotal[nCurrentCPU] / nInterleave)); - if (i == 98 && !DrvMCUInUse) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == 99 && !DrvMCUInUse) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 98 && !DrvMCUInUse) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 99 && !DrvMCUInUse) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); // Run Z80 #2 @@ -2486,8 +2486,8 @@ static INT32 DrvFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 98) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == 99) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 98) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 99) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); } @@ -2516,8 +2516,8 @@ static INT32 DrvFrame() if (i == 99) m68705SetIrqLine(0, 0 /*CLEAR_LINE*/); } else { nCyclesSegment = M6801Run(nCyclesSegment); - if (i == 98) M6801SetIRQLine(0, M6801_IRQSTATUS_ACK); - if (i == 99) M6801SetIRQLine(0, M6801_IRQSTATUS_NONE); + if (i == 98) M6801SetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 99) M6801SetIRQLine(0, CPU_IRQSTATUS_NONE); } nCyclesDone[nCurrentCPU] += nCyclesSegment; @@ -2574,8 +2574,8 @@ static INT32 TokioFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 90) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == 91) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 90) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 91) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); // Run Z80 #2 @@ -2585,8 +2585,8 @@ static INT32 TokioFrame() nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesSegment = ZetRun(nCyclesSegment); nCyclesDone[nCurrentCPU] += nCyclesSegment; - if (i == 90) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == 91) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == 90) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == 91) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); // Run Z80 #3 diff --git a/src/burn/drv/taito/d_chaknpop.cpp b/src/burn/drv/taito/d_chaknpop.cpp index 9f79963ba..4d70109ae 100644 --- a/src/burn/drv/taito/d_chaknpop.cpp +++ b/src/burn/drv/taito/d_chaknpop.cpp @@ -678,7 +678,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(2350000 / 60); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnSoundOut) { diff --git a/src/burn/drv/taito/d_darius2.cpp b/src/burn/drv/taito/d_darius2.cpp index b53fd4395..a94e6b853 100644 --- a/src/burn/drv/taito/d_darius2.cpp +++ b/src/burn/drv/taito/d_darius2.cpp @@ -1310,9 +1310,9 @@ static INT32 Darius2dSpriteYOffsets[16] = { 0, 64, 128, 192, 256, 320, 384, 4 static void Darius2FMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1898,7 +1898,7 @@ static INT32 Darius2Frame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == nInterleave - 1) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == nInterleave - 1) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); // Run 68000 # 2 @@ -1908,7 +1908,7 @@ static INT32 Darius2Frame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == nInterleave - 1) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == nInterleave - 1) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); } @@ -1951,7 +1951,7 @@ static INT32 Darius2dFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == nInterleave - 1) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == nInterleave - 1) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); ZetOpen(0); diff --git a/src/burn/drv/taito/d_darkmist.cpp b/src/burn/drv/taito/d_darkmist.cpp index 6b4f74139..b638b991f 100644 --- a/src/burn/drv/taito/d_darkmist.cpp +++ b/src/burn/drv/taito/d_darkmist.cpp @@ -766,12 +766,12 @@ static INT32 DrvFrame() if (i == 0) { ZetSetVector(0x08); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } if (i == 15) { ZetSetVector(0x10); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); } ZetClose(); diff --git a/src/burn/drv/taito/d_exzisus.cpp b/src/burn/drv/taito/d_exzisus.cpp index 84dd6dde5..0c2ad1e8d 100644 --- a/src/burn/drv/taito/d_exzisus.cpp +++ b/src/burn/drv/taito/d_exzisus.cpp @@ -252,7 +252,7 @@ static UINT8 __fastcall exzisus_sound_read(UINT16 address) static void exzisusYM2151IrqHandler(INT32 state) { - ZetSetIRQLine(0, (state) ? ZET_IRQSTATUS_ACK : ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, (state) ? CPU_IRQSTATUS_ACK : CPU_IRQSTATUS_NONE); } static INT32 DrvDoReset() @@ -612,7 +612,7 @@ static INT32 DrvFrame() nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); nSegment = ZetTotalCycles(); @@ -620,12 +620,12 @@ static INT32 DrvFrame() ZetOpen(1); nCyclesDone[0] += ZetRun(nSegment - ZetTotalCycles()); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(2); nCyclesDone[0] += ZetRun(nSegment - ZetTotalCycles()); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(3); diff --git a/src/burn/drv/taito/d_flstory.cpp b/src/burn/drv/taito/d_flstory.cpp index 363ceadb0..e8326bdfc 100644 --- a/src/burn/drv/taito/d_flstory.cpp +++ b/src/burn/drv/taito/d_flstory.cpp @@ -1207,14 +1207,14 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); nSegment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += ZetRun(nSegment); - if (i == (nInterleave / 2) - 1) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); - if (i == (nInterleave / 1) - 1) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave / 2) - 1) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave / 1) - 1) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (select_game == 0) { diff --git a/src/burn/drv/taito/d_lkage.cpp b/src/burn/drv/taito/d_lkage.cpp index 67a8ef6a2..dc92019be 100644 --- a/src/burn/drv/taito/d_lkage.cpp +++ b/src/burn/drv/taito/d_lkage.cpp @@ -455,9 +455,9 @@ void __fastcall lkage_sound_write(UINT16 address, UINT8 data) inline static void DrvYM2203IRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -872,7 +872,7 @@ static INT32 DrvFrame() nNext = (i + 1) * nCyclesTotal[nCurrentCPU] / nInterleave; nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); - if (i == 99) ZetRaiseIrq(0); + if (i == 99) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); // Run Z80 #2 diff --git a/src/burn/drv/taito/d_minivdr.cpp b/src/burn/drv/taito/d_minivdr.cpp index add5636b5..7779ccd36 100644 --- a/src/burn/drv/taito/d_minivdr.cpp +++ b/src/burn/drv/taito/d_minivdr.cpp @@ -145,7 +145,7 @@ static INT32 DrvFrame() ZetOpen(0); ZetRun(4000000 / 60); - ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); if (pBurnDraw) { diff --git a/src/burn/drv/taito/d_othunder.cpp b/src/burn/drv/taito/d_othunder.cpp index 7bd11ffbb..15253534d 100644 --- a/src/burn/drv/taito/d_othunder.cpp +++ b/src/burn/drv/taito/d_othunder.cpp @@ -497,7 +497,7 @@ void __fastcall Othunder68KWriteByte(UINT32 a, UINT8 d) case 0x500005: case 0x500007: { nTaitoCyclesDone[0] += SekRun(10); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); return; } @@ -573,7 +573,7 @@ void __fastcall Othunder68KWriteWord(UINT32 a, UINT16 d) case 0x500004: case 0x500006: { nTaitoCyclesDone[0] += SekRun(10); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); return; } @@ -730,9 +730,9 @@ static const UINT8 othunder_default_eeprom[128] = { static void OthunderFMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1087,7 +1087,7 @@ static INT32 OthunderFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == (TaitoFrameInterleave - 1)) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == (TaitoFrameInterleave - 1)) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); ZetOpen(0); diff --git a/src/burn/drv/taito/d_retofinv.cpp b/src/burn/drv/taito/d_retofinv.cpp index ae189eaae..becd9f0c9 100644 --- a/src/burn/drv/taito/d_retofinv.cpp +++ b/src/burn/drv/taito/d_retofinv.cpp @@ -200,7 +200,7 @@ void __fastcall retofinv_main_write(UINT16 address, UINT8 data) case 0xc800: { data &= 1; - if (!data) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (!data) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); enable_interrupt[0] = data; } return; @@ -221,7 +221,7 @@ void __fastcall retofinv_main_write(UINT16 address, UINT8 data) case 0xc804: { data &= 1; - if (!data) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (!data) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); enable_interrupt[1] = data; } return; @@ -239,7 +239,7 @@ void __fastcall retofinv_main_write(UINT16 address, UINT8 data) *soundlatch = data; ZetClose(); ZetOpen(2); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(0); } @@ -317,7 +317,7 @@ UINT8 __fastcall retofinv_sound_read(UINT16 address) switch (address) { case 0x4000: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -792,7 +792,7 @@ static INT32 DrvFrame() ZetOpen(0); nCyclesDone[0] += ZetRun(nCycleSegment); - if (i == (nInterleave - 1) && enable_interrupt[0]) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + if (i == (nInterleave - 1) && enable_interrupt[0]) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); nCycleSegment *= (i + 1); @@ -800,7 +800,7 @@ static INT32 DrvFrame() if (disable_cpu[0]) { ZetOpen(1); nCyclesDone[1] += ZetRun(nCycleSegment - ZetTotalCycles()); - if (i == (nInterleave - 1) && enable_interrupt[1]) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + if (i == (nInterleave - 1) && enable_interrupt[1]) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); } diff --git a/src/burn/drv/taito/d_slapshot.cpp b/src/burn/drv/taito/d_slapshot.cpp index 22ae63cfc..c538b0158 100644 --- a/src/burn/drv/taito/d_slapshot.cpp +++ b/src/burn/drv/taito/d_slapshot.cpp @@ -356,7 +356,7 @@ void __fastcall Opwolf3Gun68KWriteByte(UINT32 a, UINT8 d) case 0xe00002: case 0xe00004: case 0xe00006: { - SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); return; } @@ -454,9 +454,9 @@ void __fastcall SlapshotZ80Write(UINT16 a, UINT8 d) static void SlapshotFMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -808,8 +808,8 @@ static INT32 SlapshotFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == 10) { SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); nTaitoCyclesDone[0] += SekRun(200000 - 500); } - if (i == (nInterleave - 1)) SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + if (i == 10) { SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); nTaitoCyclesDone[0] += SekRun(200000 - 500); } + if (i == (nInterleave - 1)) SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); SekClose(); ZetOpen(0); diff --git a/src/burn/drv/taito/d_superchs.cpp b/src/burn/drv/taito/d_superchs.cpp index 998fcf5eb..9c4ea028c 100644 --- a/src/burn/drv/taito/d_superchs.cpp +++ b/src/burn/drv/taito/d_superchs.cpp @@ -79,7 +79,7 @@ UINT8 __fastcall TaitoF3Sound68KReadByte(UINT32 a) if (Offset == 0x0e) return 0x01; if (Offset == 0x0f) { - SekSetIRQLine(6, SEK_IRQSTATUS_NONE); + SekSetIRQLine(6, CPU_IRQSTATUS_NONE); return 0x00; } @@ -614,7 +614,7 @@ void __fastcall Superchs68K1WriteByte(UINT32 a, UINT8 d) case 0x340000: case 0x340001: case 0x340002: { - SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); return; } @@ -671,7 +671,7 @@ void __fastcall Superchs68K1WriteWord(UINT32 a, UINT16 d) SekOpen(0); } // if (d & 0x8000) { -// SekSetIRQLine(3, SEK_IRQSTATUS_AUTO); +// SekSetIRQLine(3, CPU_IRQSTATUS_AUTO); // } return; } @@ -1150,7 +1150,7 @@ static INT32 SuperchsFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); SekClose(); if (SuperchsCpuACtrl & 0x200) { @@ -1159,7 +1159,7 @@ static INT32 SuperchsFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); SekClose(); } @@ -1174,7 +1174,7 @@ static INT32 SuperchsFrame() TaitoF3SoundTriggerIRQCyclesMode = IRQ_TRIGGER_OFF; if (M68681IMR & 0x08) { // bprintf(PRINT_NORMAL, _T("%x\n"), TaitoF3VectorReg); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); IMRStatus |= 0x08; } } @@ -1185,7 +1185,7 @@ static INT32 SuperchsFrame() // TaitoF3SoundTriggerIRQCyclesMode = IRQ_TRIGGER_OFF; if (M68681IMR & 0x08) { // bprintf(PRINT_NORMAL, _T("%x\n"), TaitoF3VectorReg); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); IMRStatus |= 0x08; } TaitoF3SoundTriggerIRQPulseCycleCounter = 0; diff --git a/src/burn/drv/taito/d_taitob.cpp b/src/burn/drv/taito/d_taitob.cpp index 9d1efe07c..9ddc45053 100644 --- a/src/burn/drv/taito/d_taitob.cpp +++ b/src/burn/drv/taito/d_taitob.cpp @@ -1670,9 +1670,9 @@ static void DrvMakeInputs() static void DrvFMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -2029,8 +2029,8 @@ static INT32 DrvFrame() for (INT32 i = 0; i < nInterleave; i++) { nNext[0] += nCyclesTotal[0] / nInterleave; nCyclesDone[0] += SekRun(nNext[0] - nCyclesDone[0]); - if (i == 4) SekSetIRQLine(irq_config[0], SEK_IRQSTATUS_AUTO); // Start of frame + 5000 cycles - if (i == (nInterleave / 1) - 1) SekSetIRQLine(irq_config[1], SEK_IRQSTATUS_AUTO); // End of frame + if (i == 4) SekSetIRQLine(irq_config[0], CPU_IRQSTATUS_AUTO); // Start of frame + 5000 cycles + if (i == (nInterleave / 1) - 1) SekSetIRQLine(irq_config[1], CPU_IRQSTATUS_AUTO); // End of frame nNext[1] += nCyclesTotal[1] / nInterleave; BurnTimerUpdate(nNext[1]); nCyclesDone[1] += nNext[1]; diff --git a/src/burn/drv/taito/d_taitof2.cpp b/src/burn/drv/taito/d_taitof2.cpp index 71ed538db..64f84e7a1 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); - ZetRaiseIrq(0); + ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } return; @@ -7418,9 +7418,9 @@ static INT32 FinalbSpriteYOffsets[16] = { 0, 64, 128, 192, 256, 320, 384, 44 static void TaitoF2FMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -10560,9 +10560,9 @@ static INT32 TaitoF2Frame() if (i == 9) nTaitoCyclesSegment -= 500; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); if (i == 9) { - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); nTaitoCyclesDone[nCurrentCPU] += SekRun(500); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); } SekClose(); @@ -10622,9 +10622,9 @@ static INT32 DriveoutFrame() if (i == 9) nTaitoCyclesSegment -= 500; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); if (i == 9) { - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); nTaitoCyclesDone[nCurrentCPU] += SekRun(500); - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); } SekClose(); diff --git a/src/burn/drv/taito/d_taitomisc.cpp b/src/burn/drv/taito/d_taitomisc.cpp index ec649c7fd..b161ec159 100644 --- a/src/burn/drv/taito/d_taitomisc.cpp +++ b/src/burn/drv/taito/d_taitomisc.cpp @@ -2952,7 +2952,7 @@ void __fastcall Jumping68KWriteByte(UINT32 a, UINT8 d) case 0x400007: { TaitoSoundLatch = d; ZetOpen(0); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); return; } @@ -3804,7 +3804,7 @@ UINT8 __fastcall JumpingZ80Read(UINT16 a) } case 0xb800: { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return TaitoSoundLatch; } } @@ -4056,18 +4056,18 @@ void __fastcall OpwolfbCChipSubZ80Write(UINT16 a, UINT8) static void TaitoYM2151IRQHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } static void TaitoYM2203IRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -5665,7 +5665,7 @@ static INT32 TaitoMiscFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == 9) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == 9) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); // Run Z80 @@ -5687,7 +5687,7 @@ static INT32 TaitoMiscFrame() nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesSegment = ZetRun(nTaitoCyclesSegment); nTaitoCyclesDone[nCurrentCPU] += nTaitoCyclesSegment; - if (i == 9) ZetRaiseIrq(0); + if (i == 9) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } @@ -5747,7 +5747,7 @@ static INT32 DariusFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == nInterleave - 1) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == nInterleave - 1) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); // Run 68000 # 2 @@ -5757,7 +5757,7 @@ static INT32 DariusFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == nInterleave - 1) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == nInterleave - 1) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); } @@ -5812,7 +5812,7 @@ static INT32 JumpingFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); // Run Z80 @@ -5855,8 +5855,8 @@ static INT32 TopspeedFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == (nInterleave / 2) && (GetCurrentFrame > 0)) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); - if (i == (nInterleave - 1)) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave / 2) && (GetCurrentFrame > 0)) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); // Run 68000 # 2 @@ -5866,8 +5866,8 @@ static INT32 TopspeedFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == (nInterleave / 2) && (GetCurrentFrame > 0)) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); - if (i == (nInterleave - 1)) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave / 2) && (GetCurrentFrame > 0)) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); } diff --git a/src/burn/drv/taito/d_taitox.cpp b/src/burn/drv/taito/d_taitox.cpp index 68c08303b..7da6f4602 100644 --- a/src/burn/drv/taito/d_taitox.cpp +++ b/src/burn/drv/taito/d_taitox.cpp @@ -1097,9 +1097,9 @@ void __fastcall TwinhawkZ80Write(UINT16 a, UINT8 d) static void TaitoXFMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1116,9 +1116,9 @@ static double TaitoXGetTime() static void TaitoXYM2151IRQHandler(INT32 Irq) { if (Irq) { - ZetSetIRQLine(0xff, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -1507,7 +1507,7 @@ static INT32 TaitoXFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == (nInterleave - 1)) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); nCurrentCPU = 1; @@ -1551,7 +1551,7 @@ static INT32 TwinhawkFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == 9) SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + if (i == 9) SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); SekClose(); // Run Z80 diff --git a/src/burn/drv/taito/d_taitoz.cpp b/src/burn/drv/taito/d_taitoz.cpp index 0ea8c37ce..3021521a2 100644 --- a/src/burn/drv/taito/d_taitoz.cpp +++ b/src/burn/drv/taito/d_taitoz.cpp @@ -4607,7 +4607,7 @@ void __fastcall Spacegun68K2WriteWord(UINT32 a, UINT16 d) case 0xf00002: case 0xf00004: case 0xf00006: { - SekSetIRQLine(5, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(5, CPU_IRQSTATUS_AUTO); return; } @@ -4746,9 +4746,9 @@ static INT32 Sprite16x8YOffsets[8] = { 0, 64, 128, 192, 256, 320, 384, 448 static void TaitoZFMIRQHandler(INT32, INT32 nStatus) { if (nStatus & 1) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } @@ -6612,12 +6612,12 @@ static INT32 TaitoZFrame() } else { BurnTimerUpdate((i + 1) * (nTaitoCyclesTotal[nCurrentCPU] / nInterleave)); } - if (i == 10 && Sci && ((GetCurrentFrame() & 1) == 0)) SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + if (i == 10 && Sci && ((GetCurrentFrame() & 1) == 0)) SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); if (TaitoZINT6timer && (SekTotalCycles() >= (TaitoZINT6timer + 10000))) { - SekSetIRQLine(6, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(6, CPU_IRQSTATUS_AUTO); TaitoZINT6timer = 0; } - if (i == nVBlankIRQFire) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == nVBlankIRQFire) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); // Run 68000 #2 @@ -6627,7 +6627,7 @@ static INT32 TaitoZFrame() nNext = (i + 1) * nTaitoCyclesTotal[nCurrentCPU] / nInterleave; nTaitoCyclesSegment = nNext - nTaitoCyclesDone[nCurrentCPU]; nTaitoCyclesDone[nCurrentCPU] += SekRun(nTaitoCyclesSegment); - if (i == nVBlankIRQFire) SekSetIRQLine(TaitoIrqLine, SEK_IRQSTATUS_AUTO); + if (i == nVBlankIRQFire) SekSetIRQLine(TaitoIrqLine, CPU_IRQSTATUS_AUTO); SekClose(); } diff --git a/src/burn/drv/taito/d_tnzs.cpp b/src/burn/drv/taito/d_tnzs.cpp index 8d1bb315b..9dd4b62fa 100644 --- a/src/burn/drv/taito/d_tnzs.cpp +++ b/src/burn/drv/taito/d_tnzs.cpp @@ -675,7 +675,7 @@ void __fastcall tnzsb_cpu1_write(UINT16 address, UINT8 data) ZetClose(); ZetOpen(2); ZetSetVector(0xff); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); ZetClose(); ZetOpen(1); break; @@ -803,7 +803,7 @@ UINT8 __fastcall tnzs_cpu2_in(UINT16 port) return BurnYM2203Read(0, 0); case 0x02: - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); return *soundlatch; } @@ -1792,9 +1792,9 @@ static INT32 DrvFrame() nCyclesDone[nCurrentCPU] += ZetRun(nCyclesSegment); if (i == irq_trigger[0]) { tnzs_mcu_interrupt(); - ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); } - if (i == irq_trigger[1]) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == irq_trigger[1]) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); // Run Z80 #1 @@ -1807,8 +1807,8 @@ static INT32 DrvFrame() } else { nCyclesDone[nCurrentCPU] += nCyclesSegment; } - if (i == irq_trigger[0]) ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); - if (i == irq_trigger[1]) ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + if (i == irq_trigger[0]) ZetSetIRQLine(0, CPU_IRQSTATUS_ACK); + if (i == irq_trigger[1]) ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); ZetClose(); // Run Z80 #2 diff --git a/src/burn/drv/taito/d_wyvernf0.cpp b/src/burn/drv/taito/d_wyvernf0.cpp index 0b12fc521..bae6e45d0 100644 --- a/src/burn/drv/taito/d_wyvernf0.cpp +++ b/src/burn/drv/taito/d_wyvernf0.cpp @@ -660,13 +660,13 @@ static INT32 DrvFrame() ZetOpen(0); INT32 nSegment = nCyclesTotal[0] / nInterleave; nCyclesDone[0] += ZetRun(nSegment); - if (i == (nInterleave - 1)) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1)) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(1); nSegment = nCyclesTotal[1] / nInterleave; nCyclesDone[1] += ZetRun(nSegment); - if (i == (nInterleave - 1) || i == (nInterleave / 2) - 1) ZetSetIRQLine(0, ZET_IRQSTATUS_AUTO); + if (i == (nInterleave - 1) || i == (nInterleave / 2) - 1) ZetSetIRQLine(0, CPU_IRQSTATUS_AUTO); ZetClose(); } diff --git a/src/burn/drv/toaplan/d_batrider.cpp b/src/burn/drv/toaplan/d_batrider.cpp index 2c36846d0..3f4c4ecf2 100644 --- a/src/burn/drv/toaplan/d_batrider.cpp +++ b/src/burn/drv/toaplan/d_batrider.cpp @@ -569,7 +569,7 @@ void __fastcall batriderWriteWord(UINT32 sekAddress, UINT16 wordValue) // Interrupt 4 does this (the same code is also conditionally called from interrupt 2) nIRQPending = 1; - SekSetIRQLine(4, SEK_IRQSTATUS_ACK); + SekSetIRQLine(4, CPU_IRQSTATUS_ACK); break; case 0x500060: @@ -582,7 +582,7 @@ void __fastcall batriderWriteWord(UINT32 sekAddress, UINT16 wordValue) break; case 0x500082: // Acknowledge interrupt - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); nIRQPending = 0; break; @@ -685,7 +685,7 @@ static INT32 drvDoReset() SekOpen(0); nIRQPending = 0; - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); Map68KTextROM(true); @@ -886,7 +886,7 @@ static INT32 drvFrame() } nIRQPending = 1; - SekSetIRQLine(2, SEK_IRQSTATUS_ACK); + SekSetIRQLine(2, CPU_IRQSTATUS_ACK); bVBlank = true; } diff --git a/src/burn/drv/toaplan/d_batsugun.cpp b/src/burn/drv/toaplan/d_batsugun.cpp index d2c1c8f90..2c582f020 100644 --- a/src/burn/drv/toaplan/d_batsugun.cpp +++ b/src/burn/drv/toaplan/d_batsugun.cpp @@ -647,7 +647,7 @@ static INT32 DrvFrame() #if 0 // The VBlank interrupt isn't actually used - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); #endif } diff --git a/src/burn/drv/toaplan/d_battleg.cpp b/src/burn/drv/toaplan/d_battleg.cpp index 5764c37eb..b4c8cddcb 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 - ZetRaiseIrq(255); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_AUTO); nCyclesDone[1] += ZetRun(0x0200); break; @@ -709,7 +709,7 @@ static INT32 DrvDoReset() { SekOpen(0); nIRQPending = 0; - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); SekReset(); SekClose(); @@ -911,7 +911,7 @@ static INT32 DrvFrame() } nIRQPending = 1; - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); ToaBufferGP9001Sprites(); diff --git a/src/burn/drv/toaplan/d_bbakraid.cpp b/src/burn/drv/toaplan/d_bbakraid.cpp index 1dae53cba..1f5950fd4 100644 --- a/src/burn/drv/toaplan/d_bbakraid.cpp +++ b/src/burn/drv/toaplan/d_bbakraid.cpp @@ -457,7 +457,7 @@ static inline void bbakraidSynchroniseZ80(INT32 nExtraCycles) static INT32 bbakraidTimerOver(INT32, INT32) { // bprintf(PRINT_NORMAL, _T(" - IRQ -> 1.\n")); - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_AUTO); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_AUTO); return 0; } @@ -675,7 +675,7 @@ void __fastcall bbakraidWriteWord(UINT32 sekAddress, UINT16 wordValue) return; case 0x500082: // Acknowledge interrupt - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); nIRQPending = 0; return; @@ -758,7 +758,7 @@ static INT32 DrvDoReset() SekOpen(0); nIRQPending = 0; - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); SekReset(); SekClose(); @@ -1007,7 +1007,7 @@ static INT32 DrvFrame() } nIRQPending = 1; - SekSetIRQLine(3, SEK_IRQSTATUS_ACK); + SekSetIRQLine(3, CPU_IRQSTATUS_ACK); ToaBufferGP9001Sprites(); diff --git a/src/burn/drv/toaplan/d_demonwld.cpp b/src/burn/drv/toaplan/d_demonwld.cpp index b9eeb2dfa..c81d603f4 100644 --- a/src/burn/drv/toaplan/d_demonwld.cpp +++ b/src/burn/drv/toaplan/d_demonwld.cpp @@ -603,7 +603,7 @@ static INT32 DrvFrame() bVBlank = true; if (bEnableInterrupts) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/toaplan/d_dogyuun.cpp b/src/burn/drv/toaplan/d_dogyuun.cpp index e7517d4b8..017fab7ef 100644 --- a/src/burn/drv/toaplan/d_dogyuun.cpp +++ b/src/burn/drv/toaplan/d_dogyuun.cpp @@ -716,7 +716,7 @@ static INT32 DrvFrame() ToaBufferGP9001Sprites(); bVBlank = true; - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; diff --git a/src/burn/drv/toaplan/d_fixeight.cpp b/src/burn/drv/toaplan/d_fixeight.cpp index 1934d9255..f61a7b3d1 100644 --- a/src/burn/drv/toaplan/d_fixeight.cpp +++ b/src/burn/drv/toaplan/d_fixeight.cpp @@ -385,7 +385,7 @@ static INT32 DrvFrame() } } - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); ToaBufferGP9001Sprites(); diff --git a/src/burn/drv/toaplan/d_ghox.cpp b/src/burn/drv/toaplan/d_ghox.cpp index 9e8f12835..c92a1eaec 100644 --- a/src/burn/drv/toaplan/d_ghox.cpp +++ b/src/burn/drv/toaplan/d_ghox.cpp @@ -715,7 +715,7 @@ static INT32 DrvFrame() ToaBufferGP9001Sprites(); bVBlank = true; - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nCyclesSegment = nNext - SekTotalCycles(); diff --git a/src/burn/drv/toaplan/d_hellfire.cpp b/src/burn/drv/toaplan/d_hellfire.cpp index 854af4073..6b0a88549 100644 --- a/src/burn/drv/toaplan/d_hellfire.cpp +++ b/src/burn/drv/toaplan/d_hellfire.cpp @@ -755,7 +755,7 @@ static INT32 DrvFrame() bVBlank = true; if (bEnableInterrupts) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/toaplan/d_kbash.cpp b/src/burn/drv/toaplan/d_kbash.cpp index f8265e725..696af7845 100644 --- a/src/burn/drv/toaplan/d_kbash.cpp +++ b/src/burn/drv/toaplan/d_kbash.cpp @@ -570,7 +570,7 @@ static INT32 DrvFrame() ToaBufferGP9001Sprites(); // Trigger VBlank interrupt - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; diff --git a/src/burn/drv/toaplan/d_kbash2.cpp b/src/burn/drv/toaplan/d_kbash2.cpp index da312cc18..759c79a73 100644 --- a/src/burn/drv/toaplan/d_kbash2.cpp +++ b/src/burn/drv/toaplan/d_kbash2.cpp @@ -512,7 +512,7 @@ static INT32 DrvFrame() ToaBufferGP9001Sprites(); // Trigger VBlank interrupt - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; diff --git a/src/burn/drv/toaplan/d_mahoudai.cpp b/src/burn/drv/toaplan/d_mahoudai.cpp index 4abd3c074..4da7d04d7 100644 --- a/src/burn/drv/toaplan/d_mahoudai.cpp +++ b/src/burn/drv/toaplan/d_mahoudai.cpp @@ -612,7 +612,7 @@ static INT32 DrvFrame() ToaBufferGP9001Sprites(); bVBlank = true; - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; diff --git a/src/burn/drv/toaplan/d_outzone.cpp b/src/burn/drv/toaplan/d_outzone.cpp index 83a8dbccb..985555f38 100644 --- a/src/burn/drv/toaplan/d_outzone.cpp +++ b/src/burn/drv/toaplan/d_outzone.cpp @@ -940,7 +940,7 @@ static INT32 DrvFrame() bVBlank = true; if (bEnableInterrupts) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/toaplan/d_pipibibs.cpp b/src/burn/drv/toaplan/d_pipibibs.cpp index 855e5ed4b..7d82cb55f 100644 --- a/src/burn/drv/toaplan/d_pipibibs.cpp +++ b/src/burn/drv/toaplan/d_pipibibs.cpp @@ -504,7 +504,7 @@ static INT32 DrvFrame() ToaBufferGP9001Sprites(); bVBlank = true; - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nCyclesSegment = nNext - SekTotalCycles(); diff --git a/src/burn/drv/toaplan/d_rallybik.cpp b/src/burn/drv/toaplan/d_rallybik.cpp index 41396d259..f19d8c383 100644 --- a/src/burn/drv/toaplan/d_rallybik.cpp +++ b/src/burn/drv/toaplan/d_rallybik.cpp @@ -523,7 +523,7 @@ static INT32 DrvFrame() bVBlank = true; if (bEnableInterrupts) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/toaplan/d_samesame.cpp b/src/burn/drv/toaplan/d_samesame.cpp index 3d099de07..01f211342 100644 --- a/src/burn/drv/toaplan/d_samesame.cpp +++ b/src/burn/drv/toaplan/d_samesame.cpp @@ -920,7 +920,7 @@ static INT32 DrvFrame() bVBlank = true; if (bEnableInterrupts) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } @@ -959,7 +959,7 @@ static INT32 DrvFrame() ToaBufferFCU2Sprites(); - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); // sprite buffer finished... + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); // sprite buffer finished... SekClose(); diff --git a/src/burn/drv/toaplan/d_shippumd.cpp b/src/burn/drv/toaplan/d_shippumd.cpp index ad7a73c24..aa8796e6a 100644 --- a/src/burn/drv/toaplan/d_shippumd.cpp +++ b/src/burn/drv/toaplan/d_shippumd.cpp @@ -631,7 +631,7 @@ static INT32 DrvFrame() ToaBufferGP9001Sprites(); bVBlank = true; - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; diff --git a/src/burn/drv/toaplan/d_slapfght.cpp b/src/burn/drv/toaplan/d_slapfght.cpp index 584a60ffb..2405fe958 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; - ZetLowerIrq(); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); break; case 0x07: // Enable interrupts // bprintf(PRINT_NORMAL, "Interrupts enabled.\n"); @@ -2286,11 +2286,11 @@ static INT32 tigerhFrame() bVBlank = true; if (bInterruptEnable) { - ZetRaiseIrq(0xFF); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_AUTO); #if 0 ZetClose(); ZetOpen(1); - ZetRaiseIrq(0xFF); + ZetSetIRQLine(0xff, CPU_IRQSTATUS_AUTO); ZetClose(); ZetOpen(0); #endif diff --git a/src/burn/drv/toaplan/d_snowbro2.cpp b/src/burn/drv/toaplan/d_snowbro2.cpp index 25195e0a8..e07235bc9 100644 --- a/src/burn/drv/toaplan/d_snowbro2.cpp +++ b/src/burn/drv/toaplan/d_snowbro2.cpp @@ -424,7 +424,7 @@ static INT32 DrvFrame() ToaBufferGP9001Sprites(); - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; diff --git a/src/burn/drv/toaplan/d_tekipaki.cpp b/src/burn/drv/toaplan/d_tekipaki.cpp index 56acbe1b4..ad5099359 100644 --- a/src/burn/drv/toaplan/d_tekipaki.cpp +++ b/src/burn/drv/toaplan/d_tekipaki.cpp @@ -704,7 +704,7 @@ static INT32 DrvFrame() ToaBufferGP9001Sprites(); // Trigger VBlank interrupt - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; diff --git a/src/burn/drv/toaplan/d_truxton.cpp b/src/burn/drv/toaplan/d_truxton.cpp index 7bc794beb..63bb2f971 100644 --- a/src/burn/drv/toaplan/d_truxton.cpp +++ b/src/burn/drv/toaplan/d_truxton.cpp @@ -640,7 +640,7 @@ static INT32 DrvFrame() bVBlank = true; if (bEnableInterrupts) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/toaplan/d_truxton2.cpp b/src/burn/drv/toaplan/d_truxton2.cpp index d7064782d..72e14e7ef 100644 --- a/src/burn/drv/toaplan/d_truxton2.cpp +++ b/src/burn/drv/toaplan/d_truxton2.cpp @@ -315,7 +315,7 @@ static INT32 DrvDoReset() { SekOpen(0); nIRQPending = 0; - SekSetIRQLine(0, SEK_IRQSTATUS_NONE); + SekSetIRQLine(0, CPU_IRQSTATUS_NONE); SekReset(); SekClose(); @@ -400,7 +400,7 @@ static INT32 DrvFrame() } nIRQPending = 1; - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); ToaBufferGP9001Sprites(); diff --git a/src/burn/drv/toaplan/d_vfive.cpp b/src/burn/drv/toaplan/d_vfive.cpp index fa3d193db..a5760e2b9 100644 --- a/src/burn/drv/toaplan/d_vfive.cpp +++ b/src/burn/drv/toaplan/d_vfive.cpp @@ -610,7 +610,7 @@ static INT32 DrvFrame() ToaBufferGP9001Sprites(); // Trigger VBlank interrupt - SekSetIRQLine(2, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(2, CPU_IRQSTATUS_AUTO); } nCyclesSegment = nNext - nCyclesDone[nCurrentCPU]; diff --git a/src/burn/drv/toaplan/d_vimana.cpp b/src/burn/drv/toaplan/d_vimana.cpp index dc0ea1bab..046c81d29 100644 --- a/src/burn/drv/toaplan/d_vimana.cpp +++ b/src/burn/drv/toaplan/d_vimana.cpp @@ -802,7 +802,7 @@ static INT32 DrvFrame() bVBlank = true; if (bEnableInterrupts) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/toaplan/d_zerowing.cpp b/src/burn/drv/toaplan/d_zerowing.cpp index 6a795b9db..01d06e7e2 100644 --- a/src/burn/drv/toaplan/d_zerowing.cpp +++ b/src/burn/drv/toaplan/d_zerowing.cpp @@ -730,7 +730,7 @@ static INT32 DrvFrame() bVBlank = true; if (bEnableInterrupts) { - SekSetIRQLine(4, SEK_IRQSTATUS_AUTO); + SekSetIRQLine(4, CPU_IRQSTATUS_AUTO); } } diff --git a/src/burn/drv/toaplan/toaplan1.cpp b/src/burn/drv/toaplan/toaplan1.cpp index 4a3476b7d..cc63fd575 100644 --- a/src/burn/drv/toaplan/toaplan1.cpp +++ b/src/burn/drv/toaplan/toaplan1.cpp @@ -44,9 +44,9 @@ INT32 nToa1Cycles68KSync; void toaplan1FMIRQHandler(INT32, INT32 nStatus) { if (nStatus) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else { - ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0, CPU_IRQSTATUS_NONE); } } diff --git a/src/burn/snd/ics2115.cpp b/src/burn/snd/ics2115.cpp index 67e4a7fb2..1489384b5 100644 --- a/src/burn/snd/ics2115.cpp +++ b/src/burn/snd/ics2115.cpp @@ -68,9 +68,9 @@ static void recalc_irq() // chip->intf->irq_cb(irq ? ASSERT_LINE : CLEAR_LINE); if (irq) { - ZetSetIRQLine(0xFF, ZET_IRQSTATUS_ACK); + ZetSetIRQLine(0xFF, CPU_IRQSTATUS_ACK); } else - ZetSetIRQLine(0x00, ZET_IRQSTATUS_NONE); + ZetSetIRQLine(0x00, CPU_IRQSTATUS_NONE); } } diff --git a/src/cpu/arm7_intf.cpp b/src/cpu/arm7_intf.cpp index 2bfd28b15..dbe650077 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 == ARM7_IRQSTATUS_NONE || state == ARM7_IRQSTATUS_ACK) { + if (state == CPU_IRQSTATUS_NONE || state == CPU_IRQSTATUS_ACK) { arm7_set_irq_line(line, state); } - else if (ARM7_IRQSTATUS_AUTO) { - arm7_set_irq_line(line, ARM7_IRQSTATUS_ACK); + else if (CPU_IRQSTATUS_AUTO) { + arm7_set_irq_line(line, CPU_IRQSTATUS_ACK); Arm7Run(0); - arm7_set_irq_line(line, ARM7_IRQSTATUS_NONE); + arm7_set_irq_line(line, CPU_IRQSTATUS_NONE); } } diff --git a/src/cpu/arm7_intf.h b/src/cpu/arm7_intf.h index 52ec7537d..ecbdb9467 100644 --- a/src/cpu/arm7_intf.h +++ b/src/cpu/arm7_intf.h @@ -25,10 +25,6 @@ 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 diff --git a/src/cpu/arm_intf.cpp b/src/cpu/arm_intf.cpp index db5c5d869..73cf124e5 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 == ARM_IRQSTATUS_NONE || state == ARM_IRQSTATUS_ACK) { + if (state == CPU_IRQSTATUS_NONE || state == CPU_IRQSTATUS_ACK) { arm_set_irq_line(line, state); } - else if (ARM_IRQSTATUS_AUTO) { - arm_set_irq_line(line, ARM_IRQSTATUS_ACK); + else if (CPU_IRQSTATUS_AUTO) { + arm_set_irq_line(line, CPU_IRQSTATUS_ACK); ArmRun(0); - arm_set_irq_line(line, ARM_IRQSTATUS_NONE); + arm_set_irq_line(line, CPU_IRQSTATUS_NONE); } } diff --git a/src/cpu/arm_intf.h b/src/cpu/arm_intf.h index 08cacbaf1..917e194ca 100644 --- a/src/cpu/arm_intf.h +++ b/src/cpu/arm_intf.h @@ -27,10 +27,6 @@ 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 e5a1d64dc..3155cb8de 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 == H6280_IRQSTATUS_AUTO) { + if (state == CPU_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 db5ad189c..6e6305d0d 100644 --- a/src/cpu/h6280_intf.h +++ b/src/cpu/h6280_intf.h @@ -29,10 +29,6 @@ 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 51722b233..a4d95b471 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 == HD6309_IRQSTATUS_NONE) { + if (status == CPU_IRQSTATUS_NONE) { hd6309_set_irq_line(vector, 0); } - if (status == HD6309_IRQSTATUS_ACK) { + if (status == CPU_IRQSTATUS_ACK) { hd6309_set_irq_line(vector, 1); } - if (status == HD6309_IRQSTATUS_AUTO) { + if (status == CPU_IRQSTATUS_AUTO) { hd6309_set_irq_line(vector, 1); hd6309_execute(0); hd6309_set_irq_line(vector, 0); diff --git a/src/cpu/hd6309_intf.h b/src/cpu/hd6309_intf.h index f7e1de6a3..c07326429 100644 --- a/src/cpu/hd6309_intf.h +++ b/src/cpu/hd6309_intf.h @@ -21,10 +21,6 @@ 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 diff --git a/src/cpu/konami/konami.cpp b/src/cpu/konami/konami.cpp index 20b19e4e9..f9d38df8b 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] != KONAMI_IRQSTATUS_NONE || \ - konami.irq_state[KONAMI_FIRQ_LINE] != KONAMI_IRQSTATUS_NONE ) \ + if( konami.irq_state[KONAMI_IRQ_LINE] != CPU_IRQSTATUS_NONE || \ + konami.irq_state[KONAMI_FIRQ_LINE] != CPU_IRQSTATUS_NONE ) \ konami.int_state &= ~KONAMI_SYNC; /* clear SYNC flag */ \ - if( konami.irq_state[KONAMI_FIRQ_LINE]!=KONAMI_IRQSTATUS_NONE && !(CC & CC_IF) ) \ + if( konami.irq_state[KONAMI_FIRQ_LINE]!=CPU_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]!=KONAMI_IRQSTATUS_NONE && !(CC & CC_II) )\ + if( konami.irq_state[KONAMI_IRQ_LINE]!=CPU_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 = KONAMI_IRQSTATUS_NONE; - konami.irq_state[0] = KONAMI_IRQSTATUS_NONE; - konami.irq_state[1] = KONAMI_IRQSTATUS_NONE; + konami.nmi_state = CPU_IRQSTATUS_NONE; + konami.irq_state[0] = CPU_IRQSTATUS_NONE; + konami.irq_state[1] = CPU_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 == KONAMI_IRQSTATUS_NONE ) return; + if( state == CPU_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 == KONAMI_IRQSTATUS_NONE) return; + if (state == CPU_IRQSTATUS_NONE) return; CHECK_IRQ_LINES; } } diff --git a/src/cpu/konami_intf.cpp b/src/cpu/konami_intf.cpp index 1ecf75644..066eab48c 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 == KONAMI_IRQSTATUS_AUTO) { - konami_set_irq_line(line, KONAMI_IRQSTATUS_ACK); + if (state == CPU_IRQSTATUS_AUTO) { + konami_set_irq_line(line, CPU_IRQSTATUS_ACK); konamiRun(0); - konami_set_irq_line(line, KONAMI_IRQSTATUS_NONE); + konami_set_irq_line(line, CPU_IRQSTATUS_NONE); } else { konami_set_irq_line(line, state); } diff --git a/src/cpu/konami_intf.h b/src/cpu/konami_intf.h index 8bc54cd78..7781bef3b 100644 --- a/src/cpu/konami_intf.h +++ b/src/cpu/konami_intf.h @@ -28,10 +28,6 @@ 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 61b40a4fa..0da826ea1 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 == M6502_IRQSTATUS_NONE) { + if (status == CPU_IRQSTATUS_NONE) { pCurrentCPU->set_irq_line(vector, 0); } - if (status == M6502_IRQSTATUS_ACK) { + if (status == CPU_IRQSTATUS_ACK) { pCurrentCPU->set_irq_line(vector, 1); } - if (status == M6502_IRQSTATUS_AUTO) { + if (status == CPU_IRQSTATUS_AUTO) { pCurrentCPU->set_irq_line(vector, 1); pCurrentCPU->execute(0); pCurrentCPU->set_irq_line(vector, 0); diff --git a/src/cpu/m6502_intf.h b/src/cpu/m6502_intf.h index b76b0e63d..74c1bd01d 100644 --- a/src/cpu/m6502_intf.h +++ b/src/cpu/m6502_intf.h @@ -34,10 +34,6 @@ 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 diff --git a/src/cpu/m68000_intf.cpp b/src/cpu/m68000_intf.cpp index 5454a96f0..4efa5a094 100644 --- a/src/cpu/m68000_intf.cpp +++ b/src/cpu/m68000_intf.cpp @@ -1178,13 +1178,15 @@ INT32 SekGetActive() } // Set the status of an IRQ line on the active CPU -void SekSetIRQLine(const INT32 line, const INT32 status) +void SekSetIRQLine(const INT32 line, const INT32 nstatus) { #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) { diff --git a/src/cpu/m6800_intf.cpp b/src/cpu/m6800_intf.cpp index 0b9b2953f..6c1d93818 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 == M6800_IRQSTATUS_NONE) { + if (status == CPU_IRQSTATUS_NONE) { m6800_set_irq_line(vector, 0); } - if (status == M6800_IRQSTATUS_ACK) { + if (status == CPU_IRQSTATUS_ACK) { m6800_set_irq_line(vector, 1); } - if (status == M6800_IRQSTATUS_AUTO) { + if (status == CPU_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 == HD63701_IRQSTATUS_NONE) { + if (status == CPU_IRQSTATUS_NONE) { m6800_set_irq_line(vector, 0); } - if (status == HD63701_IRQSTATUS_ACK) { + if (status == CPU_IRQSTATUS_ACK) { m6800_set_irq_line(vector, 1); } - if (status == HD63701_IRQSTATUS_AUTO) { + if (status == CPU_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 == M6803_IRQSTATUS_NONE) { + if (status == CPU_IRQSTATUS_NONE) { m6800_set_irq_line(vector, 0); } - if (status == M6803_IRQSTATUS_ACK) { + if (status == CPU_IRQSTATUS_ACK) { m6800_set_irq_line(vector, 1); } - if (status == M6803_IRQSTATUS_AUTO) { + if (status == CPU_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 == M6801_IRQSTATUS_NONE) { + if (status == CPU_IRQSTATUS_NONE) { m6800_set_irq_line(vector, 0); } - if (status == M6801_IRQSTATUS_ACK) { + if (status == CPU_IRQSTATUS_ACK) { m6800_set_irq_line(vector, 1); } - if (status == M6801_IRQSTATUS_AUTO) { + if (status == CPU_IRQSTATUS_AUTO) { m6800_set_irq_line(vector, 1); m6803_execute(0); m6800_set_irq_line(vector, 0); diff --git a/src/cpu/m6800_intf.h b/src/cpu/m6800_intf.h index fa0cd448a..f0cfb7a2e 100644 --- a/src/cpu/m6800_intf.h +++ b/src/cpu/m6800_intf.h @@ -25,30 +25,16 @@ 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 diff --git a/src/cpu/m6809_intf.cpp b/src/cpu/m6809_intf.cpp index 89e32a77d..ce2511708 100644 --- a/src/cpu/m6809_intf.cpp +++ b/src/cpu/m6809_intf.cpp @@ -172,15 +172,15 @@ void M6809SetIRQLine(INT32 vector, INT32 status) if (nActiveCPU == -1) bprintf(PRINT_ERROR, _T("M6809SetIRQLine called when no CPU open\n")); #endif - if (status == M6809_IRQSTATUS_NONE) { + if (status == CPU_IRQSTATUS_NONE) { m6809_set_irq_line(vector, 0); } - if (status == M6809_IRQSTATUS_ACK) { + if (status == CPU_IRQSTATUS_ACK) { m6809_set_irq_line(vector, 1); } - if (status == M6809_IRQSTATUS_AUTO) { + if (status == CPU_IRQSTATUS_AUTO) { m6809_set_irq_line(vector, 1); m6809_execute(0); m6809_set_irq_line(vector, 0); diff --git a/src/cpu/m6809_intf.h b/src/cpu/m6809_intf.h index 9a7b238f7..b1885e154 100644 --- a/src/cpu/m6809_intf.h +++ b/src/cpu/m6809_intf.h @@ -21,10 +21,6 @@ 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 diff --git a/src/cpu/nec_intf.cpp b/src/cpu/nec_intf.cpp index 1f5a0cff8..4fd038c9f 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 == VEZ_IRQSTATUS_AUTO) + if (status == CPU_IRQSTATUS_AUTO) { - VezCurrentCPU->cpu_set_irq_line(line, vector, VEZ_IRQSTATUS_ACK); + VezCurrentCPU->cpu_set_irq_line(line, vector, CPU_IRQSTATUS_ACK); VezCurrentCPU->cpu_execute(100); - VezCurrentCPU->cpu_set_irq_line(line, vector, VEZ_IRQSTATUS_NONE); + VezCurrentCPU->cpu_set_irq_line(line, vector, CPU_IRQSTATUS_NONE); VezCurrentCPU->cpu_execute(100); } else diff --git a/src/cpu/nec_intf.h b/src/cpu/nec_intf.h index 0b9f8a49c..bca14b850 100644 --- a/src/cpu/nec_intf.h +++ b/src/cpu/nec_intf.h @@ -64,9 +64,5 @@ 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 517a83081..425c1fe6b 100644 --- a/src/cpu/s2650_intf.h +++ b/src/cpu/s2650_intf.h @@ -20,9 +20,6 @@ void s2650SetIrqCallback(INT32 (*irqcallback)(INT32)); 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 9c0daa55a..c28d8fd9e 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 == SH2_IRQSTATUS_NONE ) { + if( state == CPU_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 fb724cfd1..37aaef68e 100644 --- a/src/cpu/sh2_intf.h +++ b/src/cpu/sh2_intf.h @@ -36,10 +36,6 @@ 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); diff --git a/src/cpu/tlcs90_intf.h b/src/cpu/tlcs90_intf.h index 932595b7e..1672ac126 100644 --- a/src/cpu/tlcs90_intf.h +++ b/src/cpu/tlcs90_intf.h @@ -11,10 +11,6 @@ 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); diff --git a/src/cpu/z80_intf.cpp b/src/cpu/z80_intf.cpp index 6e6bb5699..ca0d8a3d0 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 ZET_IRQSTATUS_NONE: + case CPU_IRQSTATUS_NONE: Z80SetIrqLine(line, 0); break; - case ZET_IRQSTATUS_ACK: + case CPU_IRQSTATUS_ACK: Z80SetIrqLine(line, 1); break; - case ZET_IRQSTATUS_AUTO: + case CPU_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 f12c871b3..ca85efcc5 100644 --- a/src/cpu/z80_intf.h +++ b/src/cpu/z80_intf.h @@ -52,12 +52,8 @@ INT32 ZetSegmentCycles(); INT32 ZetTotalCycles(); void ZetSetHL(INT32 n, UINT16 value); -#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) +//#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));